diff options
38 files changed, 261 insertions, 201 deletions
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index cbf3e7889..df66fd798 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -224,7 +224,7 @@ in { spanDate.appendChild(document.createTextNode(entryDate)); const link = document.createElement("a"); - link.href = "http://wiki.r/agenda/" + encodeURIComponent(agendaItem.description.replaceAll("/", "\u29F8")); + link.href = "http://wiki.r/agenda/" + encodeURIComponent(agendaItem.description.replaceAll("/", "\u29F8")); // we use big solidus instead of slash because gollum will create directories link.appendChild(document.createTextNode(agendaItem.description)); const dd = document.createElement("dd"); diff --git a/krebs/5pkgs/simple/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix index d281c9b50..953804dd0 100644 --- a/krebs/5pkgs/simple/tinc_graphs/default.nix +++ b/krebs/5pkgs/simple/tinc_graphs/default.nix @@ -1,16 +1,18 @@ -{ fetchurl, lib, pkgs, python3Packages, stdenv }: +{ fetchFromGitHub, lib, pkgs, python3Packages, stdenv }: python3Packages.buildPythonPackage rec { name = "tinc_graphs-${version}"; - version = "0.3.11"; + version = "0.4.0"; propagatedBuildInputs = with pkgs;[ python3Packages.pygeoip ## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat ]; - src = fetchurl { - url = "mirror://pypi/t/tinc_graphs/${name}.tar.gz"; - sha256 = "0akvi2srwqny3cd4b9ghssq8wi4kcxd2khabnnvylzs1s9i28fpa"; + src = fetchFromGitHub { + owner = "makefu"; + repo = "tinc_graphs"; + rev = version; + sha256 = "0dbnafzz65b1nbgvj7b6skyf4x3f9rrkizmdwpnfh4qgs9ch5xmz"; }; preFixup = with pkgs;'' diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 2a1d39c04..1cd569947 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -160,7 +160,7 @@ in { # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix> <stockholm/makefu/2configs/shiori.nix> - <stockholm/makefu/2configs/workadventure> + # <stockholm/makefu/2configs/workadventure> <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix> <stockholm/makefu/2configs/bgt/hidden_service.nix> diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index f99e493bf..550afbeae 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -67,6 +67,8 @@ in { services.grafana.enable = true; services.grafana.addr = "0.0.0.0"; services.influxdb.enable = true; + systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192; + services.influxdb.extraConfig = { meta.hostname = config.krebs.build.host.name; # meta.logging-enabled = true; diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index fee4145b9..dee6bd70e 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -26,6 +26,7 @@ <stockholm/makefu/2configs/hw/droidcam.nix> <stockholm/makefu/2configs/hw/smartcard.nix> <stockholm/makefu/2configs/hw/upower.nix> + #<stockholm/makefu/2configs/hw/ps4-compat.nix> # base <stockholm/makefu> @@ -100,6 +101,24 @@ # <stockholm/makefu/2configs/pyload.nix> # Testing + #{ + # services.nginx = { + # enable = true; + # recommendedProxySettings = true; + # virtualHosts.local = { + # default = true; + # locations."/".proxyPass= "http://localhost:4567"; + # }; + # }; + # services.gollum = { + # enable = true; + # extraConfig = '' + # Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1| + # File.open('/tmp/lol', 'w') { |file| file.write(self.to_s) } + # end + # ''; + # }; + #} # <stockholm/makefu/2configs/deployment/gitlab.nix> # <stockholm/makefu/2configs/deployment/docker/etherpad.nix> # <stockholm/makefu/2configs/deployment/wiki-irc-bot> @@ -158,7 +177,8 @@ # temporary # { services.redis.enable = true; } - { services.mongodb.enable = true; } + # { services.mongodb.enable = true; } + # <stockholm/makefu/2configs/deployment/nixos.wiki> # <stockholm/makefu/2configs/home/photoprism.nix> # <stockholm/makefu/2configs/dcpp/airdcpp.nix> # <stockholm/makefu/2configs/nginx/rompr.nix> diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index ea557bbef..9a407a575 100644 --- a/makefu/1systems/x/x13/default.nix +++ b/makefu/1systems/x/x13/default.nix @@ -8,7 +8,7 @@ <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough # <stockholm/makefu/2configs/hw/tpm.nix> <stockholm/makefu/2configs/hw/ssd.nix> - # <stockholm/makefu/2configs/hw/xmm7360.nix> + <stockholm/makefu/2configs/hw/xmm7360.nix> ]; boot.zfs.requestEncryptionCredentials = true; networking.hostId = "f8b8e0a2"; @@ -22,7 +22,8 @@ ]; hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd ]; # is required for amd graphics support ( xorg wont boot otherwise ) - boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages; environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; diff --git a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix index b4442de55..ff180e307 100644 --- a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix +++ b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix @@ -10,7 +10,7 @@ in { ''; enableACME = true; forceSSL = true; - locations."/".proxyPass = "http://localhost:${toString port}"; + locations."/".proxyPass = "http://127.0.0.1:${toString port}"; # from https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy locations."/".extraConfig = '' @@ -32,10 +32,9 @@ in { }; state = [ "/var/lib/docker/volumes/etherpad_data/_data/" ]; virtualisation.oci-containers.containers."etherpad-lite" = { - image = "makefoo/bgt-etherpad:2021-04-16.3"; # --build-arg ETHERPAD_PLUGINS="ep_markdown" - # ep_codepad does not work anymore + #image = "makefoo/bgt-etherpad:2021-04-16.3"; # --build-arg ETHERPAD_PLUGINS="ep_markdown" + image = "etherpad/etherpad:1.8.14"; - #image = "etherpad/etherpad:1.8.13"; ports = [ "127.0.0.1:${toString port}:9001" ]; volumes = [ "/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt" diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix index d02e60695..e0898193b 100644 --- a/makefu/2configs/bgt/social-to-irc.nix +++ b/makefu/2configs/bgt/social-to-irc.nix @@ -31,6 +31,11 @@ #extraChannels = [ "#binaergewitter" ]; delay = 180; }; + bgt-twitter = { + feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=binaergewitter&format=Atom"; + #extraChannels = [ "#binaergewitter" ]; + delay = 180; + }; }; }; diff --git a/makefu/2configs/bgt/template.md b/makefu/2configs/bgt/template.md index b4e6a5c7a..fdc0e2585 100644 --- a/makefu/2configs/bgt/template.md +++ b/makefu/2configs/bgt/template.md @@ -1,4 +1,4 @@ -# BGT<NUMBER> +# <SENDUNGSNUMMER> 0. Sendung twittern und mastodieren (eine Woche + eine Stunde vorher) (wichtig) 1. `eine` Person anrufen (den Host): diff --git a/makefu/2configs/bureautomation/automation/philosophische-tuer.nix b/makefu/2configs/bureautomation/automation/philosophische-tuer.nix index 780ba1765..9586d9a46 100644 --- a/makefu/2configs/bureautomation/automation/philosophische-tuer.nix +++ b/makefu/2configs/bureautomation/automation/philosophische-tuer.nix @@ -12,8 +12,8 @@ let recordrepo = pkgs.fetchFromGitHub { owner = "makefu"; repo = "philosophische_tuer"; - rev = "17544c6"; - sha256 = "0bm0697fyf6s05c6yw6y25cyck04rlxj1dgazkq8mfqk6756v2bq"; + rev = "607eff7"; + sha256 = "1qlyqmc65yfb42q4fzd92vinx4i191w431skmcp7xjncb45lfp8j"; }; samples = user: lib.mapAttrsToList (file: _: ''"${prefix}/${user}/${file}"'') diff --git a/makefu/2configs/bureautomation/light/buzzer.nix b/makefu/2configs/bureautomation/light/buzzer.nix index bc2ba4e57..4851dbd9b 100644 --- a/makefu/2configs/bureautomation/light/buzzer.nix +++ b/makefu/2configs/bureautomation/light/buzzer.nix @@ -25,6 +25,6 @@ in { services.home-assistant.config.light = [ # (tasmota_pwm "RedButton LED" "redbutton" 1 1023) #LED PWM1 - (tasmota_pwm "RedButton Buzzer" "redbutton" 2 512) #buzzer PWM2 + # (tasmota_pwm "RedButton Buzzer" "redbutton" 2 512) #buzzer PWM2 ]; } diff --git a/makefu/2configs/bureautomation/person/team.nix b/makefu/2configs/bureautomation/person/team.nix index bf3d09c57..d0d13dd98 100644 --- a/makefu/2configs/bureautomation/person/team.nix +++ b/makefu/2configs/bureautomation/person/team.nix @@ -1,4 +1,10 @@ +{config, ... }: { + # all configured persons become part of group "team" + services.home-assistant.config.group.team = { + name = "team"; + entities = map (x: "person.${x.name}" ) config.services.home-assistant.config.person; + }; services.home-assistant.config.person = [ { name = "Thorsten"; diff --git a/makefu/2configs/deployment/rss.euer.krebsco.de.nix b/makefu/2configs/deployment/rss.euer.krebsco.de.nix index 098ffcdd5..19f20f50f 100644 --- a/makefu/2configs/deployment/rss.euer.krebsco.de.nix +++ b/makefu/2configs/deployment/rss.euer.krebsco.de.nix @@ -8,11 +8,6 @@ in { selfUrlPath = "https://${fqdn}"; }; - nixpkgs.config.permittedInsecurePackages = [ - "python2.7-Pillow-6.2.2" - ]; - - systemd.services.tt-rss.serviceConfig.ExecStart = lib.mkForce "${pkgs.php}/bin/php /var/lib/tt-rss/update_daemon2.php"; services.postgresql.package = pkgs.postgresql_9_6; state = [ config.services.postgresqlBackup.location ]; diff --git a/makefu/2configs/editor/neovim/default.nix b/makefu/2configs/editor/neovim/default.nix index c288212e9..e7e59373a 100644 --- a/makefu/2configs/editor/neovim/default.nix +++ b/makefu/2configs/editor/neovim/default.nix @@ -30,37 +30,27 @@ withPython3 = true; # withNodeJs = true; extraPython3Packages = (ps: with ps; [ python-language-server pyls-mypy black libxml2]); - configure = { - customRC = builtins.readFile ./vimrc; - packages.myVimPackage = with pkgs.vimPlugins; - { - # loaded on launch - start = [ - undotree - vim-addon-nix + extraConfig = builtins.readFile ./vimrc; + plugins = with pkgs.vimPlugins;[ + undotree + vim-addon-nix - nerdtree # file manager - commentary # comment stuff out based on language - fugitive # full git integration - vim-airline-themes # lean & mean status/tabline - vim-airline # status bar - gitgutter # git diff in the gutter (sign column) - vim-trailing-whitespace # trailing whitspaces in red - tagbar # F3 function overview - ReplaceWithRegister # For better copying/replacing - polyglot # Language pack - vim-indent-guides # for displaying indent levels - deoplete-nvim # general autocompletion - deoplete-go - ale - molokai # color scheme - ]; - # manually loadable by calling `:packadd $plugin-name` - opt = []; - # To automatically load a plugin when opening a filetype, add vimrc lines like: - # autocmd FileType php :packadd phpCompletion - }; - }; + nerdtree # file manager + commentary # comment stuff out based on language + fugitive # full git integration + vim-airline-themes # lean & mean status/tabline + vim-airline # status bar + gitgutter # git diff in the gutter (sign column) + vim-trailing-whitespace # trailing whitspaces in red + tagbar # F3 function overview + ReplaceWithRegister # For better copying/replacing + polyglot # Language pack + vim-indent-guides # for displaying indent levels + deoplete-nvim # general autocompletion + deoplete-go + ale + molokai # color scheme + ]; }; }; } diff --git a/makefu/2configs/extra-fonts.nix b/makefu/2configs/extra-fonts.nix index 7b3a5f197..25ca7a33a 100644 --- a/makefu/2configs/extra-fonts.nix +++ b/makefu/2configs/extra-fonts.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { fonts = { - enableFontDir = true; + fontDir.enable = true; enableGhostscriptFonts = true; fonts = with pkgs; [ inconsolata # monospaced diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index f991f7649..2ba7f125c 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -43,7 +43,7 @@ in console.font = "Lat2-Terminus16"; fonts = { - enableFontDir = true; + fontDir.enable = true; enableGhostscriptFonts = true; fonts = [ pkgs.terminus_font pkgs.corefonts ]; }; diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix index bd1e34804..cca15468c 100644 --- a/makefu/2configs/home-manager/desktop.nix +++ b/makefu/2configs/home-manager/desktop.nix @@ -58,5 +58,6 @@ Restart = "on-abort"; }; }; + programs.beets.enable = true; }; } diff --git a/makefu/2configs/home/ham/automation/flurlicht.nix b/makefu/2configs/home/ham/automation/flurlicht.nix new file mode 100644 index 000000000..d40022540 --- /dev/null +++ b/makefu/2configs/home/ham/automation/flurlicht.nix @@ -0,0 +1,39 @@ +let + licht = "light.flur_statuslight"; +in +{ + services.home-assistant.config.automation = + [ + { alias = "Nachtlicht im Flur an"; + trigger = { + platform = "sun"; + event = "sunset"; + }; + action = + [ + { + service = "light.turn_on"; + target.entity_id = licht; + data = { + brightness = 87; + rgbw_color = [ 255 190 0 0 ]; # ein dunkles rot + #effect = "None"; + }; + } + ]; + } + { alias = "Nachtlicht in Flur aus"; + trigger = { + platform = "sun"; + event = "sunrise"; + }; + action = + [ + { + service = "light.turn_off"; + entity_id = licht; + } + ]; + } + ]; +} diff --git a/makefu/2configs/home/ham/automation/wohnzimmer_rf_fernbedienung.nix b/makefu/2configs/home/ham/automation/wohnzimmer_rf_fernbedienung.nix index 4303cdfa5..31d9b1634 100644 --- a/makefu/2configs/home/ham/automation/wohnzimmer_rf_fernbedienung.nix +++ b/makefu/2configs/home/ham/automation/wohnzimmer_rf_fernbedienung.nix @@ -123,7 +123,23 @@ in (rf_state "401511" "light.wohnzimmer_schrank_osram" 128) # D # OFF Lane - (rf_turn_off "400554" "all") # A + (let code = "400554"; in { + alias = "Turn off living room light via rf code ${code}"; # A + trigger = { + platform = "event"; + event_type = "esphome.rf_code_received"; + event_data.code = code; + }; + action = { + service = "light.turn_off"; + data.entity_id = [ + "light.wohnzimmer_fernseher_led_strip" "light.wohnzimmer_stehlampe_osram" + "light.wohnzimmer_komode_osram" "light.wohnzimmer_schrank_osram" + "light.wohnzimmer_fenster_lichterkette_licht" "light.wohnzimmer_fernsehwand_led" + ]; + }; + }) + (rf_toggle "401154" "light.wohnzimmer_fenster_lichterkette_licht") # B (rf_toggle "401454" "light.wohnzimmer_fernsehwand_led") # C # (rf_toggle "401514" "") # D diff --git a/makefu/2configs/home/ham/default.nix b/makefu/2configs/home/ham/default.nix index cb42f32aa..6ab3cd46c 100644 --- a/makefu/2configs/home/ham/default.nix +++ b/makefu/2configs/home/ham/default.nix @@ -33,6 +33,7 @@ in { ./automation/light_buttons.nix ./automation/wohnzimmer_rf_fernbedienung.nix ./automation/ladestecker_timer.nix + ./automation/flurlicht.nix #./automation/giesskanne.nix ./automation/pflanzen_giessen_erinnerung.nix #./automation/urlaub.nix diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix index 411121556..1b1675f14 100644 --- a/makefu/2configs/hw/bluetooth.nix +++ b/makefu/2configs/hw/bluetooth.nix @@ -33,7 +33,7 @@ hardware.bluetooth = { enable = true; powerOnBoot = false; - config.general.Enable = "Source,Sink,Media,Socket"; + settings.general.Enable = "Source,Sink,Media,Socket"; }; services.dbus.packages = [ pkgs.blueman ]; } diff --git a/makefu/2configs/hw/lte.sh b/makefu/2configs/hw/lte.sh new file mode 100755 index 000000000..a8ae31586 --- /dev/null +++ b/makefu/2configs/hw/lte.sh @@ -0,0 +1,26 @@ +#/bin/sh + +if [[ "$EUID" -ne 0 ]]; then + echo "This script must be run as root, elevating!" + exec sudo $0 $1 + exit 0 +fi + +if [[ "$1" = "down" ]]; then + echo "taking wwan0 down!" + ip link set wwan0 down + rmmod xmm7360 + exit +fi + +if [[ "$1" = "up" ]]; then + echo "running modprobe" + modprobe xmm7360 + echo "bringing wwan0 up!" + until open_xdatachannel -a web.vodafone.de;do + modprobe -r xmm7360 + modprobe xmm7360 + done + ip link set wwan0 up + echo "nameserver 1.1.1.1" | tee -a /etc/resolv.conf +fi diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index f44d4afd4..050787df8 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/makefu/2configs/hw/network-manager.nix @@ -28,7 +28,7 @@ scanRandMacAddress = true; backend = "iwd"; }; - services.gnome3.gnome-keyring.enable = true; + services.gnome.gnome-keyring.enable = true; networking.wireless.iwd.enable = true; state = [ @@ -37,4 +37,11 @@ networking.networkmanager.dispatcherScripts = [ { source = "${pkgs.prison-break}/bin/prison-break"; } ]; + + # TODO: not sure if this actually works + systemd.services.NetworkManager-dispatcher.environment = { + DISPLAY= ":0"; + DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/9001/bus"; + }; + } diff --git a/makefu/2configs/hw/xmm7360.nix b/makefu/2configs/hw/xmm7360.nix index 951dcaa0b..8facab8b5 100644 --- a/makefu/2configs/hw/xmm7360.nix +++ b/makefu/2configs/hw/xmm7360.nix @@ -1,5 +1,7 @@ { pkgs, config, ... }: let + helper = pkgs.writeScriptBin "lte" (builtins.readFile ./lte.sh); + pkg = (pkgs.callPackage ../../5pkgs/xmm7360 { kernel = config.boot.kernelPackages.kernel; }); in { @@ -7,5 +9,5 @@ in pkg ]; boot.initrd.availableKernelModules = [ "xmm7360" ]; - users.users.makefu.packages = [ pkg ]; + users.users.makefu.packages = [ pkg helper ]; } diff --git a/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix b/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix index d54deeea2..c8a5ae704 100644 --- a/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix +++ b/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix @@ -3,8 +3,8 @@ services.nginx = { enable = lib.mkDefault true; virtualHosts."misa-felix.ml" = { - forceSSL = true; - enableACME = true; + #forceSSL = true; + #enableACME = true; locations = { "/" = { index = "index.html"; diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix index 52fb28a03..679bfd65c 100644 --- a/makefu/2configs/stats/server.nix +++ b/makefu/2configs/stats/server.nix @@ -14,6 +14,8 @@ in { services.grafana.addr = "0.0.0.0"; services.influxdb.enable = true; + systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192; + # redirect grafana to stats.makefu.r services.nginx.enable = true; services.nginx.virtualHosts."stats.makefu.r".locations."/".proxyPass = "http://localhost:3000"; diff --git a/makefu/2configs/systemdultras/ircbot.nix b/makefu/2configs/systemdultras/ircbot.nix index 20cdf7ba7..65583b9ac 100644 --- a/makefu/2configs/systemdultras/ircbot.nix +++ b/makefu/2configs/systemdultras/ircbot.nix @@ -1,18 +1,27 @@ { pkgs, ... |