WIP: mympd

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a8d00f5c038cf7ec54e7dac9c57b171c1217f008' (2022-03-13)
  → 'github:nix-community/home-manager/0bdbdea2e26c984b096f4f7d10e3c88536a980b0' (2022-04-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d2caa9377539e3b5ff1272ac3aa2d15f3081069f' (2022-03-22)
  → 'github:NixOS/nixpkgs/6f88260faaaa3cda8f4e478be72be6c0861c47ad' (2022-04-01)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/6de161729c81dc98e844793cc9c8fda29d5ef62a' (2022-03-26)
  → 'github:NixOS/nixpkgs/21299f3dd3ff475f19bc8933f30ebb6a135799f1' (2022-04-02)
• Updated input 'scripts':
    'github:kmein/scripts/d1d525b92a34e55b1ad886807c284106e58716b2' (2022-03-26)
  → 'github:kmein/scripts/f5df67a2416d8f05a7dbfea269c44668854c7887' (2022-03-27)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=master&rev=ae9c0b12710b5361d0d45510eb401eebfc1b3fb0' (2022-03-25)
  → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd' (2022-03-28)

.github/workflows/flake.yml

@@ -0,0 +1,19 @@
+name: Update flake.lock
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Install Nix
+        uses: cachix/install-nix-action@v16
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@v3

ci.nix

@@ -1,27 +1,36 @@
-{ inputs, system, name }:
+{
-let
+  inputs,
+  system,
+  name,
+}: let
   inherit (inputs) nixpkgs;
   pkgs = nixpkgs.legacyPackages.${system};
-  ensureFiles = paths: pkgs.runCommand "directory" {} ''
+  ensureFiles = paths:
+    pkgs.runCommand "directory" {} ''
       set -efu
       mkdir $out
       cd $out
-    ${nixpkgs.lib.concatMapStringsSep "\n" (path: ''
+      ${
+        nixpkgs.lib.concatMapStringsSep "\n" (path: ''
           mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
           echo foo > ${nixpkgs.lib.escapeShellArg path}
-    '') paths}
+        '')
+        paths
+      }
     '';
   nixPath = nixpkgs.lib.concatStringsSep ":" ([
       "niveum=${toString ./.}"
       "nixos-config=${toString ./.}/systems/${name}/configuration.nix"
       "system-secrets=${systemSecrets}"
       "secrets=${sharedSecrets}"
-  ] ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
+    ]
+    ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
   # cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//'
   sharedSecrets = ensureFiles [
     "di.fm/key"
     "eduroam/identity"
     "eduroam/password"
+    "hass/token"
     "mail/cock"
     "mail/fastmail"
     "mail/gmail/amroplay"
@@ -31,13 +40,20 @@ let
     "nextcloud-fysi/password"
     "nextcloud/password"
     "openweathermap.key"
+    "restic/password"
     "traadfri.key"
     "wifi/Aether.psk"
+    "spotify/username"
+    "spotify/password"
   ];
-  systemSecrets = let basic = [ "retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"]; in {
+  systemSecrets = let
-    zaatar = ensureFiles ([ "moodle.token" "telegram/moodle-dl.token" ] ++ basic);
+    basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"];
+  in
+    {
+      zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
       kabsa = ensureFiles basic;
       manakish = ensureFiles basic;
+      tahina = ensureFiles basic;
       makanek = ensureFiles ([
           "irc/retiolum"
           "irc/hackint"
@@ -59,6 +75,9 @@ let
           "telegram/kmein.token"
           "telegram/prometheus.token"
           "weechat/relay"
-    ] ++ basic);
+        ]
-  }.${name};
+        ++ basic);
-in toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")
+    }
+    .${name};
+in
+  toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")

configs/alacritty.nix

@@ -1,13 +1,16 @@
-{ pkgs, lib, config, ... }:
 {
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
   environment.variables.TERMINAL = "alacritty";
 
   environment.systemPackages = [
     pkgs.alacritty
   ];
 
-  home-manager.users.me.xdg.configFile =
+  home-manager.users.me.xdg.configFile = let
-  let
     inherit (import <niveum/lib>) colours;
     colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
     colourPairs = lib.getAttrs colourNames colours;

configs/backup.nix

@@ -0,0 +1,49 @@
+{
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (import <niveum/lib>) restic;
+in {
+  services.restic.backups.niveum = {
+    initialize = true;
+    inherit (restic) repository;
+    timerConfig = {
+      OnCalendar = "8:00";
+      RandomizedDelaySec = "1h";
+    };
+    passwordFile = toString <secrets/restic/password>;
+    extraBackupArgs = [
+      "--exclude=/home/kfm/projects/nixpkgs/.git"
+      "--exclude=node_modules"
+    ];
+    paths = [
+      "/home/kfm/work"
+      "/home/kfm/projects"
+      "/home/kfm/cloud"
+      "/home/kfm/.gnupg"
+      "/home/kfm/.ssh"
+    ];
+  };
+
+  systemd.services.restic-backups-niveum.serviceConfig = {
+    Restart = "on-failure";
+    RestartSec = "15s";
+    StartLimitIntervalSec = "1m"; # don't try more than 4 times
+    StartLimitBurst = 4;
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "restic-niveum" ''
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} "$@"
+    '')
+    (pkgs.writers.writeDashBin "restic-mount" ''
+      mountdir=$(mktemp -d)
+      trap clean EXIT
+      clean() {
+        rm -r "$mountdir"
+      }
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} mount "$mountdir"
+    '')
+  ];
+}

configs/battery.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   boot.extraModulePackages = with config.boot.kernelPackages; [
     tp_smapi
     acpi_call

configs/beets.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = [pkgs.beets];
   home-manager.users.me.xdg.configFile = {
     "beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {

configs/bluetooth.nix

@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   hardware.bluetooth = {
     enable = true;
     settings.General.Enable =

configs/chromium.nix

@@ -2,11 +2,11 @@
   programs.chromium = {
     enable = true;
     extensions = [
-      "nngceckbapebfimnlniiiahkandclblb" # BitWarden
       # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
       # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-      "khncfooichmfjbepaaaebmommgaepoid" # Remove YouTube Recommended Videos
+      "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
+      "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
     ];
   };
 

configs/cloud.nix

@@ -1,4 +1,11 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
   imports = [
     <niveum/modules/dropbox.nix>
   ];
@@ -7,13 +14,35 @@
     dropbox.enable = false;
   };
 
-  system.activationScripts.home-symlinks = ''
+  systemd.tmpfiles.rules = map tmpfilesConfig [
-    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
+    {
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
+      type = "L+";
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
+      user = config.users.users.me.name;
-  '';
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
+      path = "${config.users.users.me.home}/notes";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
+      path = "${config.users.users.me.home}/uni";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
+      path = "${config.users.users.me.home}/mahlzeit";
+    }
+  ];
 
   home-manager.users.me = {
+    services.gnome-keyring.enable = true;
     services.nextcloud-client = {
       enable = true;
       startInBackground = true;
@@ -50,8 +79,8 @@
     cert = toString <system-secrets/syncthing/cert.pem>;
     key = toString <system-secrets/syncthing/key.pem>;
     inherit ((import <niveum/lib>).syncthing) devices;
-    folders =
+    folders = let
-      let cloud-dir = "${config.users.users.me.home}/cloud";
+      cloud-dir = "${config.users.users.me.home}/cloud";
     in {
       "${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
       "${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];

configs/copyq.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   copyqConfig = pkgs.writers.writeDash "copyq-config" ''
     ${pkgs.copyq}/bin/copyq config check_clipboard true
     ${pkgs.copyq}/bin/copyq config check_selection false

configs/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, lib, config, options, ... }:
+{
-let
+  pkgs,
+  lib,
+  config,
+  options,
+  ...
+}: let
   inherit (lib.strings) makeBinPath;
   inherit (import <niveum/lib>) localAddresses kieran;
 in {
@@ -20,6 +25,7 @@ in {
         config = {
           allowUnfree = true;
           packageOverrides = pkgs: {
+            dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
             gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
             tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
             iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
@@ -28,7 +34,10 @@ in {
         };
         overlays = [
           (self: super: {
-            scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
+            scripts = import <niveum/packages/scripts> {
+              pkgs = super;
+              lib = super.lib;
+            };
           })
         ];
       };
@@ -56,8 +65,7 @@ in {
       users.users.me = {
         name = "kfm";
         description = kieran.name;
-        hashedPassword =
+        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
-          "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
         isNormalUser = true;
         uid = 1000;
       };
@@ -75,13 +83,15 @@ in {
         # copy server:/run/pulse/.config/pulse/cookie to client:~/.config/pulse/cookie to authenticate a client machine
         zeroconf.discovery.enable = true;
         extraConfig = ''
-          load-module ${toString [
+          load-module ${
+            toString [
               "module-tunnel-sink-new"
               "server=zaatar.r"
               "sink_name=zaatar"
               "channels=2"
               "rate=44100"
-          ]}
+            ]
+          }
         '';
       };
 
@@ -90,8 +100,7 @@ in {
       environment.systemPackages = [pkgs.pavucontrol pkgs.ncpamixer pkgs.pamixer pkgs.pulsemixer];
     }
     {
-      environment.interactiveShellInit =
+      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
-        "export PATH=$PATH:$HOME/projects/niveum";
       environment.shellAliases = let
         wcd = pkgs.writers.writeDash "wcd" ''
           cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
@@ -102,12 +111,15 @@ in {
         take = pkgs.writers.writeDash "take" ''
           mkdir "$1" && cd "$1"
         '';
+        cdt = pkgs.writers.writeDash "cdt" ''
+          cd "$(mktemp -d)"
+          pwd
+        '';
         swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
       in {
         "ß" = "${pkgs.utillinux}/bin/setsid";
         cat = "${pkgs.bat}/bin/bat --style=plain";
-        chromium-incognito =
+        chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
-          "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
         cp = "cp --interactive";
         ip = "${pkgs.iproute}/bin/ip -c";
         l = "ls --color=auto --time-style=long-iso --almost-all";
@@ -123,6 +135,8 @@ in {
         rm = "rm --interactive";
         s = "${pkgs.systemd}/bin/systemctl";
         take = "source ${take}";
+        cdt = "source ${cdt}";
+        vit = "$EDITOR $(mktemp)";
         tmux = "${pkgs.tmux}/bin/tmux -2";
         sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
         zathura = swallow "${pkgs.zathura}/bin/zathura";
@@ -130,13 +144,11 @@ in {
         wcd = "source ${wcd}";
         im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
         where = "source ${where}";
-        yt =
+        yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
+        yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
-        yta =
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
       };
     }
-    { i18n.defaultLocale = "en_GB.UTF-8"; }
+    {i18n.defaultLocale = "en_DK.UTF-8";}
     {
       services.xserver = {
         enable = true;
@@ -175,7 +187,7 @@ in {
 
       environment.systemPackages = [
         pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [e.pass-otp]))
+        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
       ];
     }
     {
@@ -188,12 +200,15 @@ in {
       };
     }
     {
-      networking.hosts = lib.mapAttrs' (name: address: {
+      networking.hosts =
+        lib.mapAttrs' (name: address: {
           name = address;
           value = ["${name}.local"];
-      }) localAddresses;
+        })
+        localAddresses;
     }
     ./alacritty.nix
+    ./backup.nix
     ./bash.nix
     ./beets.nix
     ./bluetooth.nix
@@ -226,6 +241,7 @@ in {
     ./flameshot-once.nix
     ./packages.nix
     ./stardict.nix
+    ./polkit.nix
     ./power-action.nix
     ./printing.nix
     ./openweathermap.nix
@@ -246,5 +262,6 @@ in {
     ./vscode.nix
     ./watson.nix
     ./zsh.nix
+    ./tor.nix
   ];
 }

configs/direnv.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   nixify = pkgs.writers.writeDashBin "nixify" ''
     set -efuC
 
@@ -22,14 +21,14 @@ in {
 
   home-manager.users.me.programs.direnv = {
     enable = true;
-    stdlib = builtins.readFile ("${
+    stdlib = builtins.readFile "${
       pkgs.fetchFromGitHub {
         owner = "Mic92";
         repo = "dotfiles";
         rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
         sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
       }
-      }/home/.direnvrc");
+    }/home/.direnvrc";
   };
 
   programs.zsh.interactiveShellInit = ''

configs/distrobump.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
       inherit lib config;

configs/docker.nix

@@ -1,4 +1,8 @@
-{ lib, pkgs, ... }: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   virtualisation.docker = {
     enable = true;
     # for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c

configs/dunst.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications colours theme;
 in {
   home-manager.users.me.services.dunst = {

configs/flameshot-once.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
+{
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications;
   flameshot-once =
     pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};

configs/flix.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   flixLocation = "/media/flix";
   cacheLocation = "/var/cache/flix";
   indexFilename = "index";
@@ -18,7 +21,6 @@ in {
       "x-systemd.device-timeout=1"
       "x-systemd.idle-timeout=1min"
       "x-systemd.requires=tinc.retiolum.service"
-      "x-systemd.requires=wpa_supplicant.service"
       "user"
       "_netdev"
     ];
@@ -75,5 +77,4 @@ in {
         | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
     '')
   ];
-
 }

configs/fonts.nix

@@ -1,42 +1,53 @@
 {pkgs, ...}: {
   nixpkgs.config.joypixels.acceptLicense = true;
-
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;
     fonts = with pkgs; [
       alegreya
       alegreya-sans
+      amiri
+      cantarell-fonts
+      charis-sil
       corefonts
+      crimson
       eb-garamond
+      etBook
       fira
       font-awesome-ttf
+      gentium
+      gfs-fonts
+      gyre-fonts
+      ia-writer-duospace
       ibm-plex
-      inconsolata
+      jetbrains-mono
-      iosevka
+      joypixels
-      libertine
+      libertinus
+      libre-bodoni
       lmodern
+      merriweather
       noto-fonts
-      noto-fonts-cjk
+      ocr-a
-      noto-fonts-emoji
       roboto
       roboto-mono
       roboto-slab
+      scheherazade-new
       source-code-pro
-      source-serif-pro
       source-sans-pro
-      ubuntu_font_family
+      source-serif-pro
-      gfs-fonts
+      theano
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
       tocharian-font
-    ];
+      vistafonts
-    fontconfig.defaultFonts = {
+      vollkorn
-      monospace = [ "JetBrains Mono" "JoyPixels" ];
+      zilla-slab
-      serif = [ "Roboto Slab" ];
+    ]; # google-fonts league-of-moveable-type
-      sansSerif = [ "Roboto" "Noto Sans" ];
+    fontconfig.defaultFonts = let
-      emoji = [ "JoyPixels" ];
+      emojiFont = "JoyPixels";
+    in {
+      monospace = ["JetBrains Mono" emojiFont];
+      serif = ["Merriweather"];
+      sansSerif = ["Cantarell" emojiFont];
+      emoji = [emojiFont];
     };
   };
 }

configs/fzf.nix

@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   environment = {
     systemPackages = [pkgs.fzf];
     variables = {

configs/git.nix

@@ -1,16 +1,19 @@
-{ pkgs, config, lib, ... }:
-let
-  inherit (import <niveum/lib>) kieran ignorePaths;
-in
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (import <niveum/lib>) kieran ignorePaths;
+in {
   environment.systemPackages = [
     pkgs.mr
     pkgs.git
     pkgs.gitAndTools.gitflow
-    pkgs.gitAndTools.hub
     pkgs.gitAndTools.gh
     pkgs.gitAndTools.git-extras
     pkgs.gitAndTools.git-trim
+    pkgs.gitAndTools.git-absorb
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
@@ -23,37 +26,6 @@ in
   };
 
   home-manager.users.me = {
-    home.file.".mrconfig".text = let
-      prependPath = prefix:
-        lib.attrsets.mapAttrs'
-        (path: lib.attrsets.nameValuePair "${prefix}/${path}");
-      git = url: { checkout = "git clone ${url}"; };
-      github = owner: repo: git "git@github.com:${owner}/${repo}";
-      keybase = owner: repo: git "keybase://private/${owner}/${repo}";
-    in lib.generators.toINI { } ({
-      DEFAULT = { git_gc = ''git gc "$@"''; };
-    } // prependPath "projects" {
-      "menstruation.rs" = github "kmein" "menstruation.rs";
-      brockman = github "kmein" "brockman";
-      challenges = github "kmein" "challenges";
-      conlangs = github "kmein" "conlangs";
-      ledger = keybase "kmein" "ledger";
-      mahlzeit = github "kmein" "mahlzeit";
-      menstruation-telegram = github "kmein" "menstruation-telegram";
-      meteora = github "kmein" "meteora";
-      modernizr = github "kmein" "modernizr";
-      niveum = github "kmein" "niveum";
-      nixpkgs = github "NixOS" "nixpkgs";
-      poetry = github "kmein" "poetry";
-      quotes = github "kmein" "quotes";
-      sphinx = github "kmein" "sphinx";
-      stockholm = git "https://cgit.krebsco.de/stockholm";
-      telebots = github "kmein" "telebots";
-      traadfri = github "kmein" "traadfri";
-      wissen = github "kmein" "wissen";
-      zen = github "kmein" "zen";
-    });
-
     programs.git = {
       enable = true;
       package = pkgs.gitAndTools.gitFull;
@@ -70,33 +42,20 @@ in
         diffs = "diff --staged";
         last = "log -1 HEAD";
         logs = "log --pretty=oneline";
-        graph =
+        graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
-          "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
       };
       ignores = ignorePaths;
       extraConfig = {
         pull.ff = "only";
         rebase.autoStash = true;
         merge.autoStash = true;
-        core.pager =
+
-          "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
+        # ref https://github.com/dandavison/delta
-        color = {
+        core.pager = "${pkgs.delta}/bin/delta";
-          ui = true;
+        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-          diff = {
+        delta.navigate = true;
-            meta = "11";
+        merge.conflictStyle = "diff3";
-            frag = "magenta bold";
+        diff.colorMoved = "default";
-            commit = "yellow bold";
-            old = "red bold";
-            new = "green bold";
-            whitespace = "red reverse";
-          };
-          diff-highlight = {
-            oldNormal = "red bold";
-            oldHighlight = "red bold 52";
-            newNormal = "green bold";
-            newHighlight = "green bold 22";
-          };
-        };
       };
     };
   };

configs/hledger.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [<niveum/modules/hledger.nix>];
 
   niveum.hledger = {

configs/hu-berlin.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (lib.strings) fileContents;
   inherit (import <niveum/lib>) sshPort;
   eduroam = {
@@ -14,7 +18,7 @@ let
     "username=meinhaki"
     "password=${lib.strings.fileContents <secrets/mail/meinhaki>}"
     "noauto"
-    "x-systemd.requires=openvpn-hu-berlin.service"
+    "x-systemd.requires=hu-vpn.service"
     "x-systemd.automount"
     "x-systemd.device-timeout=1"
     "x-systemd.idle-timeout=1min"
@@ -32,7 +36,6 @@ in {
     options = hu-berlin-cifs-options;
   };
 
-
   home-manager.users.me.programs.ssh = {
     matchBlocks = {
       "alew.hu-berlin.de" = {
@@ -46,7 +49,8 @@ in {
     (pkgs.writers.writeDashBin "hu-ip" ''
       ${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
     '')
-    (pkgs.writers.writePython3Bin "hu-eduroam-install"
+    (
+      pkgs.writers.writePython3Bin "hu-eduroam-install"
       {
         libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
         flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
@@ -63,13 +67,15 @@ in {
     wants = ["network-online.target"];
     conflicts = ["openvpn-hu-berlin.service"];
     script = ''
-      ${pkgs.openfortivpn}/bin/openfortivpn -c ${pkgs.writeText "hu-berlin.config" ''
+      ${pkgs.openfortivpn}/bin/openfortivpn -c ${
+        pkgs.writeText "hu-berlin.config" ''
           host = forti-ssl.vpn.hu-berlin.de
           port = 443
           trusted-cert = 42193a913d276d9eb86217612956e1e6464d6f07bed5393a4787c87adc4bd359
-        username = ${eduroam.identity}
+          username = ${eduroam.identity}@split_tunnel
           password = ${eduroam.password}
-      ''}
+        ''
+      }
     '';
   };
 
@@ -82,8 +88,7 @@ in {
       password = eduroam.password;
     };
     config = fileContents (pkgs.fetchurl {
-      url =
+      url = "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
-        "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
       sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
     });
   };

configs/i3.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications colours;
   klem = import <niveum/packages/scripts/klem.nix> {
     inherit pkgs lib;
@@ -45,7 +49,6 @@ let
   move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
     i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
   '';
-
 in {
   services.xserver = {
     displayManager.defaultSession = "none+i3";
@@ -73,7 +76,10 @@ in {
   home-manager.users.me.xsession.windowManager.i3 = {
     enable = true;
     config = rec {
-      fonts = {names = ["Sans"]; size = 10.0;};
+      fonts = {
+        names = ["Sans"];
+        size = 10.0;
+      };
       modifier = "Mod4";
       window = {
         titlebar = false;
@@ -111,31 +117,43 @@ in {
           text = colours.foreground;
         };
       in rec {
-        focused = scheme // {
+        focused =
+          scheme
+          // {
             border = colours.cyan.bright;
             indicator = colours.cyan.bright;
             childBorder = colours.cyan.bright;
           };
-        unfocused = scheme // {
+        unfocused =
+          scheme
+          // {
             border = colours.background;
             indicator = colours.background;
             childBorder = colours.background;
           };
         focusedInactive = unfocused;
-        urgent = scheme // {
+        urgent =
+          scheme
+          // {
             border = colours.red.bright;
             indicator = colours.red.bright;
             childBorder = colours.red.bright;
           };
-        placeholder = scheme // {
+        placeholder =
+          scheme
+          // {
             border = colours.green.bright;
             indicator = colours.green.bright;
             childBorder = colours.green.bright;
           };
       };
-      bars = [{
+      bars = [
+        {
           workspaceButtons = false;
-        fonts = {names = ["Sans"]; size = 8.0;};
+          fonts = {
+            names = ["Sans"];
+            size = 8.0;
+          };
           mode = "hide"; # "dock"
           position = "bottom";
           colors = rec {
@@ -155,7 +173,8 @@ in {
               inherit pkgs;
             })
           }";
-      }];
+        }
+      ];
       modes.resize = {
         "Escape" = ''mode "default"'';
         "Return" = ''mode "default"'';
@@ -205,14 +224,12 @@ in {
         "${modifier}+0" = "exec ${pkgs.scripts.menu-calc}/bin/=";
 
         "${modifier}+Shift+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
-        "${modifier}+a" =
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
-          "exec --no-startup-id ${pkgs.rofi}/bin/rofi -display-window — -show window";
-        "${modifier}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
         "${modifier}+Shift+d" = "exec ${
           pkgs.writers.writeDash "notemenu" ''
             set -efu
             PATH=$PATH:${
-                lib.makeBinPath [ pkgs.dmenu pkgs.findutils pkgs.coreutils ]
+              lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
             }
 
             cd ~/notes
@@ -220,7 +237,7 @@ in {
               echo diary/$(date -I).md
               echo diary/$(date -I -d yesterday).md
               find . -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2
-              } | dmenu -i)
+            } | rofi -dmenu -i -p 'notes')
             if test "$note_file"
             then
               i3-sensible-terminal -e "$EDITOR" "$note_file"

configs/kdeconnect.nix

@@ -1,13 +1,17 @@
 {
   networking.firewall = {
-    allowedTCPPortRanges = [{
+    allowedTCPPortRanges = [
+      {
         from = 1714;
         to = 1764;
-    }];
+      }
-    allowedUDPPortRanges = [{
+    ];
+    allowedUDPPortRanges = [
+      {
         from = 1714;
         to = 1764;
-    }];
+      }
+    ];
   };
 
   home-manager.users.me = {

configs/keyboard.nix

@@ -1,9 +1,13 @@
-{ pkgs, lib, ... }:
+{
-let commaSep = builtins.concatStringsSep ",";
+  pkgs,
+  lib,
+  ...
+}: let
+  commaSep = builtins.concatStringsSep ",";
 in {
   services.xserver = {
-    layout = commaSep [ "de" "gr" "ru" ];
+    layout = commaSep ["de" "gr"];
-    xkbVariant = commaSep [ "T3" "polytonic" "phonetic" ];
+    xkbVariant = commaSep ["T3" "polytonic"];
     xkbOptions =
       commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
     libinput.enable = true;
@@ -12,6 +16,5 @@ in {
   console.keyMap = "de";
 
   # improve held key rate
-  services.xserver.displayManager.sessionCommands =
+  services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
-    "${pkgs.xorg.xset}/bin/xset r rate 300 50";
 }

configs/khal.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   davHome = "~/.local/share/dav";
   kmeinCloud = {
     davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
@@ -11,8 +15,7 @@ let
     username = "kmein";
     password = lib.fileContents <secrets/nextcloud-fysi/password>;
   };
-in
+in {
-{
   environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];
 
   systemd.user.services.vdirsyncer = {

configs/lb.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   systemd.services.lb-subscription = {
     enable = true;
     wants = ["network-online.target"];

configs/mime.nix

@@ -21,7 +21,6 @@
         "x-scheme-handler/webcal" = "brave-browser.desktop";
         "inode/directory" = "pcmanfm.desktop";
       };
-
     };
   };
 }

configs/monitoring.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.nginx.virtualHosts.default = {
     locations."= /stub_status".extraConfig = "stub_status;";
   };
@@ -43,14 +46,21 @@
 
     serviceConfig = {
       ExecStart = ''
-        ${pkgs.grafana-loki}/bin/promtail --config.file ${(pkgs.formats.yaml {}).generate "promtail.yaml" {
+        ${pkgs.grafana-loki}/bin/promtail --config.file ${
+          (pkgs.formats.yaml {}).generate "promtail.yaml" {
             server = {
               http_listen_port = 28183;
               grpc_listen_port = 0;
             };
             positions.filename = "/tmp/positions.yaml";
             clients = [
-            { url = "http://${if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"}:3100/loki/api/v1/push"; }
+              {
+                url = "http://${
+                  if config.networking.hostName == "makanek"
+                  then "127.0.0.1"
+                  else "makanek.r"
+                }:3100/loki/api/v1/push";
+              }
             ];
             scrape_configs = [
               {
@@ -68,7 +78,8 @@
                 ];
               }
             ];
-        }}
+          }
+        }
       '';
     };
   };

configs/mpv.nix

@@ -1,13 +1,24 @@
-{ pkgs, lib, ... }: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
-  nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
 in {
   environment.shellAliases.smpv = swallow "mpv";
 
+  nixpkgs.overlays = [
+    (self: super: {
+      mpv = config.home-manager.users.me.programs.mpv.finalPackage;
+    })
+  ];
+
   home-manager.users.me = {
     programs.mpv = {
       enable = true;
       config = {
+        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
         ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
         screenshot-template = "%F-%wH%wM%wS-%#04n";
       };
@@ -22,7 +33,8 @@ in {
         "Alt+j" = "add video-pan-y -0.05";
       };
       scripts = [
-        nixpkgs-unstable.mpvScripts.youtube-quality
+        pkgs.mpvScripts.youtube-quality
+        (pkgs.callPackage <niveum/packages/mpv-visualizer.nix> {})
       ];
     };
   };

configs/neomutt.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   mainMailbox = "posteo";
 
   accounts.uni = {
@@ -113,13 +116,13 @@ let
       trash = "[Gmail]/Papierkorb";
     };
   };
-in
+in {
-{
   environment.systemPackages = [pkgs.neomutt];
   environment.shellAliases.mua = "${pkgs.neomutt}/bin/neomutt -f ${mainMailbox}←";
 
   home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = ''
-    set mailcap_path = ${pkgs.writeText "mailcap" ''
+    set mailcap_path = ${
+      pkgs.writeText "mailcap" ''
         text/plain; $EDITOR %s ;
         text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
         image/*; ${pkgs.sxiv}/bin/sxiv %s ;
@@ -128,7 +131,8 @@ in
         application/pdf; ${pkgs.zathura}/bin/zathura %s ;
         application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
         application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
-    ''}:$mailcap_path
+      ''
+    }:$mailcap_path
 
     set sidebar_visible
     set sidebar_format = "%D%?F? [%F]?%* %?N?%N/?%S"
@@ -180,21 +184,29 @@ in
 
     set header_cache="~/.cache/mutt" message_cachedir="~/.cache/mutt"
 
-    source ${pkgs.writeText "accounts.neomuttrc" ''
+    source ${
+      pkgs.writeText "accounts.neomuttrc" ''
         set realname = "Kierán Meinhardt"
         account-hook . 'unset imap_user imap_pass smtp_user smtp_pass'
         # set accordingly: postponed trash record
-      ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let imapRoot = "imaps://${account.user}@${account.imap}"; in ''
+        ${
+          lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let
+              imapRoot = "imaps://${account.user}@${account.imap}";
+            in ''
               account-hook ${account.user}@${account.imap} 'set imap_user="${account.user}" imap_pass="${account.password}"'
               account-hook ${account.user}@${account.smtp} 'set smtp_user="${account.user}" smtp_pass="${account.password}"'
               folder-hook  ${account.user}@${account.imap} 'set smtp_url="${account.smtpSettings "${account.user}@${account.smtp}"}" from="${account.address}" record="${imapRoot}/${account.folders.sent}" postponed="${imapRoot}/${account.folders.drafts}" trash="${imapRoot}/${account.folders.trash}"'
               named-mailboxes "${name}←" "${imapRoot}" "${name}→" "${imapRoot}/${account.folders.sent}"
-      '') accounts)}
+            '')
-    ''}
+            accounts)
+        }
+      ''
+    }
 
     set spoolfile="${mainMailbox}"
 
-    source ${pkgs.writeText "colors.neomuttrc" ''
+    source ${
+      pkgs.writeText "colors.neomuttrc" ''
         # Default index colors:
         color index_number blue default
         color index red default '.*'
@@ -243,6 +255,7 @@ in
         mono body bold "^gpg: Good signature"
         mono body bold "^gpg: BAD signature from.*"
         color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-    ''}
+      ''
+    }
   '';
 }

configs/neovim.nix

@@ -5,7 +5,9 @@
   environment.shellAliases.view = "nvim -R";
 
   nixpkgs.config.packageOverrides = pkgs: {
-    vimPlugins = pkgs.vimPlugins // {
+    vimPlugins =
+      pkgs.vimPlugins
+      // {
         cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
         vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
         vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};

configs/networkmanager.nix

@@ -1,6 +1,10 @@
-{ lib, pkgs, ... }:
+{
-let
+  lib,
-  profile = name: custom: lib.recursiveUpdate {
+  pkgs,
+  ...
+}: let
+  profile = name: custom:
+    lib.recursiveUpdate {
       connection.id = name;
       connection.type = "wifi";
       connection.interface-name = "wlp3s0";
@@ -14,7 +18,8 @@ let
       ipv6.dns-search = "";
       ipv6.method = "auto";
       proxy = {};
-  } custom;
+    }
+    custom;
   eduroamProfile = {
     connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
     wifi-security = {
@@ -36,12 +41,17 @@ let
       phase2-auth = "pap";
     };
   };
-in
+in {
-{
   imports = [<niveum/modules/networkmanager-declarative.nix>];
 
+  programs.nm-applet.enable = true;
+
   networking.networkmanager = {
     enable = true;
+    packages = [
+      pkgs.networkmanager-openvpn
+      pkgs.networkmanager-fortisslvpn
+    ];
     wifi.macAddress = "random";
     ethernet.macAddress = "random";
     unmanaged = ["docker*"];
@@ -82,5 +92,10 @@ in
 
   users.users.me.extraGroups = ["networkmanager"];
 
-  environment.systemPackages = [ pkgs.speedtest-cli ];
+  environment.systemPackages = [
+    pkgs.speedtest-cli
+    pkgs.networkmanager-openvpn
+    pkgs.networkmanagerapplet
+    pkgs.networkmanager-fortisslvpn
+  ];
 }

configs/newsboat.nix

@@ -1,11 +1,13 @@
-{ pkgs, config, ... }:
+{
-let
+  pkgs,
+  config,
+  ...
+}: let
   ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
 
   youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata";
 
-  newsboat-home =
+  newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
-    "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
   linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
 
   newsboat-config = pkgs.writeText "config" ''

configs/nix.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   nixpkgs = {
     config.allowUnfree = true;
     overlays = [

configs/openweathermap.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   openweathermap-repo = pkgs.fetchFromGitHub {
     owner = "ip1981";
     repo = "openweathermap";

configs/packages.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
   worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
   menstruation = pkgs.callPackage <menstruation-backend> {};
@@ -7,7 +10,10 @@ let
 
   nixpkgs-unstable = import <nixpkgs-unstable> {config.allowUnfree = true;};
 
-  zoteroStyle = { name, sha256 }: {
+  zoteroStyle = {
+    name,
+    sha256,
+  }: {
     name = "${name}.csl";
     path = pkgs.fetchurl {
       url = "https://www.zotero.org/styles/${name}";
@@ -17,20 +23,21 @@ let
   cslDirectory = pkgs.linkFarm "citation-styles" [
     (zoteroStyle {
       name = "chicago-author-date-de";
-      sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
+      sha256 = "sha256-ddMYk4A9DJQhx9ldkmF7PhwKuc7wUSr26uHHGAze9Ps=";
     })
     (zoteroStyle {
       name = "din-1505-2";
-      sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
+      sha256 = "sha256-bXZbB850fek8J6wMVFL32ndI7F4wiKKr1qUC71ezreE=";
     })
     (zoteroStyle {
       name = "apa";
-      sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
+      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
     })
   ];
 
-
+  astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old:
-  astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
+    old
+    // {
       installPhase = ''
         ${old.installPhase}
         # set sensible defaults
@@ -50,7 +57,6 @@ let
     });
 
   recht = pkgs.callPackage <recht> {};
-
 in {
   home-manager.users.me.home.file = {
     ".csl".source = cslDirectory;
@@ -115,10 +121,13 @@ in {
     xorg.xkill # kill by clicking
     audacity
     calibre
+    electrum
     inkscape
     astrolog
     anki # flashcards
+    jbofihe # lojbanic software
     nixpkgs-unstable.zoom-us # video conferencing
+    nixpkgs-unstable.alejandra # nix formatter
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     mupdf
@@ -152,7 +161,7 @@ in {
     scripts.vimv
     scripts.swallow # window swallowing
     scripts.literature-quote
-    scripts.nav # json navigation
+    jless # less(1) for json
     scripts.notetags
     scripts.booksplit
     scripts.dmenurandr
@@ -165,17 +174,16 @@ in {
     scripts.vg
     scripts.fkill
     scripts.wttr
-    scripts.sanskrit-dictionary
     scripts.unicodmenu
     scripts.horoscope
     scripts.closest
     scripts.trans
-    scripts.liddel-scott-jones
     scripts.mpv-radio
     # kmein.slide
     scripts.tolino-screensaver
     scripts.rfc
     scripts.tag
+    scripts.timer
     python3Packages.eyeD3
     scripts.menu-calc
     nix-prefetch-git
@@ -197,7 +205,7 @@ in {
     (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
     (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
 
-    nixpkgs-unstable.spotify
+    spotify
     ncspot
     playerctl
 
@@ -253,12 +261,15 @@ in {
     binutils # for strip, ld, ...
     # nightly.rust
     shellcheck
-  ];
 
+    (pkgs.writers.writeDashBin "hass-cli" ''
+      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN=${lib.strings.fileContents <secrets/hass/token>} exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
+    '')
+    scripts.rofi-hass
+  ];
 
   home-manager.users.me.xdg.configFile."pycodestyle".text = ''
     [pycodestyle]
     max-line-length = 110
   '';
-
 }

configs/polkit.nix

@@ -0,0 +1,11 @@
+{config, ...}: let
+  user = config.users.users.me.name;
+in {
+  security.polkit.extraConfig = ''
+    polkit.addRule(function(action, subject) {
+      if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
+        return polkit.Result.YES;
+      }
+    });
+  '';
+}

configs/power-action.nix

@@ -1,8 +1,10 @@
-{ pkgs, config, ... }:
-let
-  suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
-in
 {
+  pkgs,
+  config,
+  ...
+}: let
+  suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
+in {
   imports = [<stockholm/krebs/3modules/power-action.nix>];
 
   krebs.power-action = {

configs/printing.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   inherit (import <niveum/lib>) localAddresses;
   hp-driver = pkgs.hplipWithPlugin;
 in {
@@ -13,7 +12,8 @@ in {
     extraBackends = [hp-driver];
   };
 
-  hardware.printers.ensurePrinters = [{
+  hardware.printers.ensurePrinters = [
+    {
       name = "OfficeJet";
       location = "Zimmer";
       deviceUri = "https://${localAddresses.officejet}";
@@ -25,9 +25,11 @@ in {
         OutputMode = "Normal";
         ColorModel = "KGray"; # RGB CMYGray KGray
       };
-  }];
     }
-
+  ];
-/* HP/hp-officejet_4650_series.ppd.gz
+}
+/*
+ HP/hp-officejet_4650_series.ppd.gz
  drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
  */
+

configs/retiolum.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     <niveum/modules/retiolum.nix>
   ];

configs/rofi.nix

@@ -1,9 +1,13 @@
-{ config, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) colours;
 in {
   home-manager.users.me.programs.rofi = {
     enable = true;
     font = "Monospace 10";
+    theme = "${pkgs.rofi}/share/rofi/themes/Arc-Dark.rasi";
   };
 }

configs/seafile.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }:
 {
+  pkgs,
+  config,
+  ...
+}: {
   services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
 
   home-manager.users.me.xdg.configFile = {

configs/ssh.nix

@@ -1,5 +1,9 @@
-{ pkgs, config, lib, ... }:
+{
-let
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) sshPort kieran;
 in {
   services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
@@ -25,6 +29,11 @@ in {
         user = "root";
         port = sshPort;
       };
+      tahina = {
+        hostname = "tahina.r";
+        user = "root";
+        port = sshPort;
+      };
       manakish = {
         hostname = "manakish.r";
         user = "kfm";
@@ -48,6 +57,10 @@ in {
         hostname = "135.181.85.233";
         user = "root";
       };
+      oracle = {
+        hostname = "130.61.171.199";
+        user = "ubuntu";
+      };
     };
   };
 }

configs/sshd.nix

@@ -1,8 +1,11 @@
-{ config, lib, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) sshPort kieran;
-in
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) sshPort kieran;
+in {
   users.motd = "Welcome to ${config.networking.hostName}!";
 
   services.openssh = {

configs/stardict.nix

@@ -1,6 +1,28 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   dictionaries = {
+    lojban = {
+      jbo-deu = pkgs.fetchzip {
+        url = "https://guskant.github.io/lojbo/stardict/jbo-deu-20160110.tar.gz";
+        sha256 = "18ia15wyvd8ksi7yxn939qmvpdlrip8mvfywafv7vjj685rdhk80";
+      };
+      rafsi-jbo = pkgs.fetchzip {
+        url = "https://guskant.github.io/lojbo/stardict/rafsi-jbo-20160110.tar.gz";
+        sha256 = "00fkw964b48liz1jayfjb5jnpwihghkq4i28y8i11yqb56w6bn3c";
+      };
+      jbo-eng = pkgs.fetchzip {
+        url = "https://guskant.github.io/lojbo/stardict/jbo-eng-20160110.tar.gz";
+        sha256 = "15l65yshqdp0a7fr4a7ffwx3m2v6ymchxgra9zmk5bsgcxsb4r8m";
+      };
+      jbo-jbo = pkgs.fetchzip {
+        url = "https://guskant.github.io/lojbo/stardict/jbo-jbo-20160110.tar.gz";
+        sha256 = "1psfyrjrq84prr2s4jcm31ijykm7clyqygmbacr09n570xfwqcfw";
+      };
+    };
     classics = {
       Pape = pkgs.fetchzip {
         url = "http://tovotu.de/data/stardict/pape_gr-de.zip";
@@ -45,88 +67,93 @@ let
         url = "http://tovotu.de/data/stardict/etymonline.zip";
         sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
       };
-      Roget = builtins.fetchTarball {
+      Roget = pkgs.fetchzip {
         url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
         sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
       };
-      JargonFile = builtins.fetchTarball {
+      JargonFile = pkgs.fetchzip {
         url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
         sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
       };
-      Oxford-Collocations = builtins.fetchTarball {
+      Oxford-Collocations = pkgs.fetchzip {
         url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
         sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
       };
-      Langenscheidt-Deu-En = builtins.fetchTarball {
+      Langenscheidt-Deu-En = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
         sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
       };
-      Langenscheidt-En-Deu = builtins.fetchTarball {
+      Langenscheidt-En-Deu = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
         sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
       };
-      Duden_Das_Fremdworterbuch = builtins.fetchTarball {
+      Duden_Das_Fremdworterbuch = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
         sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
       };
-      Duden_De_De = builtins.fetchTarball {
+      Duden_De_De = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
         sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
       };
-      ConciseOED = builtins.fetchTarball {
+      ConciseOED = pkgs.fetchzip {
         url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
         sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
       };
-      # Duden_Rechtschreibung = builtins.fetchTarball {
+      Duden_Synonym = pkgs.fetchzip {
-      #   url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
-      #   sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
-      # };
-      Duden_Synonym = builtins.fetchTarball {
         url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
         sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
       };
-      # Duden = builtins.fetchTarball {
-      #   url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
-      #   sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
-      # };
-      # FreeOnlineDictionaryOfComputing = builtins.fetchTarball {
-      #   url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
-      #   sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
-      # };
     };
-    sanskrit = {
+    sanskrit = let
+      repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
+    in {
       BoehtlingkRoth = pkgs.fetchzip {
-        url = "https://c.krebsco.de/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch.zip";
+        url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
         sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
         stripRoot = false;
       };
+      BoehtlingkRothKurz = pkgs.fetchzip {
+        url = "${repo}/sa-head/german-entries/tars/Bohtlingk-Sanskrit-Worterbuch-in-kurzerer-Fassung__2021-10-05_14-23-18Z__10MB.tar.gz";
+        sha256 = "15yx31yrk40k9nn6kaysp4pprzj8dpd13dj3wafklc3izm8lr2wq";
+        stripRoot = false;
+      };
       MonierWilliams = pkgs.fetchzip {
-        url = "https://c.krebsco.de/mw-cologne.zip";
+        url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/mw-cologne__2021-10-06_00-16-23Z__16MB.tar.gz";
         sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
         stripRoot = false;
       };
       MonierWilliamsEnglish = pkgs.fetchzip {
-        url = "https://c.krebsco.de/mw-english-sanskrit.zip";
+        url = "${repo}/en-head/tars/mw-english-sanskrit__2021-10-05_14-23-18Z__3MB.tar.gz";
         sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
         stripRoot = false;
       };
+      Borooah = pkgs.fetchzip {
+        url = "${repo}/en-head/tars/borooah__2021-10-05_14-23-18Z__2MB.tar.gz";
+        sha256 = "0qmmfbynqgv125v48383i51ky9yi69zibhh7vwk95gyar2yrprn2";
+        stripRoot = false;
+      };
+      ApteEnglish = pkgs.fetchzip {
+        url = "${repo}/en-head/tars/apte-english-sanskrit-cologne__2021-10-06_00-12-51Z__1MB.tar.gz";
+        sha256 = "064ysm24ydc534ca689y5i2flnra8jkmh8zn0gsb6n8hdsb0d1lq";
+        stripRoot = false;
+      };
     };
     oed = {
-      OED1 = builtins.fetchTarball {
+      OED1 = pkgs.fetchzip {
         url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
         sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
       };
-      OED2 = builtins.fetchTarball {
+      OED2 = pkgs.fetchzip {
         url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
         sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
       };
     };
     russian = {
-      LingvoGermanRussian = builtins.fetchTarball {
+      LingvoGermanRussian = pkgs.fetchzip {
         url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
         sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
       };
-      LingvoRussianGerman = builtins.fetchTarball {
+      LingvoRussianGerman = pkgs.fetchzip {
         url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
         sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
       };
@@ -135,19 +162,20 @@ let
 
   makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);
 
-  makeStardict = name: dicts: pkgs.writers.writeDashBin name ''
+  makeStardict = name: dicts:
+    pkgs.writers.writeDashBin name ''
       set -efu
       export SDCV_PAGER=${toString sdcvPager}
-    exec ${pkgs.sdcv}/bin/sdcv --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
+      exec ${pkgs.sdcv}/bin/sdcv --color --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
     '';
 
   sdcvPager = pkgs.writeDash "sdcvPager" ''
     export PATH=${lib.makeBinPath [pkgs.gnused pkgs.ncurses pkgs.less]}
     sed "
-      s!<sup>1</sup>!¹!g
+      s!<sup>1</sup>!¹!gI
-      s!<sup>2</sup>!²!g
+      s!<sup>2</sup>!²!gI
-      s!<sup>3</sup>!³!g
+      s!<sup>3</sup>!³!gI
-      s!<sup>4</sup>!⁴!g
+      s!<sup>4</sup>!⁴!gI
       s! style=\"color: #...\"!!g;
       s!<span class=\"zenoTXSpaced\">\([^<>]*\)</span>!\1!g;
       s!</\?dictionary[^>]*>!!g;
@@ -170,6 +198,8 @@ let
       s!</\?pron[^>]*>!!g
       s!</\?gen[^>]*>!!g
       s!</\?tns[^>]*>!!g
+      s!</\?per[^>]*>!!g
+      s!</\?blockquote[^>]*>!!g
       s!</\?etym[^>]*>!!g
       s!<foreign[^>]*>!$(tput sitm)!g
       s!</foreign[^>]*>!$(tput sgr0)!g
@@ -179,6 +209,7 @@ let
       s!</\?p>!!g
       s!<input[^>]*>!!g
       s!</\?orth[^>]*>!!g
+      s!</\?number[^>]*>!!g
       s!</\?forename[^>]*>!!g
       s!</\?persName[^>]*>!!g
       s!</\?surname[^>]*>!!g
@@ -187,20 +218,23 @@ let
       s!</\?cit[^>]*>!!g
       s!</\?pos[^>]*>!!g
       s!</\?usg[^>]*>!!g
-      s!</\?span>!!g
+      s!</\?ul>!!g
+      s!<li>!\n!g
+      s!</li>!!g
       s!<bibl[^>]*>!$(tput setaf 245)!g
       s!</bibl[^>]*>!$(tput sgr0)!g
       s/<dt>/$(tput bold)/g;
       s:</dt>:$(tput sgr0):g;
       s/<dd>/\n/g;
       s:</dd>::g;
-      s/<[bB]>/$(tput bold)/g;
+      s:<script>.*</script>::g;
-      s:</[bB]>:$(tput sgr0):g;
+      s/<b>/$(tput bold)/gI;
-      s:<[bB][rR]\s*/\?>:\n:g;
+      s:</b>:$(tput sgr0):gI;
-      s:<[iI]>:$(tput sitm):g;
+      s:<br\s*/\?>:\n:gI;
-      s:</[iI]>:$(tput sgr0):g;
+      s:<i>:$(tput sitm):gI;
-      s:<[uU]>:$(tput smul):g;
+      s:</i>:$(tput sgr0):gI;
-      s:</[uU]>:$(tput sgr0):g;
+      s:<u>:$(tput smul):gI;
+      s:</u>:$(tput sgr0):gI;
       s:<FONT face=[^>]*>::g;
       s:</FONT>::g;
       s!<head>\([^<>]*\)</head>!$(tput bold)\1$(tput sgr0)!g;
@@ -222,13 +256,12 @@ let
       s:<IMG src=\"223E9A06.bmp\"[^>]*>:ː:g;
       s:<IMG src=\"502F5DDA.bmp\"[^>]*>::g;
       s:<IMG src=\"8DAD7054.bmp\"[^>]*>:n̩:g
-      s!</\?TABLE>!!g
+      s!</\?TABLE>!!gI
-      s!</\?TR[^>]*>!!g
+      s!</\?TR[^>]*>!!gI
-      s!</\?TD>!!g
+      s!</\?TD>!!gI
-      s!</\?FONT[^>]*>!!g
+      s!</\?FONT[^>]*>!!gI
-      s!</\?A[^>]*>!!g
+      s!</\?A[^>]*>!!gI
       s!<SPAN class=\"bsptext\">\([^<>]*\)</SPAN>!$(tput setaf 245)\1$(tput sgr0)!g
-      s!</\?SPAN[^>]*>!!g
       s! +! !g;
       s!<div part=\"[^\"]*\">!\n\n&!g
       s!<sense n=\"\([^\"]*\)\"!\n$(tput setaf 5)\1.$(tput sgr0) &!g;
@@ -236,19 +269,13 @@ let
       s!</\?div[^>]*>!!g
       s!<span lang=\"gr\">!!g # unbalanced in Frisk
       s!^\s*[0-9])!$(tput setaf 5)&$(tput sgr0)!g
-      s#^\(-->.*\)\$#$(tput bold)\1$(tput sgr0)#
+      s!</\?span[^>]*>!!gI
+      s!</\?p[^>]*>!!gI
     " | less -FR
   '';
-in
+in {
-{
-  # https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
-  # https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
-  # http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
-  # http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
-  # http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
-  # http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
   environment.etc.stardict.source = toString (makeStardictDataDir ({
-    Crum = builtins.fetchTarball {
+      Crum = pkgs.fetchzip {
         url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
         sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
       };
@@ -260,14 +287,82 @@ in
         url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
         sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
       };
-  } // dictionaries.classics // dictionaries.sanskrit // dictionaries.oed // dictionaries.russian // dictionaries.englishGerman));
+    }
+    // dictionaries.classics
+    // dictionaries.sanskrit
+    // dictionaries.oed
+    // dictionaries.russian
+    // dictionaries.englishGerman));
 
   environment.systemPackages = [
     pkgs.goldendict
-    (makeStardict "sd-classics" dictionaries.classics)
+    (makeStardict "lsj" dictionaries.classics)
-    (makeStardict "sd-sanskrit" dictionaries.sanskrit)
+    (makeStardict "sa" dictionaries.sanskrit)
-    (makeStardict "sd-oed" dictionaries.oed)
+    (makeStardict "oed" dictionaries.oed)
     (makeStardict "sd-russian" dictionaries.russian)
     (makeStardict "sd" dictionaries.englishGerman)
+    (makeStardict "jbo" dictionaries.lojban)
   ];
 }
+/*
+ https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
+ https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
+ http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
+ http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
+ http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
+ http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
+ 
+ Duden_Rechtschreibung = pkgs.fetchzip {
+   url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
+   sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
+ };
+ Duden = pkgs.fetchzip {
+   url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
+   sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
+ };
+ FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
+   url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
+   sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
+ };
+ Cappeller = pkgs.fetchzip {
+   url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
+   sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
+   stripRoot = false;
+ };
+ Yates = pkgs.fetchzip {
+   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
+   sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
+   stripRoot = false;
+ };
+ Wilson = pkgs.fetchzip {
+   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
+   sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
+   stripRoot = false;
+ };
+ SpokenSanskrit = pkgs.fetchzip {
+   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
+   sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
+   stripRoot = false;
+ };
+ Grassmann = pkgs.fetchzip {
+   url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
+   sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
+   stripRoot = false;
+ };
+ Benfey = pkgs.fetchzip {
+   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
+   sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
+   stripRoot = false;
+ };
+ ApteSa = pkgs.fetchzip {
+   url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
+   sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
+   stripRoot = false;
+ };
+ MacDonell = pkgs.fetchzip {
+   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
+   sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
+   stripRoot = false;
+ };
+ */
+

configs/sxiv.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   important-directories = pkgs.writeText "directories" ''
     h	~/
     d	~/cloud/Dropbox/
@@ -15,8 +18,7 @@ in {
   environment.systemPackages = [pkgs.sxiv];
 
   # TODO fix
-  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source =
+  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
-    pkgs.writers.writeDash "key-handler" ''
     PATH=$PATH:${
       lib.makeBinPath [
         pkgs.gnused

configs/telegram-bots/astrology.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   nixpkgs-unstable = import <nixpkgs-unstable> {};
   toSymbols = pkgs.writers.writeDash "to-symbols" ''
     ${pkgs.gnused}/bin/sed '
@@ -39,7 +42,7 @@ let
   '';
 in {
   niveum.telegramBots.transits = {
-    enable = true;
+    enable = false;
     time = "*:0/1";
     token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
     chatIds = ["-1001796440545"];

configs/telegram-bots/autorenkalender.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   autorenkalender-package = pkgs.fetchFromGitHub {
     owner = "kmein";
     repo = "autorenkalender";

configs/telegram-bots/default.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   telebots = pkgs.callPackage <telebots> {};
   reverseDirectory = "/run/telegram-reverse";
   proverbDirectory = "/run/telegram-proverb";
@@ -14,7 +18,8 @@ in {
     <niveum/modules/telegram-bot.nix>
   ];
 
-  systemd.tmpfiles.rules = map (path: tmpfilesConfig {
+  systemd.tmpfiles.rules = map (path:
+    tmpfilesConfig {
       type = "d";
       mode = "0750";
       age = "1h";

configs/telegram-bots/literature-quote.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
   inherit (scripts) literature-quote;
 in {

configs/telegram-bots/nachtischsatan.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   nachtischsatan-bot = {token}:
     pkgs.writers.writePython3 "nachtischsatan-bot" {
       libraries = [pkgs.python3Packages.python-telegram-bot];

configs/telegram-bots/tlg-wotd.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
   niveum.telegramBots.tlg-wotd = {
     enable = true;
     time = "9:30";

configs/theming.nix

@@ -1,9 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   theme = (import <niveum/lib>).theme pkgs;
 in {
-  environment.systemPackages =
+  environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
-    [ theme.gtk.package theme.icon.package theme.cursor.package ];
 
   services.xserver.displayManager.lightdm.greeters.gtk = {
     theme = {inherit (theme.gtk) name package;};

configs/tmux.nix

@@ -9,26 +9,44 @@
     keyMode = "vi";
     clock24 = true;
     terminal = "screen-256color";
+    baseIndex = 1;
+    aggressiveResize = true;
+    escapeTime = 50;
+    historyLimit = 7000;
+    shortcut = "a";
     extraConfig = ''
+      set -g mouse on
+
+      unbind *
+      bind * list-clients
+
+      # naVIgate
+      bind h select-pane -L
+      bind j select-pane -D
+      bind k select-pane -U
+      bind l select-pane -R
+
+      # Use C-h and C-l to cycle through panes
+      bind -r C-h select-window -t :-
+      bind -r C-l select-window -t :+
+
+      setw -g monitor-activity on
+      set -g visual-activity on
+
       set -g status-interval 2
       set -g status-left-length 32
       set -g status-right-length 150
 
-      set -g status-bg default
+      set -g status-bg colour242
 
       setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
       setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
 
       set -g status-left ""
-      set -g status-right "#[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
+      set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
       set -g status-justify left
 
       set -g status-position bottom
-
-      set -g mouse on
-
-      unbind *
-      bind * list-clients
     '';
   };
 }

configs/tor.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   services.tor.enable = true;
-  services.tor.torsocks.enable = true;
+  environment.systemPackages = [pkgs.tor];
 }

configs/traadfri.nix

@@ -1,9 +1,11 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) localAddresses;
   living-room-id = 131090;
-in
+in {
-{
   imports = [<niveum/modules/traadfri.nix>];
 
   environment.systemPackages = [
@@ -29,7 +31,7 @@ in
       bedroom = 131082;
       living-room = living-room-id;
       bedside = 131087;
+      chain = 131089;
     };
-    bulbs.kette = 65570;
   };
 }

configs/wallpaper.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [<stockholm/krebs/3modules/fetchWallpaper.nix>];
 
   krebs.fetchWallpaper = {

configs/watson.nix

@@ -1,18 +1,9 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = [pkgs.watson];
 
-  home-manager.users.me.xdg.configFile."watson/config".text = ''
+  environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";
-    [options]
-    confirm_new_project = true
-    confirm_new_tag = true
-    date_format = %Y-%m-%d
-    log_current = true
-    report_current = true
-  '';
-
-  system.activationScripts.watson-home = ''
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Documents/watson/frames ${config.users.users.me.home}/.config/watson/frames
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Documents/watson/state ${config.users.users.me.home}/.config/watson/state
-  '';
 }

configs/zsh.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   home-manager.users.me.home.file.".zshrc".text = ''
     # nothing to see here
   '';

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1638122382,
+        "lastModified": 1648297722,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1639871969,
+        "lastModified": 1648834319,
-        "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
+        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
+        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1632420452,
+        "lastModified": 1644957911,
-        "narHash": "sha256-ncK6vABW/Ku9XI0kqj1otarUfblryoQzSaOCnaZ0oSs=",
+        "narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=",
         "owner": "Mic92",
         "repo": "krops",
-        "rev": "0388970c568905fedcbf429e5745aacd4f7a6633",
+        "rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     "menstruation-backend": {
       "flake": false,
       "locked": {
-        "lastModified": 1634573652,
+        "lastModified": 1649545504,
-        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
+        "narHash": "sha256-TVm3246ML7gWPeGm+bdb+Qo8o/7nve7sQ2hBdCZm3z8=",
         "owner": "kmein",
         "repo": "menstruation.rs",
-        "rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
+        "rev": "d9f3c6d53542fd7c7ed191e37cf4e342d4a47bcb",
         "type": "github"
       },
       "original": {
@@ -109,27 +109,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641829252,
+        "lastModified": 1649490789,
-        "narHash": "sha256-CI0qi7k1Y4nFna+kdQtVCbN4ZEVwZcD/oIGgfTcUNrA=",
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5d3420c1285073d5061a5d88a533b347d1222750",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-21.11",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1641935776,
+        "lastModified": 1649541735,
-        "narHash": "sha256-8q/V9EgzyW0KvGnBjbTfQ19qoTCFqsEd1mF9DheCukw=",
+        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd20b7f07fd337b2e85420edd642382a2cc0196d",
+        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1641939337,
+        "lastModified": 1647444524,
-        "narHash": "sha256-VDVe1VtHM/BdndP2Ta5jRyQaBpdu+Dh250jRS4rfb9A=",
+        "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "4fcbe17549fa742a32e05b5f2ca57a983ad500c1",
+        "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1639436812,
+        "lastModified": 1648400983,
-        "narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
+        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
+        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1641747862,
+        "lastModified": 1649089964,
-        "narHash": "sha256-gAGM3sxCP//k83CUow3ZpeHQCeuW62YJ6kWvWd8D1vk=",
+        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
         "ref": "master",
-        "rev": "f67bd5783d6ed2be836c7714ea38cbb3f7ac7257",
+        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
-        "revCount": 10285,
+        "revCount": 10500,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

flake.nix

@@ -2,7 +2,7 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
@@ -16,42 +16,75 @@
     };
 
     # legacy
-    menstruation-backend = { url = "github:kmein/menstruation.rs"; flake = false; };
+    menstruation-backend = {
-    menstruation-telegram = { url = "github:kmein/menstruation-telegram"; flake = false; };
+      url = "github:kmein/menstruation.rs";
-    nix-writers = { url = "git+https://cgit.krebsco.de/nix-writers"; flake = false; };
+      flake = false;
-    recht = { url = "github:kmein/recht"; flake = false; };
+    };
-    retiolum = { url = "github:krebs/retiolum"; flake = false; };
+    menstruation-telegram = {
-    scripts = { url = "github:kmein/scripts"; flake = false; };
+      url = "github:kmein/menstruation-telegram";
-    stockholm = { url = "git+https://cgit.lassul.us/stockholm"; flake = false; };
+      flake = false;
-    telebots = { url = "github:kmein/telebots"; flake = false; };
+    };
-    tinc-graph = { url = "github:kmein/tinc-graph"; flake = false; };
+    nix-writers = {
-    traadfri = { url = "github:kmein/traadfri"; flake = false; };
+      url = "git+https://cgit.krebsco.de/nix-writers";
-    tuna = { url = "github:kmein/tuna"; flake = false; };
+      flake = false;
+    };
+    recht = {
+      url = "github:kmein/recht";
+      flake = false;
+    };
+    retiolum = {
+      url = "github:krebs/retiolum";
+      flake = false;
+    };
+    scripts = {
+      url = "github:kmein/scripts";
+      flake = false;
+    };
+    stockholm = {
+      url = "git+https://cgit.lassul.us/stockholm";
+      flake = false;
+    };
+    telebots = {
+      url = "github:kmein/telebots";
+      flake = false;
+    };
+    tinc-graph = {
+      url = "github:kmein/tinc-graph";
+      flake = false;
+    };
+    traadfri = {
+      url = "github:kmein/traadfri";
+      flake = false;
+    };
+    tuna = {
+      url = "github:kmein/tuna";
+      flake = false;
+    };
   };
 
-  outputs =
+  outputs = {
-  { self
+    self,
-  , flake-utils
+    flake-utils,
-  , home-manager
+    home-manager,
-  , krops
+    krops,
-  , menstruation-backend
+    menstruation-backend,
-  , menstruation-telegram
+    menstruation-telegram,
-  , nix-writers
+    nix-writers,
-  , nixpkgs
+    nixpkgs,
-  , nixpkgs-unstable
+    nixpkgs-unstable,
-  , recht
+    recht,
-  , retiolum
+    retiolum,
-  , scripts
+    scripts,
-  , stockholm
+    stockholm,
-  , telebots
+    telebots,
-  , tinc-graph
+    tinc-graph,
-  , traadfri
+    traadfri,
-  , tuna
+    tuna,
-  }@inputs:
+  } @ inputs: let
-  let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
-    source = name: {
+    source = name:
+      {
         niveum.file = toString ./.;
         nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
         system-secrets.pass = {
@@ -62,31 +95,18 @@
           dir = toString ~/.password-store;
           name = "shared";
         };
-    } // nixpkgs.lib.mapAttrs' (name: value: {
+      }
+      // nixpkgs.lib.mapAttrs' (name: value: {
         inherit name;
-      value.git = {
+        value.file = toString value;
-        url = {
-          # having to declare the git upstream urls here is suboptimal, but the inputs don't remember where they're from
-          home-manager = "https://github.com/nix-community/home-manager";
-          menstruation-backend = "https://github.com/kmein/menstruation.rs";
-          menstruation-telegram = "https://github.com/kmein/menstruation-telegram";
-          nix-writers = "https://cgit.krebsco.de/nix-writers";
-          nixpkgs = "https://github.com/NixOS/nixpkgs";
-          nixpkgs-unstable = "https://github.com/NixOS/nixpkgs";
-          recht = "https://github.com/kmein/recht";
-          retiolum = "https://github.com/krebs/retiolum";
-          scripts = "https://github.com/kmein/scripts";
-          stockholm = "https://cgit.lassul.us/stockholm";
-          telebots = "https://github.com/kmein/telebots";
-          tinc-graph = "https://github.com/kmein/tinc-graph";
-          traadfri = "https://github.com/kmein/traadfri";
-          tuna = "https://github.com/kmein/tuna";
-        }.${name};
-        ref = value.rev;
-        shallow = true;
-      };
       }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name ["flake-utils" "krops" "self"]) inputs);
-    deployScriptFor = {name, host}: let inherit (import ./lib/default.nix) sshPort; in toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
+    deployScriptFor = {
+      name,
+      host,
+    }: let
+      inherit (import ./lib/default.nix) sshPort;
+    in
+      toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
         source = krops.lib.evalSource [(source name)];
         target = "root@${host}:${toString sshPort}";
       });
@@ -97,7 +117,10 @@
         name = "deploy-${name}";
         value = {
           type = "app";
-          program = deployScriptFor { inherit name; host = "${name}.r"; };
+          program = deployScriptFor {
+            inherit name;
+            host = "${name}.r";
+          };
         };
       });
       ciScripts = forSystems (name: {
@@ -107,6 +130,7 @@
           program = import ./ci.nix {inherit name system inputs;};
         };
       });
-    in deployScripts // ciScripts;
+    in
+      deployScripts // ciScripts;
   };
 }

lib/colours/ibm-3270.nix

@@ -0,0 +1,37 @@
+rec {
+  black = {
+    bright = "#888888";
+    dark = "#222222";
+  };
+  red = {
+    bright = "#ef8383";
+    dark = "#f01818";
+  };
+  yellow = {
+    bright = "#efe28b";
+    dark = "#f8d824";
+  };
+  green = {
+    bright = "#23d830";
+    dark = "#7ed684";
+  };
+  blue = {
+    bright = "#b3bfef";
+    dark = "#7890f0";
+  };
+  magenta = {
+    bright = "#efb3e3";
+    dark = "#f078d8";
+  };
+  cyan = {
+    bright = "#9ce2e2";
+    dark = "#54e4e4";
+  };
+  white = {
+    bright = "#ffffff";
+    dark = "#a5a5a5";
+  };
+  background = "#000000";
+  foreground = "#bbbbbb";
+  cursor = green.bright;
+}

lib/default.nix

@@ -1,21 +1,46 @@
 rec {
-  tmpfilesConfig = {type, path, mode ? "-", user ? "-", group ? "-", age ? "-", argument ? "-"}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
+  tmpfilesConfig = {
+    type,
+    path,
+    mode ? "-",
+    user ? "-",
+    group ? "-",
+    age ? "-",
+    argument ? "-",
+  }: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
+
+  restic = rec {
+    port = 3571;
+    host = "zaatar.r";
+    repository = "rest:http://${host}:${toString port}/";
+  };
 
   firewall = lib: {
-    accept = { source, protocol, dport }: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
+    accept = {
+      source,
+      protocol,
+      dport,
+    }: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
     addRules = lib.concatMapStringsSep "\n" (rule: "iptables -A ${rule}");
     removeRules = lib.concatMapStringsSep "\n" (rule: "iptables -D ${rule} || true");
   };
 
   serveHtml = file: pkgs: ''
     default_type "text/html";
-    root ${pkgs.linkFarm "fahrplan" [{ name = "index.html"; path = file; }]};
+    root ${
+      pkgs.linkFarm "fahrplan" [
+        {
+          name = "index.html";
+          path = file;
+        }
+      ]
+    };
     index index.html;
   '';
 
   sshPort = 22022;
 
-  colours = import ./colours/mac-os.nix;
+  colours = import ./colours/ibm-3270.nix;
 
   theme = pkgs: {
     gtk = {
@@ -44,7 +69,8 @@ rec {
     github = "kmein";
     email = "kmein@posteo.de";
     name = "Kierán Meinhardt";
-    sshKeys = pkgs: pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
+    sshKeys = pkgs:
+      pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
         url = "https://github.com/kmein.keys";
         sha256 = "09c6ny0rmpid1m0pc1wsmb3wyy9g721lf4kv55i4lrp42b3i2d5b";
       }));
@@ -56,6 +82,7 @@ rec {
     manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
     toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
     zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
+    tahina.id = "UKJ2CBO-EQPKQL4-3QLRUSG-SSYR6AB-CCCUTKU-CLPYR7N-RUI5A6Y-JTL5NA4";
   };
 
   ignorePaths = [

lib/goldendict-config.nix

@@ -1,4 +1,7 @@
-{pkgs, path}: ''
+{
+  pkgs,
+  path,
+}: ''
   <config>
    <paths>
     <path recursive="1">${path}</path>

lib/i3status-rust.nix

@@ -1,5 +1,9 @@
-{ pkgs, wirelessInterface, colours, batteryName }:
+{
-let
+  pkgs,
+  wirelessInterface,
+  colours,
+  batteryName,
+}: let
   inherit (pkgs) lib;
 
   setsid = script:
@@ -95,13 +99,13 @@ in {
     {
       block = "custom";
       interval = 60 * 5;
-      command = let inherit (import <niveum/configs/spacetime.nix>) location; in "${pkgs.scripts.horoscope}/bin/horoscope --latitude=${toString location.latitude} --longitude=${toString location.longitude}";
+      command = let
-      # astrolog -zN Berlin -n -k | tail -n +4 | head -n 7 | sed 's/://g;s/\s\+/ /g;s/ R/R/;s/\[\s*/[/g;s/Sun/☉/;s/Moon/☽/;s/Merc/☿/;s/Venu/♀/;s/Mars/♂/;s/Jupi/♃/;s/Satu/♄/' | cut -f1-2 -d' ' | paste -sd' ' -
+        spacetime = import <niveum/configs/spacetime.nix>;
+      in
+        pkgs.writers.writePython3 "sun.py" {
+          libraries = [pkgs.python3Packages.astral];
+          flakeIgnore = ["E121" "E501"];
         }
-    {
-      block = "custom";
-      interval = 60 * 5;
-      command = let spacetime = import <niveum/configs/spacetime.nix>; in pkgs.writers.writePython3 "sun.py" { libraries = [ pkgs.python3Packages.astral ]; flakeIgnore = [ "E121" "E501" ]; }
         ''
           import astral
           import astral.moon
@@ -128,29 +132,15 @@ in {
         '';
     }
     {
-      block = "custom";
-      interval = 60 * 60;
-      command = pkgs.writers.writeDash "vax" ''
-        ${pkgs.curl}/bin/curl -sSL https://api.corona-zahlen.org/vaccinations \
-          | ${pkgs.jq}/bin/jq -r '"💉 Ⅰ \(.data.quote * 1000 | floor | . / 10)% Ⅱ \(.data.secondVaccination.quote * 1000 | floor | . / 10)%"'
-      '';
-    }
-    (let service = "openvpn-hu-berlin"; in {
       block = "custom";
       interval = 5;
-      command = pkgs.writers.writeDash "net-device" ''
+      command = pkgs.writers.writeDash "hu-berlin-vpn" ''
         PATH=${lib.makeBinPath [pkgs.systemd]}
-        systemctl is-active --quiet ${service}.service && echo "🎓👍" || echo "🎓👎"
+        (systemctl is-active --quiet openvpn-hu-berlin.service && echo "🎓👍 (OpenVPN)") \
+          || (systemctl is-active --quiet hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
+          || echo "🎓👎"
       '';
-      on_click = pkgs.writers.writeDash "toggle" ''
-        PATH=${lib.makeBinPath [ pkgs.systemd pkgs.libnotify ]}
-        systemctl is-active --quiet ${service}.service && {
-          systemctl stop ${service}.service && notify-send -a "${service}" stopped
-        } || {
-          systemctl start ${service}.service && notify-send -a "${service}" started
     }
-      '';
-    })
     {
       block = "net";
       device = wirelessInterface;

lib/radio-news.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>lassulus radio news</title>
+    <style>
+      body {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      main {
+        max-width: 800px;
+        margin: 0 auto;
+        display: grid;
+        grid-template-columns: 2fr 1fr;
+        grid-gap: 2em;
+      }
+
+      #news-list ul {
+        list-style: none;
+        padding-left: 0;
+      }
+
+      #news-list li {
+        margin-bottom: 1em;
+      }
+
+      #news-list time {
+        display: block;
+        color: grey;
+      }
+
+      form label {
+        display: block;
+      }
+
+      form input,
+      form textarea {
+        width: 100%;
+        margin-bottom: 1em;
+      }
+
+      @media only screen and (max-width: 768px) {
+        main {
+          grid-template-columns: 1fr;
+        }
+      }
+    </style>
+    <script>
+      const newsEndpoint = "http://prism.r:7999";
+
+      function isoString(date) {
+        return date.toISOString().slice(0, -5) + "Z";
+      }
+
+      function setNextNews() {
+        document.getElementById("next-news").innerHTML = (
+          60 - new Date().getUTCMinutes()
+        ).toString();
+      }
+
+      setInterval(setNextNews, 6000);
+
+      function fetchNews() {
+        fetch(newsEndpoint).then((response) => {
+          response.json().then((news) => {
+            const newsList = document.getElementById("news-list");
+            newsList.innerHTML = "";
+            const ul = document.createElement("ul");
+            for (const newsItem of news) {
+              const start = new Date(newsItem.from);
+              const end = new Date(newsItem.to);
+
+              const li = document.createElement("li");
+
+              const startDate = document.createElement("time");
+              startDate.className = "start";
+              startDate.title = start.toString();
+              startDate.setAttribute("datetime", isoString(start));
+              startDate.appendChild(document.createTextNode(isoString(start)));
+
+              const endDate = document.createElement("time");
+              endDate.className = "end";
+              endDate.title = end.toString();
+              endDate.setAttribute("datetime", isoString(end));
+              endDate.appendChild(document.createTextNode(isoString(end)));
+
+              li.appendChild(document.createTextNode(newsItem.text));
+              li.appendChild(startDate);
+              li.appendChild(endDate);
+              ul.appendChild(li);
+            }
+            newsList.appendChild(ul);
+          });
+        });
+      }
+
+      function sendNews(event) {
+        event.preventDefault();
+        const formData = new FormData(event.target);
+
+        const request = new XMLHttpRequest();
+        request.open("POST", newsEndpoint, false); // synchronous
+        request.send(
+          JSON.stringify({
+            from: isoString(new Date(formData.get("from"))),
+            to: isoString(new Date(formData.get("to"))),
+            text: formData.get("text"),
+          })
+        );
+        location.reload();
+      }
+
+      window.onload = () => {
+        setNextNews();
+        fetchNews();
+      };
+    </script>
+  </head>
+  <body>
+    <main>
+      <section>
+        <h1>Submit news</h1>
+        <form onsubmit="sendNews(event)">
+          <label>Start date</label>
+          <input type="datetime-local" name="from" required />
+          <label>End date</label>
+          <input type="datetime-local" name="to" required />
+          <label>News text</label>
+          <textarea name="text" rows="10" required></textarea>
+          <input type="submit" />
+        </form>
+        Next news report should start in <span id="next-news"></span> minutes.
+      </section>
+      <aside>
+        <h1>Planned news</h1>
+        <div id="news-list">
+          <em>No news planned yet.</em>
+        </div>
+      </aside>
+    </main>
+  </body>
+</html>

lib/retiolum-network.nix

@@ -18,4 +18,9 @@
     ipv4 = "10.243.2.85";
     ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
   };
+
+  tahina = {
+    ipv4 = "10.243.2.74";
+    ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
+  };
 }

lib/vim/init.vim

@@ -8,7 +8,6 @@ nnoremap <C-l> :Rg<CR>
 let g:fzf_layout = { 'down': '~15%' }
 
 colorscheme paramount
-set background=dark
 " transparent background
 hi Normal guibg=NONE ctermbg=NONE
 
@@ -17,7 +16,7 @@ let maplocalleader="\\"
 
 " noremap <Leader>h :<C-u>split<CR>
 " noremap <Leader>v :<C-u>vsplit<CR>
-noremap <Leader>gs :Git status<CR>
+noremap <Leader>gs :Git<CR>
 noremap <Leader>gc :Git commit<CR>
 noremap <leader>n :bn<CR>
 noremap <leader>p :bp<CR>
@@ -35,11 +34,17 @@ nnoremap <Leader>a <Plug>(ale_hover)
 nnoremap <Leader>d <Plug>(ale_go_to_definition_in_tab)
 nnoremap <Leader>rf <Plug>(ale_find_references)
 
+" Hit `%` on `if` to jump to `else`.
+runtime macros/matchit.vim
+
 filetype plugin indent on
+set autoindent
 set notitle
 set nospell
-set nocompatible
 set smartcase ignorecase " you need these two
+set backspace=indent,eol,start
+set hidden
+set ruler
 set shiftwidth=2 tabstop=2 expandtab
 set laststatus=1
 set number
@@ -109,6 +114,8 @@ command! ToggleBackground call s:toggle_background()
 inoremap <F12> <C-O>:ToggleBackground<CR>
 nnoremap <F12> :ToggleBackground<CR>
 
+augroup filetypes
+  autocmd!
   autocmd bufnewfile,bufread *.4th set filetype=forth
   autocmd bufnewfile,bufread *.asm set filetype=nasm
   autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
@@ -128,10 +135,12 @@ autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax |
   autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
   autocmd filetype javascript packadd vim-javascript
   autocmd filetype make setlocal noexpandtab
-
   autocmd filetype html packadd emmet-vim
   autocmd filetype gitcommit setlocal spell spelllang=en
   autocmd filetype mail setlocal spell spelllang=de textwidth=0
+augroup end
+
+
 autocmd bufreadpost *
       \ if line("'\"") > 0 && line("'\"") <= line("$") |
       \ exe "normal! g`\"" |

modules/dropbox.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let cfg = config.niveum.dropbox;
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.niveum.dropbox;
 in {
   options.niveum.dropbox = {enable = mkEnableOption "Dropbox";};
 

modules/hledger.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.niveum.hledger;
   hledger-git = pkgs.writers.writeDashBin "hledger-git" ''
     LEDGER_DIR="$(dirname $LEDGER_FILE)"

modules/minecraft.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let cfg = config.niveum.minecraft;
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.niveum.minecraft;
 in {
   options.niveum.minecraft = {enable = mkEnableOption "Minecraft";};
 

modules/moodle-dl.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.services.moodle-dl;
   json = pkgs.formats.json {};
   moodle-dl-json = json.generate "moodle-dl.json" cfg.settings;
@@ -52,7 +56,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-
     users.users.moodle-dl = {
       isSystemUser = true;
       home = cfg.directory;

modules/networkmanager-declarative.nix

@@ -1,38 +1,53 @@
 # https://github.com/jmackie/nixos-networkmanager-profiles/
-{ lib, config, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  ...
+}:
+with lib; let
   nm = config.networking.networkmanager;
 
   mkProfile = profileAttrs:
-    if !(isAttrs profileAttrs) then
+    if !(isAttrs profileAttrs)
-      throw "error 1"
+    then throw "error 1"
     else {
       enable = true;
       mode = "0400"; # readonly (user)
-      text = (foldlAttrs (accum:
+      text =
-        { name, value }: ''
+        (foldlAttrs (accum: {
+            name,
+            value,
+          }: ''
             ${accum}
 
             [${name}] ${mkProfileEntry value}'')
-        "# Generated by nixos-networkmanager-profiles" profileAttrs) + "\n";
+          "# Generated by nixos-networkmanager-profiles"
+          profileAttrs)
+        + "\n";
     };
 
   mkProfileEntry = entryAttrs:
-    if !(isAttrs entryAttrs) then
+    if !(isAttrs entryAttrs)
-      throw "error 2"
+    then throw "error 2"
     else
-      foldlAttrs (accum:
+      foldlAttrs (accum: {
-        { name, value }: ''
+        name,
+        value,
+      }: ''
         ${accum}
-          ${name}=${toString value}'') "" entryAttrs;
+        ${name}=${toString value}'') ""
+      entryAttrs;
 
   foldlAttrs = op: nul: attrs:
-    foldl (accum: { fst, snd }: op accum (nameValuePair fst snd)) nul
+    foldl (accum: {
+      fst,
+      snd,
+    }:
+      op accum (nameValuePair fst snd))
+    nul
     (lists.zipLists (attrNames attrs) (attrValues attrs));
 
   attrLength = attrs: length (attrValues attrs);
-
 in {
   options.networking.networkmanager.profiles = mkOption {
     type = types.attrs;
@@ -40,11 +55,15 @@ in {
   };
 
   config = mkIf (attrLength nm.profiles > 0) {
-    environment.etc = (foldlAttrs (accum:
+    environment.etc = foldlAttrs (accum: {
-      { name, value }:
+      name,
-      accum // {
+      value,
+    }:
+      accum
+      // {
         "NetworkManager/system-connections/${name}.nmconnection" =
           mkProfile value;
-      }) { } nm.profiles);
+      }) {}
+    nm.profiles;
   };
 }

modules/retiolum.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
+{
-with lib;
+  config,
-let
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
   netname = "retiolum";
   cfg = config.networking.retiolum;
 in {
@@ -27,10 +31,10 @@ in {
   };
 
   config = {
-
     services.tinc.networks.${netname} = {
       name = cfg.nodename;
-      hosts = builtins.mapAttrs
+      hosts =
+        builtins.mapAttrs
         (name: _: builtins.readFile "${<retiolum/hosts>}/${name}")
         (builtins.readDir <retiolum/hosts>);
       rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;

modules/spotifyd.nix

@@ -1,13 +1,17 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-with lib;
+  lib,
-
+  pkgs,
-let
+  ...
+}:
+with lib; let
   cfg = config.services.spotifyd;
   toml = pkgs.formats.toml {};
-  spotifydConf = if cfg.settings != {} then toml.generate "spotify.conf" cfg.settings else pkgs.writeText "spotifyd.conf" cfg.config;
+  spotifydConf =
-in
+    if cfg.settings != {}
-{
+    then toml.generate "spotify.conf" cfg.settings
+    else pkgs.writeText "spotifyd.conf" cfg.config;
+in {
   options = {
     services.spotifyd = {
       enable = mkEnableOption "spotifyd, a Spotify playing daemon";

modules/system-dependent.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
-with lib;
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   options.niveum = {
     wirelessInterface = mkOption {type = types.str;};
 

modules/telegram-bot.nix

@@ -1,6 +1,10 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.niveum.telegramBots;
 
   botService = name: bot:
@@ -17,7 +21,8 @@ let
             lib.strings.optionalString (bot.parseMode != null)
             "-d parse_mode=${bot.parseMode}"
           }
-        '') bot.chatIds
+        '')
+        bot.chatIds
         ++ ["fi"]);
     };
 in {

modules/traadfri.nix

@@ -1,6 +1,10 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let
+  lib,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.niveum.traadfri;
   traadfri = pkgs.callPackage <traadfri> {
     libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {tls = true;};
@@ -22,19 +26,24 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.shellAliases = lib.attrsets.mapAttrs' (name: value:
+    environment.systemPackages =
-      lib.nameValuePair "traadfri-${name}" "traadfri --target Bulb ${toString value}")
+      [
-      cfg.bulbs // lib.attrsets.mapAttrs' (name: value:
-        lib.nameValuePair "traadfri-${name}" "traadfri --target Room ${toString value}")
-      cfg.rooms;
-
-    environment.systemPackages = [
         (pkgs.writers.writeDashBin "traadfri" ''
           TRAADFRI_USER="${cfg.user}" \
           TRAADFRI_KEY="${cfg.key}" \
           TRAADFRI_HUB="${cfg.host}" \
           ${traadfri}/bin/traadfri $@
         '')
-    ];
+      ]
+      ++ lib.mapAttrsToList (name: value:
+        pkgs.writers.writeDashBin "traadfri-${name}" ''
+          exec traadfri --target Room ${toString value} "$@"
+        '')
+      cfg.rooms
+      ++ lib.mapAttrsToList (name: value:
+        pkgs.writers.writeDashBin "traadfri-${name}" ''
+          exec traadfri --target Bulb ${toString value} "$@"
+        '')
+      cfg.bulbs;
   };
 }

modules/tuna.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   tuna = pkgs.callPackage <tuna> {};
   cfg = config.services.tuna;
 in {

overlays/overlays.nix

@@ -1,6 +1,6 @@
 self: super:
-with super.lib;
+with super.lib; let
-let
   eval = import <nixpkgs/nixos/lib/eval-config.nix>;
   paths = (eval {modules = [(import <nixos-config>)];}).config.nixpkgs.overlays;
-in foldl' (flip extends) (_: super) paths self
+in
+  foldl' (flip extends) (_: super) paths self

packages/daybook.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  pandoc,
+  fetchFromGitHub,
+}:
 stdenv.mkDerivation {
   name = "daybook";
   src = fetchFromGitHub {

packages/depp.nix

@@ -1,5 +1,7 @@
-{ lib, writeShellScriptBin }:
+{
-let
+  lib,
+  writeShellScriptBin,
+}: let
   aliasFlag = name: value: "-c alias.${name}=${lib.escapeShellArg value}";
   aliases = {
     eroeffne = "init";
@@ -20,7 +22,8 @@ let
     tagebuch = "log";
     zustand = "status";
   };
-in writeShellScriptBin "depp" ''
+in
+  writeShellScriptBin "depp" ''
     if [ $# -gt 0 ]; then
       git ${lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)} "$@"
     else

packages/devanagari/yarn.nix

@@ -1,4 +1,10 @@
-{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+{
+  fetchurl,
+  fetchgit,
+  linkFarm,
+  runCommandNoCC,
+  gnutar,
+}: rec {
   offline_cache = linkFarm "offline" packages;
   packages = [
     {

packages/devour.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, xdo, makeWrapper, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  xdo,
+  makeWrapper,
+  fetchFromGitHub,
+}:
 stdenv.mkDerivation {
   name = "devour";
   version = "master";

packages/gfs-fonts.nix

@@ -1,5 +1,8 @@
-{ fetchzip, symlinkJoin, lib }:
+{
-let
+  fetchzip,
+  symlinkJoin,
+  lib,
+}: let
   gfs-font = name: sha256:
     fetchzip {
       inherit name sha256;
@@ -10,7 +13,8 @@ let
         unzip -j -o $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
       '';
     };
-in symlinkJoin {
+in
+  symlinkJoin {
     name = "gfs-fonts";
     paths = lib.mapAttrsToList gfs-font {
       GFS_Artemisia = "1q39086pr2jhv118fjfv6l1li6japv4pdjnhh1scqw06mqrmydf4";

packages/gourmet.nix

@@ -2,7 +2,6 @@
 {pkgs ? import <nixpkgs> {}}:
 with pkgs;
 with pkgs.python2Packages;
-
   buildPythonApplication rec {
     pname = "gourmet";
     version = "0.17.4";

packages/iolanguage.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, cmake, python3, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  cmake,
+  python3,
+  fetchFromGitHub,
+}:
 stdenv.mkDerivation rec {
   version = "2017.09.06";
   name = "iolanguage-${version}";
@@ -17,8 +23,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     homepage = "https://iolanguage.org/";
-    description =
+    description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
-      "Io programming language. Inspired by Self, Smalltalk and LISP.";
     license = licenses.bsd3;
   };
 }

packages/ix.nix

@@ -1,4 +1,7 @@
-{ stdenv, fetchurl }:
+{
+  stdenv,
+  fetchurl,
+}:
 stdenv.mkDerivation {
   name = "ix";
   src = fetchurl {

packages/libcoap.nix

@@ -1,6 +1,18 @@
-{ lib, pkg-config, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
+{
-, doxygen, asciidoc
+  lib,
-, tls ? false, docs ? true }:
+  pkg-config,
+  fetchFromGitHub,
+  automake,
+  autoconf,
+  which,
+  libtool,
+  stdenv,
+  gnutls,
+  doxygen,
+  asciidoc,
+  tls ? false,
+  docs ? true,
+}:
 stdenv.mkDerivation {
   name = "libcoap";
   version = "unstable-2021-05-28";
@@ -11,7 +23,8 @@ stdenv.mkDerivation {
     sha256 = "1igjv0hbwmakdccp5in4gw9w2p5swxdwsdx0glyna2s29sh1d37x";
     fetchSubmodules = true;
   };
-  buildInputs = [ which pkg-config automake autoconf libtool ]
+  buildInputs =
+    [which pkg-config automake autoconf libtool]
     ++ lib.optionals docs [doxygen asciidoc]
     ++ lib.optional tls gnutls;
   # preConfigure = "./autogen.sh";

packages/mahlzeit.nix

@@ -1,6 +1,22 @@
-{ lib, fetchFromGitHub, mkDerivation, ansi-terminal, base, directory, doctest, filepath
+{
-, megaparsec, optparse-applicative, prettyprinter, process
+  lib,
-, raw-strings-qq, stdenv, tasty, tasty-hunit, text, yaml
+  fetchFromGitHub,
+  mkDerivation,
+  ansi-terminal,
+  base,
+  directory,
+  doctest,
+  filepath,
+  megaparsec,
+  optparse-applicative,
+  prettyprinter,
+  process,
+  raw-strings-qq,
+  stdenv,
+  tasty,
+  tasty-hunit,
+  text,
+  yaml,
 }:
 mkDerivation {
   pname = "mahlzeit";
@@ -14,15 +30,32 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    ansi-terminal base directory filepath megaparsec prettyprinter text
+    ansi-terminal
+    base
+    directory
+    filepath
+    megaparsec
+    prettyprinter
+    text
     yaml
   ];
   executableHaskellDepends = [
-    ansi-terminal base directory filepath optparse-applicative process
+    ansi-terminal
-    text yaml
+    base
+    directory
+    filepath
+    optparse-applicative
+    process
+    text
+    yaml
   ];
   testHaskellDepends = [
-    base doctest megaparsec raw-strings-qq tasty tasty-hunit
+    base
+    doctest
+    megaparsec
+    raw-strings-qq
+    tasty
+    tasty-hunit
   ];
   homepage = "https://github.com/kmein/mahlzeit";
   description = "Recipe toolkit";

packages/man/pandoc.nix

@@ -1,4 +1,9 @@
-{ stdenv, pandoc, lib, fetchgit }:
+{
+  stdenv,
+  pandoc,
+  lib,
+  fetchgit,
+}:
 stdenv.mkDerivation {
   name = "pandoc-doc";
   version = pandoc.version;

packages/mpv-visualizer.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  curl,
+  xclip,
+}:
+stdenvNoCC.mkDerivation rec {
+  pname = "visualizer";
+  version = "unstable-2021-07-10";
+
+  src = fetchFromGitHub {
+    owner = "mfcc64";
+    repo = "mpv-scripts";
+    rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1";
+    sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/mpv/scripts
+    cp visualizer.lua $out/share/mpv/scripts
+    runHook postInstall
+  '';
+
+  passthru.scriptName = "visualizer.lua";
+
+  meta = with lib; {
+    description = "various audio visualization";
+    homepage = "https://github.com/mfcc64/mpv-scripts";
+    license = licenses.unfree;
+    platforms = platforms.all;
+    maintainers = with maintainers; [kmein];
+  };
+}

packages/opustags.nix

@@ -1,4 +1,11 @@
-{ lib, stdenv, cmake, pkgconfig, libogg, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  cmake,
+  pkgconfig,
+  libogg,
+  fetchFromGitHub,
+}:
 stdenv.mkDerivation rec {
   name = "opustags";
   version = "1.3.0";

packages/python3Packages/betacode/default.nix

@@ -1,4 +1,9 @@
-{ fetchPypi, buildPythonPackage, pygtrie, ... }:
+{
+  fetchPypi,
+  buildPythonPackage,
+  pygtrie,
+  ...
+}:
 buildPythonPackage rec {
   pname = "betacode";
   version = "0.2";

packages/python3Packages/indic-transliteration/default.nix

@@ -1,4 +1,11 @@
-{ fetchFromGitHub, buildPythonPackage, backports_functools_lru_cache, selenium, regex, ... }:
+{
+  fetchFromGitHub,
+  buildPythonPackage,
+  backports_functools_lru_cache,
+  selenium,
+  regex,
+  ...
+}:
 buildPythonPackage rec {
   pname = "indic_transliteration";
   version = "unstable-2020-12-15";

packages/python3Packages/instaloader/default.nix

@@ -1,6 +1,10 @@
-{ buildPythonApplication, fetchPypi, requests }:
+{
-let
+  buildPythonApplication,
-in buildPythonApplication rec {
+  fetchPypi,
+  requests,
+}: let
+in
+  buildPythonApplication rec {
     pname = "instaloader";
     version = "4.2.4";
     src = fetchPypi {

packages/python3Packages/pygtrie/default.nix

@@ -1,4 +1,8 @@
-{ fetchPypi, buildPythonPackage, ... }:
+{
+  fetchPypi,
+  buildPythonPackage,
+  ...
+}:
 buildPythonPackage rec {
   pname = "pygtrie";
   version = "2.3";

packages/python3Packages/spotify-cli-linux/default.nix

@@ -1,5 +1,13 @@
-{ buildPythonPackage, buildPythonApplication, fetchPypi, pytestrunner, six, beautifulsoup4, requests, dbus-python }:
+{
-let
+  buildPythonPackage,
+  buildPythonApplication,
+  fetchPypi,
+  pytestrunner,
+  six,
+  beautifulsoup4,
+  requests,
+  dbus-python,
+}: let
   lyricwikia = buildPythonPackage rec {
     pname = "lyricwikia";
     version = "0.1.9";
@@ -11,7 +19,8 @@ let
     propagatedBuildInputs = [six beautifulsoup4 requests];
     doCheck = false;
   };
-in buildPythonApplication rec {
+in
+  buildPythonApplication rec {
     pname = "spotify-cli-linux";
     version = "1.4.2";
     src = fetchPypi {