WIP

2024-10-05 12:10:18 +02:00
114 changed files with 1215 additions and 2833 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -4,7 +4,6 @@ keys:
  - &host_kasei age1eu2a6m3adakfzelfa9pqpl74a5dz0wkyr0v7gegm5ajnx7aqmqcqsp2ftc
  - &host_dosei age179y7apa80p9unvyjtsphpzyhve90ex986vlxkx43xt9n6m7en3csqnug7c
  - &host_europa age14mer45e52r2q4uz8n3fmv69tvk8gvwany4m4ndudud8ajv3jm4nqdj9m6a
-  - &host_xps16 age1np3fg9ue2tp4l47x7waapvjxh5zcaye2j54laapy7uklamve2c4qv3gytm
  - &home age10f4a5acpar8vwz3v298r3nv7gggfpmyh4wxpkc2hwq9paq0scf8qee8lau

 creation_rules:
@ -17,7 +16,6 @@ creation_rules:
        - *host_kasei
        - *host_dosei
        - *host_europa
-        - *host_xps16
        - *home

  - path_regex: secrets/home.yaml
@ -27,13 +25,6 @@ creation_rules:
        age:
        - *home

-  - path_regex: secrets/xps16.yaml
-    key_groups:
-      - pgp:
-        - *gpg_h7x4
-        age:
-        - *host_xps16
-
  - path_regex: secrets/kasei.yaml
    key_groups:
      - pgp:
--- a/README.md
+++ b/README.md
@ -1,6 +1,5 @@
 [![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)

-
 # Nix Dotfiles

 These are my dotfiles for several nix machines.
@ -17,7 +16,6 @@ Here are some of the interesting files and dirs:
 | `/secrets` | Encrypted [sops-nix][sops-nix] secrets. |
 | `flake.nix` | The root of everyting. Defines the inputs and outputs of the project. Also applies misc overlays and adds config-wide modules. See [Nix Flakes][nix-flakes] for more information. |

-
 ## Hosts

 | Host | Machine type | Purpose |
@ -27,7 +25,6 @@ Here are some of the interesting files and dirs:
 | `Dosei` | Dell Optiplex | Work computer, mostly used for development and testing. |
 | `Europa` | Dell Optiplex | Other work computer, used as nix builder for `Dosei`. |

-
 ## home-manager configuration

 | Path | Purpose |
@ -39,28 +36,6 @@ Here are some of the interesting files and dirs:
 | `/home/services` | Configuration for services/daemons that are user-specific. |
 | `/home/shell.nix` | Shell-agnostic configuration. This includes aliases, envvars, functions, etc. |

-
-## Some useful long commands
-
-Build configuration without switching:
-
-```
-nix build .#nixosConfigurations.tsuki.config.system.build.toplevel -L
-```
-
-Check why configuration depends on package:
-
-```
-NIXPKGS_ALLOW_INSECURE=1 nix why-depends .#nixosConfigurations.tsuki.config.system.build.toplevel .#pkgs.suspiciousPackage
-```
-
-Re-encrypt sops secrets with new key:
-
-```
-sops updatekeys secrets/hosts/file.yml
-```
-
-
 [home-manager]: https://github.com/nix-community/home-manager
 [nixos-search]: https://search.nixos.org/options
 [sops-nix]: https://github.com/Mic92/sops-nix
--- a/flake.lock
+++ b/flake.lock
@ -1,28 +1,5 @@
 {
  "nodes": {
-    "anyrun": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1733604390,
-        "narHash": "sha256-i1V+K46e0OSu3T9q2QsZ3GqpIrSIZx39sRpfcDPa6wU=",
-        "ref": "plugins-application-preprocess-exec",
-        "rev": "f9ef5665febcabd03ad2f0ce561c79974194a953",
-        "revCount": 197,
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/oysteikt/anyrun"
-      },
-      "original": {
-        "ref": "plugins-application-preprocess-exec",
-        "type": "git",
-        "url": "https://git.pvv.ntnu.no/oysteikt/anyrun"
-      }
-    },
    "dotfiles": {
      "flake": false,
      "locked": {
@ -56,30 +33,9 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "anyrun",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
      },
      "locked": {
        "lastModified": 1681202837,
@ -97,7 +53,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1681202837,
@ -113,6 +69,19 @@
        "type": "github"
      }
    },
+    "fonts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668957008,
+        "narHash": "sha256-er2eUfNSG9qdBh0JvtxtftQjFfTFjRqqD8dnk5nZ1qw=",
+        "path": "/home/h7x4/git/fonts",
+        "type": "path"
+      },
+      "original": {
+        "path": "/home/h7x4/git/fonts",
+        "type": "path"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -120,20 +89,40 @@
        ]
      },
      "locked": {
-        "lastModified": 1733572789,
-        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
+        "lastModified": 1718530513,
+        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
+        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "home-manager-local": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719170506,
+        "narHash": "sha256-AROqng7/S3mTByq8DBVR6r0iW1yZH+otJkqOwLHvELE=",
+        "ref": "refs/heads/fix-stalonetrayrc-path",
+        "rev": "0e5656163c2f9ac6e2cc4de3b44beb7a137abbe6",
+        "revCount": 3588,
+        "type": "git",
+        "url": "file:///home/h7x4/git/home-manager"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/h7x4/git/home-manager"
+      }
+    },
    "matrix-synapse-next": {
      "inputs": {
        "nixpkgs": [
@ -202,11 +191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733623390,
-        "narHash": "sha256-2NcNHpofUCVam1gLhj71nbszEzki7Q/PtjH1X0MqCso=",
+        "lastModified": 1719278718,
+        "narHash": "sha256-gWQb4P9CZgKzTn4F4eWMYeUv2AQOXFlcFmFXh2apoyA=",
        "owner": "infinidoge",
        "repo": "nix-minecraft",
-        "rev": "d63629179143d079d6e4975f8c68bb71a5d3ea08",
+        "rev": "b6ff85f3b416a700ac35e33c214d7c9f4fe071fa",
        "type": "github"
      },
      "original": {
@ -215,53 +204,52 @@
        "type": "github"
      }
    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1733481457,
-        "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1733412085,
-        "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
+        "lastModified": 1719145550,
+        "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
+        "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
        "type": "indirect"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1733666439,
-        "narHash": "sha256-6DE9U/t7sB7Vs/afxbcWXaUmsmhhcBNS6BIwsgYwr04=",
+        "lastModified": 1719099622,
+        "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a68fdbb81277f4e1b01eebc7237576f89bb73d02",
+        "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "master",
+        "ref": "release-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1719254875,
+        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
    "osuchan": {
      "inputs": {
        "nixpkgs": [
@ -269,11 +257,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1684092181,
-        "narHash": "sha256-Oi6G8Jx2RkEMi3UndtAnZw61hfgKGEe7l/ILdB9ump4=",
+        "lastModified": 1672838459,
+        "narHash": "sha256-SIXzj9fbSvr/jfhhil+0cS7I6KONijdH80PFGxJi+CA=",
        "ref": "refs/heads/master",
-        "rev": "028ed8774d1cf4650fc15253146cf14451eb608c",
-        "revCount": 43,
+        "rev": "392fb541ce39f1f52908eee336d5ed409cd798ed",
+        "revCount": 42,
        "type": "git",
        "url": "file:///home/h7x4/git/osuchan-line-bot"
      },
@ -284,32 +272,53 @@
    },
    "root": {
      "inputs": {
-        "anyrun": "anyrun",
        "dotfiles": "dotfiles",
+        "fonts": "fonts",
        "home-manager": "home-manager",
+        "home-manager-local": "home-manager-local",
        "matrix-synapse-next": "matrix-synapse-next",
        "maunium-stickerpicker": "maunium-stickerpicker",
        "minecraft": "minecraft",
-        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "osuchan": "osuchan",
+        "secrets": "secrets",
        "sops-nix": "sops-nix",
        "vscode-server": "vscode-server"
      }
    },
-    "sops-nix": {
+    "secrets": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1733128155,
-        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
+        "dirtyRev": "1d1e3c1a3293e22be504749eb92ac3b050cd8622-dirty",
+        "dirtyShortRev": "1d1e3c1-dirty",
+        "lastModified": 1683506783,
+        "narHash": "sha256-iwnpd6v4tKXFDTRomzJxwYPr2mm2JR9DCCnkqsofX5c=",
+        "type": "git",
+        "url": "file:///home/h7x4/git/nix-secrets"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/h7x4/git/nix-secrets"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1719268571,
+        "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
+        "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
        "type": "github"
      },
      "original": {
@ -319,21 +328,6 @@
      }
    },
    "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -348,7 +342,7 @@
        "type": "github"
      }
    },
-    "systems_3": {
+    "systems_2": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -371,11 +365,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729422940,
-        "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
+        "lastModified": 1713958148,
+        "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
        "owner": "nix-community",
        "repo": "nixos-vscode-server",
-        "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
+        "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,16 +1,13 @@
 {
  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.11";
-    # nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";

    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-
    dotfiles = {
      url = "git+https://git.pvv.ntnu.no/oysteikt/dotfiles?ref=master";
      flake = false;
@ -53,8 +50,13 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    anyrun = {
-      url = "git+https://git.pvv.ntnu.no/oysteikt/anyrun?ref=plugins-application-preprocess-exec";
+    # Nix expressions and keys (TODO: move keys to another solution like agenix)
+    # which should be kept from the main repo for privacy reasons.
+    #
+    # Includes stuff like usernames, emails, ports, other server users, ssh hosts, etc.
+    secrets = {
+      # TODO: Push this to a remote.
+      url = "git+file:///home/h7x4/git/nix-secrets";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
@ -64,16 +66,15 @@
    nixpkgs,
    nixpkgs-unstable,
    home-manager,
-    nixos-hardware,

    dotfiles,
    matrix-synapse-next,
    maunium-stickerpicker,
    minecraft,
    osuchan,
+    secrets,
    sops-nix,
    vscode-server,
-    anyrun,
    # website
  }: let
    system = "x86_64-linux";
@ -86,10 +87,7 @@
        android_sdk.accept_license = true;
        segger-jlink.acceptLicense = true;
        permittedInsecurePackages = [
-          "segger-jlink-qt4-796s"
-          "dotnet-core-combined"
-          "dotnet-sdk-6.0.428"
-          "dotnet-sdk-wrapped-6.0.428"
+          "segger-jlink-qt4-794l"
        ];
      };

@ -99,35 +97,29 @@
          config.allowUnfree = true;
          config.segger-jlink.acceptLicense = true;
          config.permittedInsecurePackages = [
-            "segger-jlink-qt4-796s"
+            "segger-jlink-qt4-794s"
          ];
        };
      in [
-        (import ./overlays/wayland-ime-integration.nix)
+        (self: super: {
+          inherit (nonrecursive-unstable-pkgs)
+            atuin
+            wstunnel
+            nrf-udev
+            nrfutil
+            ;
+        })

-        (final: prev: {
-          mpd = prev.mpd.overrideAttrs (prev': {
-            version = "v0.23.16-unstable";
-            src = final.fetchFromGitHub {
-              owner = "MusicPlayerDaemon";
-              repo = "MPD";
-              rev = "b6e187efd8520ca9e3541e630559246c893cc304";
-              hash = "sha256-EGpBiH/Sp7xgcSpj/zKgFqDfjdr2djveC+qV57imr3E=";
-            };
+        # https://github.com/NixOS/nixpkgs/pull/251706
+        (self: super: {
+          mozc = self.qt6Packages.callPackage ./package-overrides/mozc.nix { };
+          fcitx5-mozc = self.callPackage ./package-overrides/fcitx5-mozc.nix { };
+        })

-            postPatch = prev'.postPatch + ''
-              substituteInPlace src/lib/yajl/Handle.hxx \
-                --replace-fail '<yajl_parse.h>' '<yajl/yajl_parse.h>'
-              substituteInPlace src/lib/yajl/Callbacks.hxx \
-                --replace-fail '<yajl_parse.h>' '<yajl/yajl_parse.h>'
-              substituteInPlace src/lib/yajl/Gen.hxx \
-                --replace-fail '<yajl_gen.h>' '<yajl/yajl_gen.h>'
-            '';
-
-            nativeBuildInputs = prev'.nativeBuildInputs ++ [
-              final.python3Packages.sphinx-rtd-theme
-            ];
-          });
+        (self: super: {
+          mpv-unwrapped = super.mpv-unwrapped.override {
+            ffmpeg = super.ffmpeg_6-full;
+          };
        })
      ];
    };
@ -139,7 +131,9 @@

    inherit pkgs;

-    inputs = pkgs.lib.mapAttrs (_: src: src.outPath) inputs;
+    packages.${system} = {
+      inherit (pkgs) kanidm pcloud;
+    };

    devShells.${system}.default = pkgs.mkShell {
      packages = with pkgs; [ sops ];
@ -182,6 +176,7 @@
              inherit inputs;
              inherit unstable-pkgs;
              inherit (self) extendedLib;
+              secrets = secrets.outputs.settings;
            } // (extraConfig.specialArgs or { });

            modules = [
@ -193,6 +188,7 @@
              ./modules/machineVars.nix
              ./modules/socketActivation.nix

+              secrets.outputs.nixos-config
              sops-nix.nixosModules.sops

              ({ config, ... }:
@ -204,11 +200,11 @@
                    inherit unstable-pkgs;
                    inherit (self) extendedLib;
                    inherit (config) machineVars;
+                    secrets = secrets.outputs.settings;
                  };

                  sharedModules = [
                    inputs.sops-nix.homeManagerModules.sops
-                    inputs.anyrun.homeManagerModules.default
                  ];

                  users.h7x4.imports = [
@ -225,44 +221,9 @@
            "specialArgs"
          ]));
    in {
-      dosei = nixSys "dosei" {
-        modules = [
-          {
-            home-manager.users.h7x4.home.uid = 1001;
-          }
-
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-intel
-          nixos-hardware.nixosModules.common-gpu-intel
-        ];
-      };
-      kasei = nixSys "kasei" {
-        modules = [
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-amd
-          nixos-hardware.nixosModules.common-cpu-amd-pstate
-          nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
-        ];
-      };
-      xps16 = nixSys "xps16" {
-        modules = [
-          nixos-hardware.nixosModules.common-hidpi
-          nixos-hardware.nixosModules.common-pc-laptop
-          nixos-hardware.nixosModules.common-pc-laptop-ssd
-          nixos-hardware.nixosModules.common-cpu-intel
-          nixos-hardware.nixosModules.common-gpu-intel
-        ];
-      };
-      europa = nixSys "europa" {
-        modules = [
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-intel
-          nixos-hardware.nixosModules.common-gpu-intel
-        ];
-      };
+      dosei = nixSys "dosei" { };
+      kasei = nixSys "kasei" { };
+      europa = nixSys "europa" { };
      tsuki = nixSys "tsuki" {
        modules = [
          matrix-synapse-next.nixosModules.default
--- a/home/config/xdg/default.nix
+++ b/home/config/xdg/default.nix
@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
  imports = [
    ./mimetypes.nix
@ -8,14 +8,14 @@
    enable = true;
    userDirs = {
      enable = true;
-      desktop = lib.mkDefault "${config.home.homeDirectory}/Desktop";
-      documents = lib.mkDefault "${config.home.homeDirectory}/documents";
-      download = lib.mkDefault "${config.home.homeDirectory}/Downloads";
-      music = lib.mkDefault "${config.home.homeDirectory}/music";
-      pictures = lib.mkDefault "${config.home.homeDirectory}/pictures";
-      publicShare = lib.mkDefault "${config.home.homeDirectory}/public";
-      templates = lib.mkDefault "${config.home.homeDirectory}/templates";
-      videos = lib.mkDefault "${config.home.homeDirectory}/videos";
+      desktop = "${config.home.homeDirectory}/Desktop";
+      documents = "${config.home.homeDirectory}/documents";
+      download = "${config.home.homeDirectory}/Downloads";
+      music = "${config.home.homeDirectory}/music";
+      pictures = "${config.home.homeDirectory}/pictures";
+      publicShare = "${config.home.homeDirectory}/public";
+      templates = "${config.home.homeDirectory}/templates";
+      videos = "${config.home.homeDirectory}/videos";
    };
  };
 }
--- a/home/config/xdg/directory-spec-overrides.nix
+++ b/home/config/xdg/directory-spec-overrides.nix
@ -4,7 +4,6 @@

  home.sessionVariables = let
    inherit (config.xdg) dataHome cacheHome configHome userDirs;
-    runtimeDir = "/run/user/${toString config.home.uid}";
  in {
    TEXMFHOME = "${dataHome}/texmf";
    TEXMFVAR = "${cacheHome}/texlive";
@ -37,9 +36,6 @@
    ICEAUTHORITY = "${cacheHome}/ICEauthority";
    NIMBLE_DIR = "${dataHome}/nimble";
    NLTK_DATA = "${dataHome}/nltk_data";
-    NPM_CONFIG_CACHE="${cacheHome}/npm";
-    NPM_CONFIG_INIT_MODULE="${configHome}/npm/config/npm-init.js";
-    NPM_CONFIG_TMP="${runtimeDir}/npm";
    NRFUTIL_HOME = "${dataHome}/nrfutil";
    NUGET_PACKAGES = "${cacheHome}/nuget-packages";
    PARALLEL_HOME = "${configHome}/parallel";
--- a/home/home.nix
+++ b/home/home.nix
@ -10,34 +10,22 @@ in {

    ./programs/aria2.nix
    ./programs/atuin.nix
-    ./programs/bash.nix
-    ./programs/bat.nix
    ./programs/beets.nix
-    ./programs/bottom.nix
    ./programs/comma.nix
    ./programs/direnv
-    ./programs/eza.nix
-    ./programs/fzf.nix
    ./programs/gdb.nix
-    ./programs/gh-dash.nix
    ./programs/gh.nix
+    ./programs/gh-dash.nix
    ./programs/git
    ./programs/gpg
-    ./programs/home-manager.nix
    ./programs/jq.nix
    ./programs/less.nix
-    ./programs/man.nix
    ./programs/neovim
    ./programs/nix-index
-    ./programs/pandoc.nix
-    ./programs/ripgrep.nix
    ./programs/ssh
    ./programs/tealdeer
-    ./programs/texlive.nix
    ./programs/thunderbird.nix
-    ./programs/tmux
-    ./programs/yt-dlp.nix
-    ./programs/zoxide.nix
+    ./programs/tmux.nix
    ./programs/zsh

    ./services/nix-channel-update.nix
@ -45,48 +33,34 @@ in {

    ./modules/colors.nix
    ./modules/shellAliases.nix
-    ./modules/uidGid.nix
-  ] ++ (optionals graphics [
+  ] ++ optionals graphics [
    ./config/gtk.nix

    ./programs/alacritty.nix
    ./programs/emacs
-    ./programs/feh.nix
    ./programs/firefox.nix
-    ./programs/mpv.nix
    ./programs/ncmpcpp.nix
    ./programs/newsboat
-    ./programs/obs-studio.nix
    ./programs/qutebrowser.nix
    ./programs/rofi.nix
    ./programs/taskwarrior.nix
    ./programs/vscode
+    # ./programs/xmobar
+    ./programs/xmonad
    ./programs/zathura.nix
    ./programs/zed

    ./services/copyq.nix
    ./services/dunst.nix
    ./services/fcitx5.nix
-    ./services/gnome-keyring.nix
-    ./services/keybase.nix
    ./services/mpd.nix
-    ./services/network-manager.nix
-    ./services/psd.nix
-    ./services/tumblerd.nix
-  ]) ++ (optionals machineVars.wayland [
-    ./programs/hyprland.nix
-    ./programs/waybar.nix
-    ./programs/anyrun
-  ]) ++ (optionals (!machineVars.wayland) [
-    ./programs/xmonad
-    # ./programs/xmobar
-
    ./services/picom.nix
    ./services/polybar.nix
    ./services/screen-locker.nix
    # ./services/stalonetray.nix
    ./services/sxhkd.nix
-  ]);
+    ./services/tumblerd.nix
+  ];

  sops.defaultSopsFile = ../secrets/home.yaml;
  sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519_home_sops" ];
@ -131,14 +105,8 @@ in {
    };
  };

-  dconf.settings = {
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-    };
-  };
-
  xsession = {
-    enable = !machineVars.wayland;
+    enable = true;
    # TODO: declare using xdg config home
    scriptPath = ".config/X11/xsession";
    profilePath = ".config/X11/xprofile";
@ -164,6 +132,51 @@ in {

  fonts.fontconfig.enable = mkForce true;

+  programs = {
+    home-manager.enable = true;
+
+    bash = {
+      enable = true;
+      historyFile = "${config.xdg.dataHome}/bash_history";
+      historySize = 100000;
+      bashrcExtra = ''
+        source "${config.xdg.configHome}/mutable_env.sh"
+      '';
+    };
+
+    bat.enable = true;
+    bottom = {
+      enable = true;
+      settings.flags.enable_gpu = true;
+    };
+    eza.enable = true;
+    feh.enable = mkIf graphics true;
+    fzf = {
+      enable = true;
+      defaultCommand = "fd --type f";
+    };
+    man = {
+      enable = true;
+      generateCaches = true;
+    };
+    mpv.enable = mkIf graphics true;
+    obs-studio.enable = mkIf graphics true;
+    ssh = {
+      enable = true;
+      includes = [ "mutable_config" ];
+    };
+    texlive = {
+      enable = true;
+      # packageSet = pkgs.texlive.combined.scheme-medium;
+    };
+    zoxide.enable = true;
+  };
+
+  services = {
+    gnome-keyring.enable = mkIf graphics true;
+    network-manager-applet.enable = mkIf graphics true;
+  };
+
  manual = {
    html.enable = true;
    manpages.enable = true;
--- a/home/modules/uidGid.nix
+++ b/home/modules/uidGid.nix
@ -1,13 +0,0 @@
-{ lib, ... }:
-{
-  options.home = {
-    uid = lib.mkOption {
-      default = 1000;
-      type = lib.types.ints.between 0 60000;
-    };
-    gid = lib.mkOption {
-      default = 1000;
-      type = lib.types.ints.between 0 60000;
-    };
-  };
-}
--- a/home/packages.nix
+++ b/home/packages.nix
@ -5,14 +5,13 @@
    cloc
    cyme
    czkawka
+    delta
    diskonaut
    duf
    duff
    ffmpeg
    file
    glances
-    gpauth
-    gpclient
    gpg-tui
    gping
    graphviz
@ -20,6 +19,7 @@
    httpie
    imagemagick
    kepubify
+    # keybase
    keymapviz
    libwebp
    lnav
@ -39,15 +39,18 @@
    # nixops
    nmap
    ouch
+    pandoc
    parallel
    progress
    pwntools
    python3
    rclone
+    ripgrep
    rsync
    # sc-im
    slack-term
    tea
+    tealdeer
    terminal-parrot
    termtosvg
    toilet
@ -59,6 +62,7 @@
    waifu2x-converter-cpp
    wavemon
    wiki-tui
+    yt-dlp
    yubico-pam
    yubikey-agent
    yubikey-manager
@ -85,8 +89,8 @@
      geogebra
      ghidra
      gimp
-      gnome-font-viewer
-      seahorse
+      gnome.gnome-font-viewer
+      gnome.seahorse
      google-chrome
      imhex
      inkscape
@ -99,7 +103,6 @@
      libnotify
      libreoffice
      light
-      mission-center
      mopidy
      mopidy-mpd
      mopidy-soundcloud
@ -121,7 +124,7 @@

      tenacity
      # transcribe
-      webcamoid
+      wireshark
      xcalib
      xclip
      xdotool
--- a/home/programs/alacritty.nix
+++ b/home/programs/alacritty.nix
@ -43,9 +43,9 @@
        duration = 20;
      };

-      general.live_config_reload = true;
+      live_config_reload = true;

-      terminal.shell = {
+      shell = {
        program = "${pkgs.zsh}/bin/zsh";
        args = [ "--login" ];
      };
--- a/home/programs/anyrun/default.nix
+++ b/home/programs/anyrun/default.nix
@ -1,37 +0,0 @@
-{ pkgs, lib, inputs, ... }:
-{
-  programs.anyrun = {
-    enable = true;
-
-    config = {
-      y.fraction = 0.3;
-      width.fraction = 0.25;
-      plugins = [
-        inputs.anyrun.packages.${pkgs.system}.applications
-      ];
-      hidePluginInfo = true;
-      closeOnClick = true;
-      showResultsImmediately = true;
-    };
-
-    extraCss = builtins.readFile (./. + "/style.css");
-
-    extraConfigFiles."applications.ron".text = let
-      preprocess_script = pkgs.writeShellApplication {
-        name = "anyrun-preprocess-application-exec";
-        runtimeInputs = [ ];
-        text = ''
-          shift # Remove term|no-term
-          echo "uwsm app -- $*"
-        '';
-      };
-    in ''
-      Config(
-        desktop_actions: false,
-        max_entries: 10,
-        preprocess_exec_script: Some("${lib.getExe preprocess_script}"),
-        terminal: Some("${lib.getExe pkgs.alacritty}"),
-      )
-    '';
-  };
-}
--- a/home/programs/anyrun/style.css
+++ b/home/programs/anyrun/style.css
@ -1,48 +0,0 @@
-* {
-  all: unset;
-  font-size: 1.2rem;
-}
-
-#window,
-#match,
-#entry,
-#plugin,
-#main {
-  background: transparent;
-}
-
-#match.activatable {
-  border-radius: 8px;
-  margin: 4px 0;
-  padding: 4px;
-  /* transition: 100ms ease-out; */
-}
-#match.activatable:first-child {
-  margin-top: 12px;
-}
-#match.activatable:last-child {
-  margin-bottom: 0;
-}
-
-#match:hover {
-  background: rgba(255, 255, 255, 0.05);
-}
-#match:selected {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-#entry {
-  background: rgba(255, 255, 255, 0.05);
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 8px;
-  padding: 4px 8px;
-}
-
-box#main {
-  background: rgba(0, 0, 0, 0.5);
-  box-shadow:
-    inset 0 0 0 1px rgba(255, 255, 255, 0.1),
-    0 30px 30px 15px rgba(0, 0, 0, 0.5);
-  border-radius: 20px;
-  padding: 12px;
-}
--- a/home/programs/atuin.nix
+++ b/home/programs/atuin.nix
@ -1,7 +1,9 @@
 { config, ... }:
 let
  cfg = config.programs.atuin;
-  xdg_runtime_dir = "/run/user/${toString config.home.uid}";
+
+  # TODO: retrieve this in a more dynamic and correct manner
+  xdg_runtime_dir = "/run/user/1000";
 in
 {
  programs.atuin = {
--- a/home/programs/bash.nix
+++ b/home/programs/bash.nix
@ -1,11 +0,0 @@
-{ config, ... }:
-{
-  programs.bash = {
-    enable = true;
-    historyFile = "${config.xdg.dataHome}/bash_history";
-    historySize = 100000;
-    bashrcExtra = ''
-      source "${config.xdg.configHome}/mutable_env.sh"
-    '';
-  };
-}
--- a/home/programs/bat.nix
+++ b/home/programs/bat.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.bat.enable = true;
-}
--- a/home/programs/bottom.nix
+++ b/home/programs/bottom.nix
@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.bottom = {
-    enable = true;
-    settings.flags.enable_gpu = true;
-  };
-}
--- a/home/programs/direnv/auto-prune.nix
+++ b/home/programs/direnv/auto-prune.nix
@ -8,7 +8,6 @@ in
      Unit = {
        Description = "Prune unused allowed directories for direnv";
        Documentation = [ "man:direnv(1)" ];
-        ConditionPathExists = "${config.xdg.dataHome}/direnv/allow";
      };

      Service = {
--- a/home/programs/eza.nix
+++ b/home/programs/eza.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.eza.enable = true;
-}
--- a/home/programs/feh.nix
+++ b/home/programs/feh.nix
@ -1,4 +0,0 @@
-{ machineVars, ... }:
-{
-  programs.feh.enable = !machineVars.headless;
-}
--- a/home/programs/fzf.nix
+++ b/home/programs/fzf.nix
@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.fzf = {
-    enable = true;
-    defaultCommand = "fd --type f";
-  };
-}
--- a/home/programs/git/default.nix
+++ b/home/programs/git/default.nix
@ -48,71 +48,15 @@ in
      aliases = {
        aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
        delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d";
+        graph = "log --graph --abbrev-commit --decorate --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";
+        graphv = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all";
        forcepush = "push --force-with-lease --force-if-includes";
        authors = "shortlog --summary --numbered --email";
        si = "switch-interactive";
-        ff = "fixup-fixup";
-        fi = "fixup-interactive";
-        rf = "rebase-fixups";
-        pp = "post-pr";
        subs = "submodule update --init --recursive";
        rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
        git = "!git";
-      } // (let
-        c = c: s: "%C(${c})${s}%C(reset)";
-      in {
-        graph = let
-          fmt = lib.concatStringsSep "" [
-            " - "
-            (c "bold blue" "%h")
-            " - "
-            (c "bold green" "(%ar)")
-            " "
-            (c "white" "> %s")
-            " "
-            (c "dim white" "- %an")
-            (c "bold yellow" "%d")
-          ];
-        in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
-
-        graphv = let
-          fmt = lib.concatStringsSep "" [
-            (c "bold blue" "%h")
-            " - "
-            (c "bold cyan" "%aD")
-            " "
-            (c "bold green" "(%ar)")
-            (c "bold yellow" "%d")
-            "%n"
-            "          "
-            (c "white" "%s")
-            " "
-            (c "dim white" "- %an")
-          ];
-        in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
-
-        l = let
-          fmt = lib.concatStringsSep "%n" (map (x: if builtins.isList x then lib.concatStringsSep " " x else x) [
-            [ (c "bold yellow" "%H") (c "auto" "%d") ]
-            [ (c "bold white" "Author:") (c "bold cyan" "%aN <%aE>") (c "bold green" "(%ah)") ]
-            [ (c "bold white" "Committer:") (c "bold cyan" "%cN <%cE>") (c "bold green" "(%ah)") ]
-            [ (c "bold white" "GPG: (%G?)") (c "bold magenta" "%GF") "-" (c "bold cyan" "%GS") (c "bold blue" "(%GT) ") ]
-            ""
-            (c "bold white" "# %s")
-            "%+b"
-            (c "dim yellow" "%+N")
-          ]);
-          # sedExpressions = let
-          #   colorExpr = "\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]";
-          #   colorEndExpr = "\\x1B\\[m";
-          #   colored = x: "${colorExpr}${x}${colorEndExpr}";
-          # in lib.concatMapStringsSep " " (x: "-e '${x}'") [
-          #   "s|${colored "GPG: \\(N\\)"} ${colored "F3CDA86CC55A9F10D7A069819F2F7D8250F35146"} - ${colored "h7x4 <h7x4@nani.wtf>"} ${colored "\\(ultimate\\)"}|GPG: h7x4|"
-          #   "s|${colored "GPG: \\(N\\)"} ${colored ""} - ${colored ""} ${colored "\\(undefined\\)"}||"
-          # ];
-        in "log --decorate --format=tformat:'${fmt}'";
-        # in "!git log --color=always --format=format:'${fmt}' | sed -E ${sedExpressions} | $PAGER";
-      });
+      };

      extraConfig = {
        core = {
@ -326,21 +270,6 @@ in
        (builtins.replaceStrings ["hours" "tcommit"] ["minutes" "tmcommit"])
      ];
    })
-    (pkgs.writeShellApplication {
-      name = "git-fixup-fixup";
-      runtimeInputs = with pkgs; [ cfg.package ];
-      text = lib.fileContents ./scripts/git-fixup-fixup.sh;
-    })
-    (pkgs.writeShellApplication {
-      name = "git-rebase-fixups";
-      runtimeInputs = with pkgs; [ cfg.package gnused ];
-      text = lib.fileContents ./scripts/git-rebase-fixups.sh;
-    })
-    (pkgs.writeShellApplication {
-      name = "git-fixup-interactive";
-      runtimeInputs = with pkgs; [ cfg.package gnused gnugrep fzf ];
-      text = lib.fileContents ./scripts/git-fixup-interactive.sh;
-    })
    (pkgs.writeShellApplication {
      name = "git-switch-interactive";
      runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ];
@ -349,21 +278,6 @@ in
        "SC2001" # (style): See if you can use ${variable//search/replace} instead. (sed invocation)
      ];
    })
-    ((pkgs.writers.writePython3Bin "git-post-pr" {
-      libraries = with pkgs.python3Packages; [
-        tkinter
-      ];
-      flakeIgnore = [
-        "E501" # I like long lines grr
-      ];
-    } (lib.fileContents ./scripts/git-post-pr.py)).overrideAttrs (_: {
-      postFixup = ''
-        wrapProgram $out/bin/git-post-pr \
-          --prefix PATH : ${lib.makeBinPath [
-            pkgs.github-cli
-          ]}
-      '';
-    }))

    pkgs.git-absorb
  ];
--- a/home/programs/git/scripts/git-fixup-fixup.sh
+++ b/home/programs/git/scripts/git-fixup-fixup.sh
@ -1,14 +0,0 @@
-if [ -n "${1:-}" ]; then
-  TARGET_COMMIT="$1"
-  shift
-else
-  TARGET_COMMIT="HEAD"
-fi
-
-COMMIT_MESSAGE=$(git log -1 --pretty=format:'%s' "$TARGET_COMMIT")
-
-if [[ $COMMIT_MESSAGE =~ ^fixup!* ]]; then
-  git commit -m "$COMMIT_MESSAGE" "$@"
-else
-  git commit --fixup "$TARGET_COMMIT" "$@"
-fi
--- a/home/programs/git/scripts/git-fixup-interactive.sh
+++ b/home/programs/git/scripts/git-fixup-interactive.sh
@ -1,18 +0,0 @@
-if [ -n "${1:-}" ]; then
-  TARGET_BRANCH="$1"
-  shift
-else
-  TARGET_BRANCH=$(git remote show origin | sed -n '/HEAD branch/s/.*: //p')
-fi
-
-FORK_POINT=$(git merge-base --fork-point "$TARGET_BRANCH")
-
-COMMITS_SINCE_FORK_POINT=$(git log --format=format:'%s' "$FORK_POINT"..HEAD | grep -v -E '^fixup!')
-
-RESULT=$(fzf <<<"$COMMITS_SINCE_FORK_POINT")
-
-if [ "$RESULT" == "" ]; then
-  echo "Doing nothing..."
-else
-  git commit -m "fixup! $RESULT" "$@"
-fi
--- a/home/programs/git/scripts/git-post-pr.py
+++ b/home/programs/git/scripts/git-post-pr.py
@ -1,130 +0,0 @@
-import argparse
-import json
-import subprocess
-import tkinter
-
-# TODO: add support for gitea, and maybe other git hosting options.
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(
-        prog="post-pr",
-        description="Post links to PRs",
-    )
-
-    parser.add_argument("-n", "--no-clipboard", action="store_true", help="do not copy the message to the clipboard")
-
-    pr_id = parser.add_mutually_exclusive_group()
-    pr_id.add_argument("-c", "--current-branch", action="store_true", help="generate post for the PR for the current branch")
-    pr_id.add_argument("-l", "--latest", action="store_true", help="generate post for the latest PR for the current user")
-    pr_id.add_argument("pr_id", nargs="?", default=None, help="generate post for the PR with the given ID")
-    args = parser.parse_args()
-
-    if not any([args.current_branch, args.latest, args.pr_id,]):
-        args.current_branch = True
-
-    return args
-
-
-def _gh(args: list[str]) -> str:
-    try:
-        return subprocess.check_output(["gh"] + args).decode("utf8")
-    except subprocess.CalledProcessError as e:
-        raise RuntimeError(f"GitHub CLI command failed: 'gh {' '.join(args)}'") from e
-
-
-def _gh_retcode(args: list[str]) -> int:
-    return subprocess.run(["gh"] + args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode
-
-
-def ensure_gh_installed():
-    try:
-        if _gh_retcode(["--version"]) != 0:
-            raise RuntimeError("GitHub CLI (gh) is not installed, please install it")
-    except FileNotFoundError:
-        raise RuntimeError("GitHub CLI (gh) is not installed, please install it")
-
-
-def ensure_gh_authenticated():
-    if _gh_retcode(["auth", "status"]) != 0:
-        raise RuntimeError("Failed to authenticate with GitHub, please run 'gh auth login'")
-
-
-GH_PR_JSON_FIELDS = ",".join([
-    "additions",
-    "deletions",
-    "state",
-    "title",
-    "url",
-])
-
-
-def fetch_pr_data(current_branch: bool, latest: bool, pr_id: str | None) -> dict[str, any]:
-    if pr_id:
-        pr_data = _gh(["pr", "view", pr_id, "--json", GH_PR_JSON_FIELDS])
-        pr_data = json.loads(pr_data)
-
-    elif latest:
-        pr_list = _gh(["pr", "list", "--author", "@me", "--limit", "1", "--json", GH_PR_JSON_FIELDS])
-        pr_list = json.loads(pr_list)
-
-        if len(pr_list) == 0:
-            raise RuntimeError("Failed to find PR, are you sure you have any open PRs?")
-
-        pr_data = pr_list[0]
-
-    elif current_branch:
-        pr_data = _gh(["pr", "view", "--json", GH_PR_JSON_FIELDS])
-        pr_data = json.loads(pr_data)
-
-    return pr_data
-
-
-def format_message(pr_data: dict[str, any]) -> str:
-    additions = pr_data["additions"]
-    deletions = pr_data["deletions"]
-
-    title = pr_data["title"]
-    pr_url = pr_data["url"]
-    pr_state = pr_data["state"]
-
-    state_html = f"({pr_state.lower()}) " if pr_state != "OPEN" else ""
-    additions_html = f"+{additions}" if additions > 0 else str(additions)
-    deletions_html = f"-{deletions}" if deletions > 0 else str(deletions)
-
-    return f"""{state_html}{pr_url} {title} [diff: {additions_html}/{deletions_html}]"""
-
-
-def copy_to_clipboard(message: str):
-    r = tkinter.Tk()
-    r.withdraw()
-    r.clipboard_clear()
-    r.clipboard_append(message)
-    r.update()
-    r.destroy()
-
-
-def main():
-    args = parse_args()
-
-    ensure_gh_installed()
-    ensure_gh_authenticated()
-
-    pr_data = fetch_pr_data(args.current_branch, args.latest, args.pr_id)
-    message = format_message(pr_data)
-
-    print("Message:\n")
-    print(f"    {message}\n")
-
-    if not args.no_clipboard:
-        copy_to_clipboard(message)
-        print("Copied to clipboard")
-
-
-if __name__ == "__main__":
-    try:
-        main()
-    except Exception as e:
-        print(f"Error: {e}")
-        exit(1)
-
--- a/home/programs/git/scripts/git-rebase-fixups.sh
+++ b/home/programs/git/scripts/git-rebase-fixups.sh
@ -1,10 +0,0 @@
-if [ -n "${1:-}" ]; then
-  TARGET_BRANCH="$1"
-  shift
-else
-  TARGET_BRANCH=$(git remote show origin | sed -n '/HEAD branch/s/.*: //p')
-fi
-
-FORK_POINT=$(git merge-base --fork-point "$TARGET_BRANCH")
-
-git rebase "$FORK_POINT" --autosquash "$@"
--- a/home/programs/home-manager.nix
+++ b/home/programs/home-manager.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.home-manager.enable = true;
-}
--- a/home/programs/hyprland.nix
+++ b/home/programs/hyprland.nix
@ -1,349 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.wayland.windowManager.hyprland;
-in
-{
-  home.sessionVariables = {
-    WLR_NO_HARDWARE_CURSORS = "1";
-    WLR_RENDERER_ALLOW_SOFTWARE = "1";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XDG_SESSION_DESKTOP = "Hyprland";
-    XDG_SESSION_TYPE = "wayland";
-    GDK_BACKEND = "wayland,x11,*";
-    QT_QPA_PLATFORM = "wayland;xcb";
-    NIXOS_OZONE_WL = "1";
-    MOZ_ENABLE_WAYLAND = "1";
-    SDL_VIDEODRIVER = "wayland";
-    OZONE_PLATFORM = "wayland";
-    CLUTTER_BACKEND = "wayland";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    # QT_QPA_PLATFORMTHEME = "qt6ct";
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-
-    # LIBVA_DRIVER_NAME = "nvidia";
-    # GBM_BACKEND = "nvidia-drm";
-    # __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-  };
-
-  home.packages = with pkgs; [
-    wl-clipboard-rs
-  ];
-
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      general = {
-        disable_loading_bar = true;
-        grace = 300;
-        hide_cursor = true;
-        no_fade_in = false;
-      };
-
-      background = [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
-
-      input-field = [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          placeholder_text = ''Password...'';
-          shadow_passes = 2;
-        }
-      ];
-    };
-  };
-
-  services.hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        ignore_dbus_inhibit = false;
-        lock_cmd = "pidof hyprlock || ${config.programs.hyprlock.package}/bin/hyprlock";
-        before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
-        after_sleep_cmd = "${cfg.finalPackage}/bin/hyprctl dispatch dpms on";
-      };
-
-      listener = [
-        {
-          timeout = 900;
-          on-timeout = "${config.programs.hyprlock.package}/bin/hyprlock";
-        }
-        {
-          timeout = 1200;
-          on-timeout = "${cfg.finalPackage}/bin/hyprctl dispatch dpms off";
-          on-resume = "${cfg.finalPackage}/bin/hyprctl dispatch dpms on";
-        }
-      ];
-    };
-  };
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-
-    systemd.enable = false;
-    systemd.enableXdgAutostart = false;
-
-    settings = let
-      exe = lib.getExe;
-      scratchpads = [
-        (rec {
-          title = "Floating terminal";
-          class = "floatingTerminal";
-          command = "uwsm app -- ${exe pkgs.alacritty} --class ${class} -e ${exe pkgs.tmux} new-session -A -s f";
-          size = { h = 90; w = 95; };
-          keys = [
-            "$mod, RETURN"
-            "$mod, SPACE"
-          ];
-        })
-        (rec {
-          title = "Ncmpcpp";
-          class = "floatingNcmpcpp";
-          command = "uwsm app -- ${exe pkgs.alacritty} --class ${class} -e ${exe pkgs.ncmpcpp}";
-          size = { h = 95; w = 95; };
-          keys = [ "$mod, Q" ];
-        })
-        # "$mod, W, emacs"
-        # "$mod, E, filebrowser"
-        # "$mod, X, taskwarriortui"
-      ];
-    in {
-      "$mod" = "SUPER";
-
-      # https://github.com/xkbcommon/libxkbcommon/blob/master/include/xkbcommon/xkbcommon-keysyms.h
-      bind = [
-        "$mod SHIFT, Q, exec, ${pkgs.systemd}/bin/loginctl terminate-user \"\""
-        "$mod ALT SHIFT, Q, exit"
-        "$mod, R, exec, uwsm app -- ${exe config.programs.anyrun.package}"
-        "$mod, T, togglefloating"
-
-        "$mod, F, fullscreenstate, 1"
-        "$mod SHIFT, F, fullscreenstate, 3"
-        "$mod, C, exec, ${cfg.finalPackage}/bin/hyprctl reload"
-
-        "$mod, BACKSPACE, killactive"
-
-        "$mod SHIFT, RETURN, exec, uwsm app -- ${exe pkgs.alacritty} --class termTerminal -e ${exe pkgs.tmux} new-session -A -s term"
-        "$mod SHIFT, SPACE, exec, uwsm app -- ${exe pkgs.alacritty} --class termTerminal -e ${exe pkgs.tmux} new-session -A -s term"
-
-        "$mod, j, layoutmsg,cyclenext"
-        "$mod, k, layoutmsg,cycleprev"
-        "$mod SHIFT, j, layoutmsg, swapnext"
-        "$mod SHIFT, k, layoutmsg, swapprev"
-
-        "$mod, 1, focusworkspaceoncurrentmonitor, 1"
-        "$mod, 2, focusworkspaceoncurrentmonitor, 2"
-        "$mod, 3, focusworkspaceoncurrentmonitor, 3"
-        "$mod, 4, focusworkspaceoncurrentmonitor, 4"
-        "$mod, 5, focusworkspaceoncurrentmonitor, 5"
-        "$mod, 6, focusworkspaceoncurrentmonitor, 6"
-        "$mod, 7, focusworkspaceoncurrentmonitor, 7"
-        "$mod, 8, focusworkspaceoncurrentmonitor, 8"
-        "$mod, 9, focusworkspaceoncurrentmonitor, 9"
-
-        "$mod SHIFT, 1, movetoworkspacesilent, 1"
-        "$mod SHIFT, 2, movetoworkspacesilent, 2"
-        "$mod SHIFT, 3, movetoworkspacesilent, 3"
-        "$mod SHIFT, 4, movetoworkspacesilent, 4"
-        "$mod SHIFT, 5, movetoworkspacesilent, 5"
-        "$mod SHIFT, 6, movetoworkspacesilent, 6"
-        "$mod SHIFT, 7, movetoworkspacesilent, 7"
-        "$mod SHIFT, 8, movetoworkspacesilent, 8"
-        "$mod SHIFT, 9, movetoworkspacesilent, 9"
-
-        "$mod, b, exec, ${pkgs.fcitx5}/bin/fcitx5-remote -s mozc"
-        "$mod, n, exec, ${pkgs.fcitx5}/bin/fcitx5-remote -s keyboard-no"
-        "$mod, m, exec, ${pkgs.fcitx5}/bin/fcitx5-remote -s keyboard-us"
-
-        # TODO: ensure exists in environment
-        "$mod, l, exec, ${pkgs.systemd}/bin/loginctl lock-session"
-
-        # TODO: fix
-        # "super + minus" = "${pkgs.xcalib}/bin/xcalib -invert -alter"
-
-        # TODO: fix
-        ", Print, exec, ${exe pkgs.grimblast} copy area"
-
-        # "SHIFT, Print, exec, ${lib.getExe pkgs.grimblast} copy area"
-        # "shift + @Print" = "${pkgs.maim}/bin/maim --hidecursor --nokeyboard $SCREENSHOT_DIR/$(date +%s).png"
-
-        # TODO: Add boomer as package
-        # "super + @Print" = "boomer"
-      ]
-      ++
-      (lib.pipe scratchpads [
-        (map ({ keys, command, class, ... }:
-          (map (key: let
-            # TODO: rewrite this to take arguments instead of creating n copies
-            invokeIfNotRunningAndToggleWorkspace = pkgs.writeShellApplication {
-              name = "hyprland-toggle-scratchpad-${class}";
-              runtimeInputs = [ cfg.finalPackage pkgs.jq ];
-              text = ''
-                SCRATCHPAD_PROGRAM_EXISTS=$(hyprctl clients -j | jq -r '[.[].class]|any(. == "${class}")')
-                CURRENT_WORKSPACE_ID=$(hyprctl activeworkspace -j | jq -r '.id')
-
-                if [ "$SCRATCHPAD_PROGRAM_EXISTS" != "true" ]; then
-                  ${command} &
-                  hyprctl dispatch movetoworkspacesilent "''${CURRENT_WORKSPACE_ID},class:${class}"
-                  hyprctl dispatch focuswindow "class:${class}"
-                else
-                  SCRATCHPAD_PROGRAM_WORKSPACE_ID=$(hyprctl clients -j | jq '.[] | select( .class == "${class}") | .workspace.id')
-                  if [ "$SCRATCHPAD_PROGRAM_WORKSPACE_ID" != "$CURRENT_WORKSPACE_ID" ]; then
-                    hyprctl dispatch movetoworkspacesilent "''${CURRENT_WORKSPACE_ID},class:${class}"
-                    hyprctl dispatch focuswindow "class:${class}"
-                  else
-                    hyprctl dispatch movetoworkspacesilent "special:${class}Ws,class:${class}"
-                  fi
-                fi
-              '';
-            };
-          in "${key}, exec, ${lib.getExe invokeIfNotRunningAndToggleWorkspace}"
-          ) keys)
-        ))
-        lib.flatten
-      ]);
-
-      bindl = [
-        "$mod, p, exec, ${exe pkgs.mpc_cli} toggle"
-        ",XF86AudioPlay, exec, ${exe pkgs.mpc_cli} toggle"
-        ",XF86AudioPrev, exec, ${exe pkgs.mpc_cli} prev"
-        ",XF86AudioNext, exec, ${exe pkgs.mpc_cli} next"
-      ];
-
-      bindle = [
-        ",XF86MonBrightnessUp, exec, ${exe pkgs.brightnessctl} s +5%"
-        ",XF86MonBrightnessDown, exec, ${exe pkgs.brightnessctl} s 5%-"
-        ",XF86AudioLowerVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
-        ",XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+"
-        "$mod ,F7, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
-        "$mod ,F8, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+"
-      ];
-
-      exec-once = [
-        "uwsm finalize"
-      ];
-
-      windowrulev2 = [
-        "float,class:(Rofi)"
-        "float,class:^(xdg-desktop-portal-gtk)$"
-        "float, title:^(.*Bitwarden Password Manager.*)$"
-
-        "dimaround, class:^(xdg-desktop-portal-gtk)$"
-
-        "workspace special silent, title:^(Firefox — Sharing Indicator)$"
-        "workspace special silent, title:^(Zen — Sharing Indicator)$"
-        "workspace special silent, title:^(.*is sharing (your screen|a window)\.)$"
-
-        "workspace 2,class:(firefox)"
-        "workspace 2,class:(google-chrome)"
-
-        "workspace 3,class:(Emacs)"
-        "workspace 3,class:(code)"
-        "workspace 3,class:(code-url-handler)"
-
-        "workspace 5,class:(discord)"
-        "workspace 5,class:(Element)"
-      ]
-      ++
-      (lib.pipe scratchpads [
-        (map ({ class, size, ... }: [
-          "workspace special:${class}Ws, class:^${class}$"
-          "float, class:^${class}$"
-          "size ${toString size.w}% ${toString size.h}%, class:^${class}$"
-          "move ${toString ((100 - size.w) / 2)}% ${toString ((100 - size.h) / 2)}%, class:^${class}$"
-        ]))
-        lib.flatten
-      ]);
-
-      monitor = [
-        # TODO: host specific
-        "eDP-1, 3840x2400@90.00Hz, 0x0, 2"
-        ",preferred,auto,1"
-      ];
-
-      general = {
-        gaps_in = 5;
-        gaps_out = 15;
-
-        border_size = 2;
-
-        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-
-        resize_on_border = false;
-        allow_tearing = false;
-        layout = "master";
-      };
-
-      decoration = {
-        rounding = 10;
-
-        # Change transparency of focused and unfocused windows
-        active_opacity = 1.0;
-        inactive_opacity = 1.0;
-
-        # drop_shadow = true;
-        # shadow_range = 4;
-        # shadow_render_power = 3;
-        # "col.shadow" = "rgba(1a1a1aee)";
-
-        # https://wiki.hyprland.org/Configuring/Variables/#blur
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-
-          vibrancy = 0.1696;
-        };
-      };
-
-      animations.enabled = false;
-
-      master = {
-          new_status = "slave";
-      };
-
-      misc = {
-        force_default_wallpaper = 0; # Set to 0 or 1 to disable the anime mascot wallpapers
-        disable_hyprland_logo = false; # If true disables the random hyprland logo / anime girl background. :(
-      };
-
-      input ={
-        kb_layout = "us";
-        kb_variant = "";
-        kb_model = "";
-        kb_options = "caps:escape";
-        kb_rules = "";
-
-        follow_mouse = 1;
-
-        sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
-
-        touchpad = {
-          natural_scroll = false;
-        };
-      };
-    };
-  };
-
-  # UWSM
-  systemd.user.services = {
-    hypridle.Unit.After = lib.mkForce "graphical-session.target";
-    waybar.Unit.After = lib.mkForce "graphical-session.target";
-    network-manager-applet.Unit.After = lib.mkForce "graphical-session.target";
-    fcitx5-daemon.Unit.After = lib.mkForce "graphical-session.target";
-    # hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
-  };
-}
--- a/home/programs/man.nix
+++ b/home/programs/man.nix
@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.man = {
-    enable = true;
-    generateCaches = true;
-  };
-}
--- a/home/programs/mpv.nix
+++ b/home/programs/mpv.nix
@ -1,4 +0,0 @@
-{ machineVars, ... }:
-{
-  programs.mpv.enable = !machineVars.headless;
-}
--- a/home/programs/ncmpcpp.nix
+++ b/home/programs/ncmpcpp.nix
@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{pkgs, ...}:
 {
  programs.ncmpcpp = {
    enable = true;
@ -332,11 +332,11 @@
      window_border_color = "green";
      active_window_border = "red";

-      visualizer_data_source = "/run/user/${toString config.home.uid}/mpd/visualizer.fifo";
+      visualizer_data_source = "/tmp/mpd.fifo";
      visualizer_output_name = "Visualizer feed";
      visualizer_in_stereo = "no";
-      # visualizer_type = "spectrum"; # spectrum, ellipse, wave_filled, wave
-      # visualizer_look = "+█"; # wave | spectrum, ellipse, wave_filled
+      visualizer_type = "spectrum"; # spectrum, ellipse, wave_filled, wave
+      visualizer_look = "+█"; # wave | spectrum, ellipse, wave_filled
    };
  };
 }
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@ -1,4 +1,4 @@
-{ pkgs, lib, machineVars, ... }:
+{ pkgs, home, ... }:
 {
  imports = [
    ./auto-clean-swapfiles.nix
@ -21,9 +21,6 @@
      vim-surround
      vim-fugitive
      vim-css-color
-    ] ++ (lib.optionals machineVars.wayland [
-      vim-wayland-clipboard
-    ]) ++ [
      semshi
      {
        plugin = goyo-vim;
@ -69,58 +66,25 @@
      }
      limelight-vim
      vim-tmux-navigator
+      vim-polyglot
      lightline-vim
-      vim-better-whitespace
      {
-        plugin = nvim-treesitter.withAllGrammars;
+        plugin = rainbow;
        config = ''
-        packadd! nvim-treesitter
-        lua << EOF
-          require'nvim-treesitter.configs'.setup {
-            highlight = {
-              enable = true,
-            },
-          }
-        EOF
-        '';
-      }
-      {
-        plugin = rainbow-delimiters-nvim;
-        config = ''
-        lua << EOF
-          local rainbow_delimiters = require 'rainbow-delimiters'
-          vim.g.rainbow_delimiters = {
-            ["highlight"] = {
-              'RainbowDelimiterRed',
-              'RainbowDelimiterYellow',
-              'RainbowDelimiterBlue',
-              'RainbowDelimiterGreen',
-              'RainbowDelimiterViolet',
-              'RainbowDelimiterCyan',
-            },
-          }
-        EOF
+          let g:rainbow_active = 1
        '';
      }
      {
        plugin = vim-monokai;
        config = ''
          colorscheme monokai
-
-          autocmd ColorScheme monokai highlight Normal ctermbg=0
-          autocmd ColorScheme monokai highlight LineNr ctermbg=0
-          autocmd ColorScheme monokai highlight CursorLineNR ctermbg=0 ctermfg=208
-          autocmd ColorScheme monokai highlight SignColumn ctermbg=0
-          autocmd ColorScheme monokai highlight GitGutterAdd ctermbg=0
-          autocmd ColorScheme monokai highlight GitGutterChange ctermbg=0
-          autocmd ColorScheme monokai highlight GitGutterDelete ctermbg=0
-
-          autocmd ColorScheme monokai highlight RainbowDelimiterRed    { fg = g:terminal_color_9 }
-          autocmd ColorScheme monokai highlight RainbowDelimiterYellow { fg = g:terminal_color_11 }
-          autocmd ColorScheme monokai highlight RainbowDelimiterBlue   { fg = g:terminal_color_12 }
-          autocmd ColorScheme monokai highlight RainbowDelimiterGreen  { fg = g:terminal_color_10 }
-          autocmd ColorScheme monokai highlight RainbowDelimiterViolet { fg = g:terminal_color_13 }
-          autocmd ColorScheme monokai highlight RainbowDelimiterCyan   { fg = g:terminal_color_14 }
+          autocmd ColorScheme * highlight Normal ctermbg=0
+          autocmd ColorScheme * highlight LineNr ctermbg=0
+          autocmd ColorScheme * highlight CursorLineNR ctermbg=0 ctermfg=208
+          autocmd ColorScheme * highlight SignColumn ctermbg=0
+          autocmd ColorScheme * highlight GitGutterAdd ctermbg=0
+          autocmd ColorScheme * highlight GitGutterChange ctermbg=0
+          autocmd ColorScheme * highlight GitGutterDelete ctermbg=0
        '';
      }
    ];
--- a/home/programs/newsboat/sources.nix
+++ b/home/programs/newsboat/sources.nix
@ -37,7 +37,6 @@ in {
    (mkSource [ "japanese" "language" ] "https://www.outlier-linguistics.com/blogs/japanese.atom")
    (mkSource [ "language" ] "https://feeds.feedburner.com/blogspot/Ckyi")
    (mkSource [ "japanese" "language" "old" ] "http://feeds.feedburner.com/LocalizingJapan")
-    (mkSource [ "japanese" "language" ] "https://wesleycrobertson.wordpress.com/feed/")
    (mkSource [ "tech" "vim" "old" ] "https://castel.dev/rss.xml")
    (mkSource [ "tech" "functional-programming" "old" ] "https://skilpat.tumblr.com/rss")
    (mkSource [ "tech" ] "https://resocoder.com/feed/")
--- a/home/programs/obs-studio.nix
+++ b/home/programs/obs-studio.nix
@ -1,4 +0,0 @@
-{ machineVars, ... }:
-{
-  programs.obs-studio.enable = !machineVars.headless;
-}
--- a/home/programs/pandoc.nix
+++ b/home/programs/pandoc.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.pandoc.enable = true;
-}
--- a/home/programs/ripgrep.nix
+++ b/home/programs/ripgrep.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.ripgrep.enable = true;
-}
--- a/home/programs/ssh/default.nix
+++ b/home/programs/ssh/default.nix
@ -10,11 +10,5 @@
    mode = "0444";
  };

-  programs.ssh = {
-    enable = true;
-    includes = [
-      config.sops.secrets."ssh/secret-config".path
-      "mutable_config"
-    ];
-  };
+  programs.ssh.includes = [ config.sops.secrets."ssh/secret-config".path ];
 }
--- a/home/programs/ssh/pvv.nix
+++ b/home/programs/ssh/pvv.nix
@ -1,13 +1,12 @@
 { pkgs, lib, ... }:
-let # http://www.pvv.ntnu.no/pvv/Maskiner
+let
+  adminUser = "root";
+  normalUser = "oysteikt";
+
+  # http://www.pvv.ntnu.no/pvv/Maskiner
  normalMachines = [
    {
-      names = [ "hildring" "pvv-login" ];
-      proxyJump = lib.mkDefault null;
-      addressFamily = "inet";
-    }
-    {
-      names = [ "drolsum" "pvv-login2" "pvv" ];
+      names = [ "hildring" "pvv-login" "pvv" ];
      proxyJump = lib.mkDefault null;
      addressFamily = "inet";
    }
@ -18,6 +17,7 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner
    "buskerud"
    "dagali"
    "demiurgen"
+    "drolsum"
    "eirin"
    "georg"
    "ildkule"
@ -28,7 +28,6 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner
    "shark"
    "tallulah"
    "tom"
-    "ustetind"
    "venture"
  ];

@ -39,38 +38,59 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner
    "ludvigsen"
    [ "principal" "pvv-backup" ]
    [ "skrott" "dibbler" ]
-    {
-      names = [ "sleipner" "pvv-salt" ];
-      user = "oysteikt/admin";
-    }
+    [ "sleipner" "pvv-salt" ]
  ];

-  overrideIfNotExists = b: a: a // (builtins.removeAttrs b (builtins.attrNames a));
+  # Either( String [String] AttrSet{String} ) -> AttrSet{String}
+  coerceToSSHMatchBlock =
+    machine:
+    if builtins.isString machine then { names = [machine]; }
+    else if builtins.isList machine then { names = machine; }
+    else machine;

-  coerce = user: machines: lib.pipe machines [
-    (m: if builtins.isString m then { names = [m]; } else m)
-    (m: if builtins.isList m then { names = m; } else m)
-    (overrideIfNotExists { inherit user; })
-  ];
+  # ListOf(String) -> AttrSet
+  machineWithNames = let
+    inherit (lib.lists) head;
+    inherit (lib.strings) split;
+  in
+    names: { hostname = "${head names}.pvv.ntnu.no"; };

-  normalUser = "oysteikt";
+  # AttrSet -> AttrSet -> AttrSet
+  convertMachineWithDefaults = defaults: normalizedMachine: let
+    inherit (lib.attrsets) nameValuePair;
+    inherit (lib.strings) concatStringsSep;
+    inherit (normalizedMachine) names;

-  matchConfig = let
-    machines = (map (coerce normalUser) normalMachines) ++ (map (coerce "root") rootMachines);
-    setVars = orig@{ names, ... }: {
-      name = builtins.concatStringsSep " " names;
-      value = overrideIfNotExists {
-        hostname = "${builtins.head names}.pvv.ntnu.no";
-        proxyJump = "pvv";
-        addressFamily = "inet";
-      } (builtins.removeAttrs orig ["names"]);
-    };
-  in builtins.listToAttrs (map setVars machines);
+    name = concatStringsSep " " names;
+    value =
+      (machineWithNames names)
+      // defaults
+      // removeAttrs normalizedMachine ["names"];
+  in
+    nameValuePair name value;

+  # AttrSet -> AttrSet
+  convertNormalMachine = convertMachineWithDefaults { user = normalUser; proxyJump = "pvv"; };
+  # AttrSet -> AttrSet
+  convertAdminMachine =
+    convertMachineWithDefaults { user = adminUser; proxyJump = "pvv"; };
+
+  # ListOf (Either(String ListOf(String) AttrsOf(String))) -> (AttrSet -> AttrSet) -> AttrSet
+  convertMachinesWith = convertMachineFunction: let
+    inherit (lib.attrsets) listToAttrs;
+    inherit (lib.trivial) pipe;
+    pipeline = [
+      (map coerceToSSHMatchBlock)
+      (map convertMachineFunction)
+      listToAttrs
+    ];
+  in
+    machines: pipe machines pipeline;
 in
  {
    programs.ssh.matchBlocks = lib.mergeAttrsList [
-      matchConfig
+      (convertMachinesWith convertNormalMachine normalMachines)
+      (convertMachinesWith convertAdminMachine rootMachines)
      {
        "pvv-git git.pvv.ntnu.no" = {
          hostname = "git.pvv.ntnu.no";
--- a/home/programs/texlive.nix
+++ b/home/programs/texlive.nix
@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.texlive = {
-    enable = true;
-    # packageSet = pkgs.texlive.combined.scheme-medium;
-  };
-}
--- a/home/programs/tmux/default.nix
+++ b/home/programs/tmux/default.nix
@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{pkgs, ...}:
 {
  programs.tmux = {
    enable = true;
@ -19,25 +19,7 @@
      tmux-fzf
      urlview
    ];
-    extraConfig = let
-      fileContentsWithoutShebang = script: lib.pipe script [
-        lib.fileContents
-        (lib.splitString "\n")
-        (lib.drop 3) # remove shebang
-        (lib.concatStringsSep "\n")
-      ];
-
-      fcitx5-status = (pkgs.writeShellApplication {
-        name = "tmux-fcitx5-status";
-        runtimeInputs = with pkgs; [ dbus ];
-        text = fileContentsWithoutShebang ./scripts/fcitx5-status.sh;
-      });
-      mpd-status = (pkgs.writeShellApplication {
-        name = "tmux-mpd-status";
-        runtimeInputs = with pkgs; [ mpc-cli gawk gnugrep ];
-        text = fileContentsWithoutShebang ./scripts/mpd-status.sh;
-      });
-    in ''
+    extraConfig = ''
      # Don't rename windows automatically after rename with ','
      set-option -g allow-rename off

@ -109,8 +91,8 @@
      ### DESIGN CHANGES ###
      ######################

-      set-option -g status-left '#{prefix_highlight} #[bg=blue]#[fg=black,bold] ###S #[bg=default]  #[fg=green]#(${lib.getExe fcitx5-status})  #[fg=red]%H:%M   '
-      set-option -g status-right '#[fg=red]#(${lib.getExe mpd-status})'
+      set-option -g status-left '#{prefix_highlight} #[bg=blue]#[fg=black,bold] ###S #[bg=default]  #[fg=green]#(~/.scripts/tmux/fcitx)  #[fg=red]%H:%M   '
+      set-option -g status-right '#[fg=red]#(~/.scripts/tmux/mpd)'
      set-window-option -g window-status-current-style fg=magenta
      set-option -g status-style 'bg=black fg=default'
      set-option -g default-shell '${pkgs.zsh}/bin/zsh'
--- a/home/programs/tmux/scripts/fcitx5-status.sh
+++ b/home/programs/tmux/scripts/fcitx5-status.sh
@ -1,26 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p dbus
-
-printState() {
-  STATUS=$(dbus-send --session --print-reply=literal --dest='org.fcitx.Fcitx5' '/controller' 'org.fcitx.Fcitx.Controller1.CurrentInputMethod' | tr -d '[:space:]')
-
-  case $STATUS in
-    keyboard-us)
-      echo 'US'
-    ;;
-    keyboard-no)
-      echo 'NO'
-    ;;
-    mozc)
-      echo '日本語'
-    ;;
-    *)
-      echo "$STATUS?"
-    ;;
-  esac
-}
-
-while :; do
-  printState
-  sleep 1
-done
--- a/home/programs/tmux/scripts/mpd-status.sh
+++ b/home/programs/tmux/scripts/mpd-status.sh
@ -1,29 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i sh -p mpc-cli gawk gnugrep
-
-while true; do
-  MPC_OUTPUT=$(mpc --format '[[%artist% - ]%title%]|[%file%]')
-
-  TITLE=$(head -n 1 <<<"$MPC_OUTPUT")
-
-  if [ ${#TITLE} -gt 60 ]; then
-    TITLE=$(awk '{print substr($0,0,57) "..."}' <<<"$TITLE")
-  fi
-
-  LINE2=$(head -n 2 <<<"$MPC_OUTPUT" | tail -n 1)
-
-  PLAY_STATUS_RAW=$(awk '{print $1}' <<<"$LINE2")
-
-  if [ "$PLAY_STATUS_RAW" == "[playing]" ]; then
-    PLAY_STATUS="▶"
-  elif [ "$PLAY_STATUS_RAW" == "[paused]" ]; then
-    PLAY_STATUS="⏸"
-  else
-    PLAY_STATUS="??"
-  fi
-
-  TIME=$(awk '{print $3}' <<<"$LINE2")
-
-  echo -e "$PLAY_STATUS $TITLE | [$TIME]"
-  sleep 1
-done
--- a/home/programs/vscode/default.nix
+++ b/home/programs/vscode/default.nix
@ -27,15 +27,7 @@ in
  programs.vscode = {
    enable = true;

-    package = pkgs.vscode.overrideAttrs (prev: {
-      # NOTE: this messes up zsh's tab completion in the terminal whenever code is started
-      #       from within a shell
-      preFixup = prev.preFixup + ''
-        gappsWrapperArgs+=(
-          --unset TMUX_PANE
-        )
-      '';
-    });
+    package = pkgs.vscode;

    userSettings = let
      editor = mapPrefixToSet "editor" {
@ -167,7 +159,6 @@ in
      "telemetry.telemetryLevel" = "off";
      "terminal.integrated.fontSize" = 14;
      "vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
-      "keyboard.dispatch" = "keyCode";
      "window.zoomLevel" = 1;

      "search.exclude" = {
--- a/home/programs/waybar.nix
+++ b/home/programs/waybar.nix
@ -1,245 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.programs.waybar;
-  cfgs = cfg.settings.mainBar;
-in
-{
-  programs.waybar = {
-    enable = true;
-    systemd.enable = true;
-
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        height = 30;
-
-        # TODO: configure this per machine
-        # output = [ "DP-2" ];
-
-        modules-left = [ "hyprland/workspaces"  ];
-        modules-center = [ "clock" ];
-        modules-right = [ "mpd" "cpu" "memory" "wireplumber" "pulseaudio/slider" "battery" "tray" ];
-
-        "hyprland/workspaces" = {
-          all-outputs = true;
-          disable-scroll = true;
-          persistent-workspaces = {
-            ${lib.head cfgs.output} = [ 1 2 3 4 5 6 7 8 ];
-          };
-        };
-
-        "mpd" = {
-          format = "{filename}";
-        };
-
-        "cpu" = {
-          format = "[#] {usage}%";
-        };
-
-        "memory" = {
-          format = "{used}/{total}Gb";
-        };
-
-        "wireplumber" = {
-          format = "{volume}% {icon}";
-          format-muted = "[M]";
-        };
-
-        "pulseaudio/slider" = {
-          orientation = "horizontal";
-        };
-
-        "tray" = {
-          icon-size = 20;
-          spacing = 8;
-        };
-      };
-    };
-
-    style = let
-      c = config.colors.defaultColorSet;
-    in ''
-      * {
-          font-family: FiraCode, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-          font-size: 13px;
-      }
-
-      window#waybar {
-          background-color: ${c.background};
-          color: ${c.foreground};
-      }
-
-      #pulseaudio-slider trough {
-          min-height: 10px;
-          min-width: 100px;
-      }
-
-      /**** DEFAULT ****/
-
-      window#waybar.hidden {
-          opacity: 0.2;
-      }
-
-      button {
-          /* Use box-shadow instead of border so the text isn't offset */
-          box-shadow: inset 0 -3px transparent;
-          /* Avoid rounded borders under each button name */
-          border: none;
-          border-radius: 0;
-      }
-
-      /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-      button:hover {
-          background: inherit;
-          box-shadow: inset 0 -3px #ffffff;
-      }
-
-
-      #workspaces button.empty {
-          color: ${c.yellow};
-      }
-
-      #workspaces button {
-          padding: 0 5px;
-          color: ${c.magenta};
-          background-color: transparent;
-      }
-
-      #workspaces button.visible {
-          color: ${c.green};
-      }
-
-      #workspaces button.urgent {
-          background-color: ${c.red};
-      }
-
-      #workspaces button:hover {
-          background: rgba(0, 0, 0, 0.2);
-      }
-
-      #mode {
-          background-color: #64727D;
-          box-shadow: inset 0 -3px #ffffff;
-      }
-
-      #clock,
-      #battery,
-      #cpu,
-      #memory,
-      #disk,
-      #temperature,
-      #backlight,
-      #network,
-      #pulseaudio,
-      #wireplumber,
-      #custom-media,
-      #tray,
-      #mode,
-      #idle_inhibitor,
-      #scratchpad,
-      #power-profiles-daemon,
-      #mpd {
-          padding: 0 10px;
-          color: ${c.foreground};
-      }
-
-      #window,
-      #workspaces {
-          margin: 0 4px;
-      }
-
-      /* If workspaces is the leftmost module, omit left margin */
-      .modules-left > widget:first-child > #workspaces {
-          margin-left: 0;
-      }
-
-      /* If workspaces is the rightmost module, omit right margin */
-      .modules-right > widget:last-child > #workspaces {
-          margin-right: 0;
-      }
-
-      #clock {
-          background-color: #64727D;
-      }
-
-      #cpu {
-          background-color: ${c.cyan};
-          color: #000000;
-      }
-
-      #memory {
-          background-color: ${c.yellow};
-          color: #000000;
-      }
-
-      #network {
-          background-color: #2980b9;
-      }
-
-      #network.disconnected {
-          background-color: #f53c3c;
-      }
-
-      #pulseaudio {
-          background-color: #f1c40f;
-          color: #000000;
-      }
-
-      #pulseaudio.muted {
-          background-color: #90b1b1;
-          color: #2a5c45;
-      }
-
-      #wireplumber {
-          background-color: #fff0f5;
-          color: #000000;
-      }
-
-      #wireplumber.muted {
-          background-color: #f53c3c;
-      }
-
-      #tray {
-          background-color: #2980b9;
-      }
-
-      #tray > .passive {
-          -gtk-icon-effect: dim;
-      }
-
-      #tray > .needs-attention {
-          -gtk-icon-effect: highlight;
-          background-color: #eb4d4b;
-      }
-
-      #mpd {
-          background-color: #66cc99;
-          color: #2a5c45;
-      }
-
-      #mpd.disconnected {
-          background-color: #f53c3c;
-      }
-
-      #mpd.stopped {
-          background-color: #90b1b1;
-      }
-
-      #mpd.paused {
-          background-color: #51a37a;
-      }
-    '';
-    # background-color: rgba(0,0,0,0);
-    # border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-
-    #style = ''
-    #'';
-  };
-
-  systemd.user.services.waybar = {
-    Service.Environment = [
-      "DISPLAY=:0"
-    ];
-  };
-}
--- a/home/programs/xmonad/xmonad.hs
+++ b/home/programs/xmonad/xmonad.hs
@ -86,6 +86,7 @@ myScratchpads = [ NS "ncmpcpp"     spawnNC findNC layoutA
  where
    spawnNC = myTerminal ++ " --title ncmpcppScratchpad -e ncmpcpp"
    spawnTM = myTerminal ++ " --class floatingTerminal -e tmux new-session -A -s f"
+    spawnTW = myTerminal ++ " --class taskWarriorTerminal -e taskwarrior-tui"
    -- spawnMX = "element"
    spawnFB = "thunar --class=floatingThunar"
    spawnEX = "emacs --name=floatingEmacs"
@ -94,6 +95,7 @@ myScratchpads = [ NS "ncmpcpp"     spawnNC findNC layoutA

    findNC = title =? "ncmpcppScratchpad"
    findTM = className =? "floatingTerminal"
+    findTW = className =? "taskWarriorTerminal"
    findSC = className =? "floatingSchedule"
    -- findMX = className =? "element"
    findFB = className =? "floatingThunar"
--- a/home/programs/yt-dlp.nix
+++ b/home/programs/yt-dlp.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.yt-dlp.enable = true;
-}
--- a/home/programs/zed/default.nix
+++ b/home/programs/zed/default.nix
@ -1,75 +1,26 @@
-{ pkgs, ... }:
+{ config, pkgs, unstable-pkgs, lib, ... }:
 {
-  programs.zed-editor = {
-    enable = true;
+  home.packages = with unstable-pkgs; [ zed-editor ];

-    userSettings = {
-      load_direnv = "shell_hook";
-      base_keymap = "VSCode";
+  xdg.configFile."zed/settings.json".source = let
+    format = pkgs.formats.json { };
+  in format.generate "zed-settings.json" {
+    autosave = "off";
+    buffer_font_family = "Fira Code";
+    load_direnv = "shell_hook";
+    format_on_save = "off";

-      autosave = "off";
-      format_on_save = "off";
-      remove_trailing_whitespace_on_save = false;
-
-      tab_size = 2;
-
-      ui_font_family = "Noto Sans";
-      buffer_font_family = "Fira Code";
-      terminal.font_family = "Fira Code";
-
-      telemetry = {
-        diagnostics = false;
-        metrics = false;
-      };
-
-      vim_mode = true;
-
-      theme = {
-        mode = "dark";
-        light = "monokai Classic";
-        dark = "monokai Darker Classic";
-      };
-
-      file_scan_exclusions = [
-        "**/.git"
-        "**/.svn"
-        "**/.hg"
-        "**/.jj"
-        "**/CVS"
-        "**/.DS_Store"
-        "**/Thumbs.db"
-        "**/.classpath"
-        "**/.settings"
-
-        "**/.direnv"
-      ];
-
-      git.inline_blame.enable = false;
-
-      indent_guides = {
-        enabled = true;
-        coloring = "indent_aware";
-      };
+    telemetry = {
+      diagnostics = false;
+      metrics = false;
    };

-    userKeymaps = [
-      {
-        context = "Workspace";
-        bindings = {
-          ctrl-j = "workspace::NewTerminal";
-        };
-      }
-    ];
+    vim_mode = true;

-    extensions = [
-      "basher"
-      "dart"
-      "dockerfile"
-      "html"
-      "nix"
-      "sql"
-      "toml"
-    ];
+    theme = {
+      mod = "dark";
+      dark = "monokai Classic";
+    };
  };

  xdg.configFile."zed/themes/monokai.json".source = let
--- a/home/programs/zoxide.nix
+++ b/home/programs/zoxide.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.zoxide.enable = true;
-}
--- a/home/services/dunst.nix
+++ b/home/services/dunst.nix
@ -1,9 +1,9 @@
-{ config, pkgs, lib, machineVars, ... }:
+{ pkgs, config, ... }:
 {
  services.dunst = {
    enable = true;
    iconTheme = {
-      package = pkgs.adwaita-icon-theme;
+      package = pkgs.gnome.adwaita-icon-theme;
      name = "Adwaita";
      size = "32x32";
    };
@ -13,9 +13,9 @@
        class = "Dunst";
        browser = "${pkgs.xdg-utils}/bin/xdg-open";

-        offset = lib.mkIf (!machineVars.wayland) (let
+        offset = let 
          status-bar-height = config.services.polybar.settings."bar/top".height;
-        in "15x${toString (status-bar-height + 10)}");
+        in "15x${toString (status-bar-height + 10)}";

        corner_radius = 0;
        font = "Droid Sans 9";
@ -47,14 +47,14 @@
        background = config.colors.defaultColorSet.background;
        timeout = 4;
      };
-
+      
      urgency_normal = {
        frame_color = config.colors.defaultColorSet.green;
        foreground = config.colors.defaultColorSet.foreground;
        background = config.colors.defaultColorSet.background;
        timeout = 6;
      };
-
+      
      urgency_critical = {
        frame_color = config.colors.defaultColorSet.red;
        foreground = config.colors.defaultColorSet.red;
--- a/home/services/fcitx5.nix
+++ b/home/services/fcitx5.nix
@ -132,6 +132,5 @@ in
    Service.Restart="on-failure";
    Service.ExecStart = lib.mkForce "${fcitx5Package}/bin/fcitx5";
    Service.ExecReload = "/bin/kill -HUP $MAINPID";
-    Install.Alias = "fcitx5.service";
  };
 }
--- a/home/services/gnome-keyring.nix
+++ b/home/services/gnome-keyring.nix
@ -1,4 +0,0 @@
-{ machineVars, ... }:
-{
-  services.gnome-keyring.enable = !machineVars.headless;
-}
--- a/home/services/keybase.nix
+++ b/home/services/keybase.nix
@ -1,5 +0,0 @@
-{ ... }:
-{
-  services.keybase.enable = true;
-  services.kbfs.enable = true;
-}
--- a/home/services/mpd.nix
+++ b/home/services/mpd.nix
@ -1,141 +1,28 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.services.mpd;
-in
+{ config, ... }:
 {
-  services.mpd = {
+  services.mpd = rec {
    enable = true;
    musicDirectory = config.xdg.userDirs.music;
-    playlistDirectory = "${cfg.musicDirectory}/playlists/MPD";
+    playlistDirectory = "${musicDirectory}/playlists/MPD";
    network.startWhenNeeded = true;

+    # TODO: make the path specific to the user unit
    extraConfig = ''
-      pid_file "/run/user/${toString config.home.uid}/mpd/pid"
-
-      zeroconf_enabled "no"
-
-      replaygain "auto"
-
-      restore_paused "yes"
-
-      auto_update "no"
+      audio_output {
+        type "fifo"
+        name "Visualizer feed"
+        path "/tmp/mpd.fifo"
+        format "44100:16:2"
+      }

      audio_output {
        type "pipewire"
        name "PipeWire Sound Server"
      }
-
-      audio_output {
-        type "fifo"
-        name "Visualizer feed"
-        path "/run/user/${toString config.home.uid}/mpd/visualizer.fifo"
-        format "44100:16:2"
-      }
-
-      resampler {
-        plugin "soxr"
-        quality "very high"
-      }
-
-      playlist_plugin {
-        name "cue"
-        enabled "true"
-      }
-
-      playlist_plugin {
-        name "m3u"
-        enabled "true"
-      }
-
-      playlist_plugin {
-        name "extm3u"
-        enabled "true"
-      }
-
-      playlist_plugin {
-        name "flac"
-        enabled "true"
-      }
-
-      playlist_plugin {
-        name "rss"
-        enabled "true"
-      }
    '';
  };

+  # TODO: disable auto_update and use systemd path to listen for changes
  # TODO: upstream unix socket support to home-manager
-
-  systemd.user.services.mpd = {
-    Unit = {
-      Documentation = [
-        "man:mpd(1)"
-        "man:mpd.conf(5)"
-      ];
-    };
-    Service = {
-      WatchdogSec = 120;
-
-      # for io_uring
-      LimitMEMLOCK = "64M";
-
-      # allow MPD to use real-time priority 40
-      LimitRTPRIO = 40;
-      LimitRTTIME = "infinity";
-
-      PrivateUsers = true;
-      ProtectSystem = true;
-      NoNewPrivileges = true;
-      ProtectKernelTunables = true;
-      ProtectControlGroups = true;
-      RestrictAddressFamilies = [
-        "AF_INET"
-        "AF_UNIX"
-      ];
-      RestrictNamespaces = true;
-    };
-  };
-
-  systemd.user.paths.mpd-update-library = {
-    Unit = {
-      Description = "Watchdog that updates the mpd library whenever the files are modified";
-      Documentation = [
-        "man:mpd(1)"
-        "man:mpd.conf(5)"
-      ];
-      WantedBy = [ "paths.target" ];
-    };
-    Path = {
-      PathChanged = cfg.musicDirectory;
-      Unit = "mpd-update-library.service";
-      TriggerLimitIntervalSec = "1s";
-      TriggerLimitBurst = "1";
-    };
-  };
-
-  systemd.user.services.mpd-update-library = {
-    Unit = {
-      Description = "Watchdog that updates the mpd library whenever the files are modified";
-      Documentation = [
-        "man:mpd(1)"
-        "man:mpd.conf(5)"
-      ];
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = "${lib.getExe pkgs.mpc-cli} update --wait";
-
-      PrivateUsers = true;
-      ProtectSystem = true;
-      NoNewPrivileges = true;
-      ProtectKernelTunables = true;
-      ProtectControlGroups = true;
-      RestrictAddressFamilies = [
-        "AF_INET"
-        "AF_UNIX"
-      ];
-      RestrictNamespaces = true;
-    };
-  };
 }

--- a/home/services/network-manager.nix
+++ b/home/services/network-manager.nix
@ -1,4 +0,0 @@
-{ machineVars, ... }:
-{
-  services.network-manager-applet.enable = !machineVars.headless;
-}
--- a/home/services/polybar.nix
+++ b/home/services/polybar.nix
@ -1,4 +1,4 @@
-{ pkgs, config, machineVars, ... }: let
+{ pkgs, lib, config, machineVars, ... }: let
  colors = config.colors.defaultColorSet;
 in {
  services.polybar = {
@ -11,13 +11,23 @@ in {
    package = pkgs.polybar.override {
      githubSupport = true;
      mpdSupport = true;
+      pulseSupport = true;
    };

    settings = {
+      "module/tray" = {
+        type = "internal/tray";
+
+        # padding = 4;
+        tray-spacing = "8px";
+        tray-maxsize = "25px";
+        # tray-background = colors.background;
+      };
+
      "bar/top" = {
        bottom = false;
        # monitor =
-        tray.position = "right";
+        # tray.position = "right";

        background = colors.background;
        foreground = colors.foreground;
@ -41,19 +51,20 @@ in {
          left = "xmonad";
          center = "date";
          right = builtins.concatStringsSep " " [
-            "filesystem "
-            (if machineVars.wlanInterface != null then "wlan " else "")
-            (if machineVars.battery != null then "batt " else "")
-            "vol"
+            "filesystem"
+            (lib.optionalString (machineVars.wlanInterface != null) "wlan")
+            (lib.optionalString (machineVars.battery != null) "batt")
+            "pulseaudio"
            "mpd"
+            "tray"
          ];
        };

-        tray = {
-          padding = 4;
-          maxsize = 25;
-          background = colors.background;
-        };
+        # tray = {
+        #   padding = 4;
+        #   maxsize = 25;
+        #   background = colors.background;
+        # };
      };

      "module/xmonad" = {
@ -155,15 +166,15 @@ in {
        };
      };

-      "module/vol" = {
-        type = "internal/alsa";
+      "module/pulseaudio" = {
+        type = "internal/pulseaudio";
        # format-volume = "<bar-volume>}"
        # format-volume = "%{A1:bash -c '~/.scripts/get-volume' &:}<bar-volume>%{A}"
        # format-volume = <label-volume> <bar-volume>

        # format-volume-padding = 1
        # format-muted-padding = 1
-        format-volume = "%{T3}%{T-} <label-volume> <bar-volume>";
+        format-volume = "  <label-volume> <bar-volume>";
        # label-volume = 
        label-volume-foreground = colors.magenta;
        # format-muted-foreground = "${colors.foreground-alt}";
@ -273,9 +284,11 @@ in {
        # Default: false
        fixed-values = true;

-        # Spacing (number of spaces, pixels, points) between entries
-        # Default: 2
-        spacing = 4;
+        # Margin (number of spaces, pixels, or points) to add before/after each module
+        # Individual side values can be defined using:
+        #   module-margin-{left,right}
+        module-margin = "16px";
+        # spacing = "16px";

        # Default: 90
        # New in version 3.6.0
--- a/home/services/psd.nix
+++ b/home/services/psd.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.psd.enable = true;
-}
--- a/home/services/sxhkd.nix
+++ b/home/services/sxhkd.nix
@ -22,11 +22,11 @@ in

      # Volume

-      "super + {@F7,@F8}" = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%{-,+}";
+      "super + {@F7,@F8}" = "${pkgs.alsaUtils}/bin/amixer set Master 2%{-,+}";

-      "{XF86AudioLowerVolume,XF86AudioRaiseVolume}" = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%{-,+}";
+      "{XF86AudioLowerVolume,XF86AudioRaiseVolume}" = "${pkgs.alsaUtils}/bin/amixer set Master 2%{-,+}";

-      "XF86AudioMute" = "${pkgs.wireplumber}/bin/wpctl set-mute toggle";
+      "XF86AudioMute" = "${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";

      # Music

--- a/home/shell.nix
+++ b/home/shell.nix
@ -14,19 +14,6 @@
      exe = if pkg.meta ? mainProgram then pkg.meta.mainProgram else name;
    in "${pkg}/bin/${exe}";
 in {
-  sops.secrets."nordicsemi/envvars" = {
-    sopsFile = ../secrets/home.yaml;
-  };
-
-
-  programs.bash.bashrcExtra = ''
-    source "${config.sops.secrets."nordicsemi/envvars".path}"
-  '';
-
-  programs.zsh.envExtra = ''
-    source "${config.sops.secrets."nordicsemi/envvars".path}"
-  '';
-
  local.shell.aliases = {

    # ░█▀▄░█▀▀░█▀█░█░░░█▀█░█▀▀░█▀▀░█▄█░█▀▀░█▀█░▀█▀░█▀▀
@ -61,7 +48,6 @@ in {
      findx = p "fd";

      ag = "${pkgs.ripgrep}/bin/rg";
-      sxiv = "${pkgs.nsxiv}/bin/nsxiv";

      lls = "${pkgs.coreutils}/bin/ls --color=always";
      ls = p "eza";
@ -271,7 +257,6 @@ in {
      p = "${pkgs.python3Packages.ipython}/bin/ipython";
      s = p "sxiv";
      v = p "mpv";
-      zed = p "zed-editor";
      zt = p "zathura";
    };

@ -305,11 +290,6 @@ in {
      view-latex = "${pkgs.texlive.combined.scheme-full}/bin/latexmk -pdf -pvc main.tex";

      reload-tmux = "${p "tmux"} source $HOME/.config/tmux/tmux.conf";
-
-      nordic-vpn = lib.concatStringsSep " | " [
-        "${p "gpauth"} \"$NORDIC_VPN_ENDPOINT\" --gateway --browser default 2>/dev/null"
-        "sudo ${p "gpclient"} connect \"$NORDIC_VPN_ENDPOINT\" --as-gateway --cookie-on-stdin"
-      ];
    };

    # ░█▀▀░█▀▀░█▀█░█▀▀░█▀▄░█▀█░▀█▀░█▀▀░█▀▄
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@ -11,14 +11,10 @@ in {
    ./programs/nix-ld.nix
    ./programs/ssh.nix
    ./programs/usbtop.nix
-    ./programs/wireshark.nix

+    ./services/cups.nix
    ./services/dbus.nix
-    ./services/fwupd.nix
-    ./services/irqbalance.nix
-    ./services/journald.nix
-    ./services/libinput.nix
-    ./services/logind.nix
+    ./services/logrotate.nix
    ./services/openssh.nix
    ./services/pcscd.nix
    ./services/pipewire.nix
@ -26,20 +22,16 @@ in {
    ./services/resolved.nix
    ./services/smartd.nix
    ./services/systemd-lock-handler.nix
-    ./services/uptimed.nix
-    ./services/userborn.nix
    ./services/xserver.nix
  ];

-  # systemd.enableStrictShellChecks = true;
-
  sops.defaultSopsFile = ./../.. + "/secrets/${config.networking.hostName}.yaml";

  time.timeZone = "Europe/Oslo";

  console = {
-    font = lib.mkDefault "Lat2-Terminus16";
-    keyMap = lib.mkDefault "us";
+    font = "Lat2-Terminus16";
+    keyMap = "us";
  };

  networking = {
@ -113,7 +105,6 @@ in {
        "media"
        "minecraft"
        "networkmanager"
-        "rtkit"
        "scanner"
        "video"
        "wheel"
@ -134,6 +125,15 @@ in {
      android-udev-rules
      light
    ];
+
+    libinput = {
+      enable = !config.machineVars.headless;
+      touchpad.disableWhileTyping = true;
+    };
+
+    irqbalance.enable = true;
+
+    displayManager.defaultSession = "none+xmonad";
  };

  programs = {
@ -141,14 +141,6 @@ in {
    git.enable = true;
    tmux.enable = true;
    zsh.enable = true;
-    hyprland = lib.mkIf config.machineVars.wayland {
-      enable = true;
-      withUWSM = true;
-    };
-  };
-
-  security.pam.services = lib.mkIf (config.machineVars.wayland) {
-    hyprlock = { };
  };

  system.extraDependencies =
@ -190,48 +182,12 @@ in {
      sqlite-web
    ]);

-  # Realtime scheduling for pipewire and mpd
  security.rtkit.enable = !config.machineVars.headless;

-  security.tpm2.enable = lib.mkDefault true;
-  security.tpm2.abrmd.enable = lib.mkDefault config.security.tpm2.enable;
  security.sudo.extraConfig = let
    sudoLecture = pkgs.writeText "sudo-lecture.txt" (extendedLib.termColors.front.red "Be careful or something, idk...\n");
  in ''
    Defaults    lecture = always
    Defaults    lecture_file = ${sudoLecture}
  '';
-
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-
-  # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/profiles/hardened.nix
-  boot.blacklistedKernelModules = [
-    # Obscure network protocols
-    "ax25"
-    "netrom"
-    "rose"
-
-    # Old or rare or insufficiently audited filesystems
-    "adfs"
-    "affs"
-    "bfs"
-    "befs"
-    "cramfs"
-    "efs"
-    # "erofs" // used by systemd
-    "exofs"
-    "freevxfs"
-    "f2fs"
-    "hfs"
-    "hpfs"
-    "jfs"
-    "minix"
-    "nilfs2"
-    "ntfs"
-    "omfs"
-    "qnx4"
-    "qnx6"
-    "sysv"
-    "ufs"
-  ];
 }
--- a/hosts/common/fonts.nix
+++ b/hosts/common/fonts.nix
@ -35,24 +35,10 @@

    fontconfig = {
      defaultFonts = {
-        serif = [
-          "Droid Sans Serif"
-          "Noto Serif CJK JP"
-          "Ubuntu"
-        ];
-        sansSerif = [
-          "Droid Sans"
-          "Noto Sans Serif CJK JP"
-          "Ubuntu"
-        ];
-        monospace = [
-          "Fira Code"
-          "Noto Sans Mono CJK JP"
-          "Ubuntu"
-        ];
-        emoji = [
-          "Noto Sans Emoji"
-        ];
+        serif = [ "Droid Sans Serif" "Ubuntu" ];
+        sansSerif = [ "Droid Sans" "Ubuntu" ];
+        monospace = [ "Fira Code" "Ubuntu" ];
+        emoji = [ "Noto Sans Emoji" ];
      };
    };
  };
--- a/hosts/common/nix-builders/bob.nix
+++ b/hosts/common/nix-builders/bob.nix
@ -3,6 +3,7 @@
  sops.secrets."ssh/nix-builders/bob/key" = { sopsFile = ./../../../secrets/common.yaml; };

  nix.buildMachines = [{
+    # Login details configured in ssh module in nix-secrets
    hostName = "nix-builder-bob";
    system = "x86_64-linux";
    speedFactor = 5;
@ -13,8 +14,8 @@
      "big-paralell"
    ];
    mandatoryFeatures = [ ];
-    sshUser = "oysteikt";
-    sshKey = config.sops.secrets."ssh/nix-builders/bob/key".path;
+    # sshUser = secrets.ssh.users.pvv.normalUser;
+    # sshKey = config.sops.secrets."ssh/nix-builders/bob/key".path;
  }];

  programs.ssh = {
--- a/hosts/common/nix-builders/isvegg.nix
+++ b/hosts/common/nix-builders/isvegg.nix
@ -1,15 +1,16 @@
-{ config, ... }:
+{ config, secrets, ... }:
 {
  sops.secrets."ssh/nix-builders/isvegg/key" = { sopsFile = ./../../../secrets/common.yaml; };

  nix.buildMachines = [{
+    # Login details configured in ssh module in nix-secrets
    hostName = "nix-builder-isvegg";
    system = "x86_64-linux";
    speedFactor = 1;
    maxJobs = 8;
    supportedFeatures = [ ];
    mandatoryFeatures = [ ];
-    sshUser = "oysteikt";
+    sshUser = secrets.ssh.users.pvv.normalUser;
    sshKey = config.sops.secrets."ssh/nix-builders/isvegg/key".path;
  }];

--- a/hosts/common/nix-builders/tsuki.nix
+++ b/hosts/common/nix-builders/tsuki.nix
@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, secrets, ... }:
 {
  # TODO: install public key on tsuki declaratively
  sops.secrets = {
@ -7,6 +7,7 @@
  };

  nix.buildMachines = [{
+    # Login details configured in ssh module in nix-secrets
    hostName = "nix-builder-tsukir";
    system = "x86_64-linux";
    speedFactor = 2;
@ -25,8 +26,7 @@
    extraConfig = ''
      Host nix-builder-tsukir
        HostName gingakei.loginto.me
-        Port 45497
-        IdentityFile ${config.sops.secrets."ssh/nix-builders/tsuki/key".path}
+        Port ${toString secrets.ports.ssh.home-in}
    '';

    # knownHosts.tsukir = {
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@ -43,11 +43,6 @@
        type = "path";
        path = "/home/h7x4/git/nixpkgs-tools";
      };
-      shells.to = {
-        type = "git";
-        url = "https://git.pvv.ntnu.no/oysteikt/shells.git";
-        ref = "main";
-      };
    };
  };
 }
--- a/hosts/common/programs/wireshark.nix
+++ b/hosts/common/programs/wireshark.nix
@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-let
-  inherit (config) machineVars;
-in
-{
-  programs.wireshark = {
-    enable = !config.machineVars.headless;
-    package = pkgs.wireshark;
-  };
-}
--- a/hosts/common/services/cups.nix
+++ b/hosts/common/services/cups.nix
@ -0,0 +1,71 @@
+{ config, lib, ... }:
+{
+  systemd.services = lib.mkIf config.services.printing.enable {
+    cups.serviceConfig = {
+      PrivateTmp = true;
+      ProtectSystem = "strict";
+      ProtectHome = true;
+      ProtectClock= true;
+      ProtectControlGroups = true;
+      ProtectHostname = true; 
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      PrivateDevices = true;
+      NoNewPrivileges = true;
+      # User =
+      AmbientCapabilities = [ "" ];
+      CapabilityBoundingSet = [ "" ];
+      DevicePolicy = "closed";
+      KeyringMode = "private";
+      LockPersonality = true;
+      MemoryDenyWriteExecute = true;
+      PrivateUsers = true;
+      RemoveIPC = true;
+      # RestrictAddressFamilies = [ "" ];
+      RestrictNamespaces=true;
+      RestrictRealtime=true;
+      RestrictSUIDSGID=true;
+      SystemCallArchitectures = "native";
+      SystemCallFilter = [
+        "@system-service"
+        "~@privileged"
+      ];
+      UMask = "0077";
+    };
+    cups-browsed.serviceConfig = {
+      PrivateTmp = true;
+      ProtectSystem = "strict";
+      ProtectHome = true;
+      ProtectClock= true;
+      ProtectControlGroups = true;
+      ProtectHostname = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      PrivateDevices = true;
+      NoNewPrivileges = true;
+      # User =
+      AmbientCapabilities = [ "" ];
+      CapabilityBoundingSet = [ "" ];
+      DevicePolicy = "closed";
+      KeyringMode = "private";
+      LockPersonality = true;
+      MemoryDenyWriteExecute = true;
+      PrivateUsers = true;
+      RemoveIPC = true;
+      # RestrictAddressFamilies = [ "" ];
+      RestrictNamespaces=true;
+      RestrictRealtime=true;
+      RestrictSUIDSGID=true;
+      SystemCallArchitectures = "native";
+      SystemCallFilter = [
+        "@system-service"
+        "~@privileged"
+      ];
+      UMask = "0077";
+    };
+  };
+}
--- a/hosts/common/services/dbus.nix
+++ b/hosts/common/services/dbus.nix
@ -2,7 +2,6 @@
 {
  services.dbus = {
    enable = true;
-    implementation = "broker";
    packages = with pkgs; [
      gcr
      dconf
--- a/hosts/common/services/fwupd.nix
+++ b/hosts/common/services/fwupd.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.fwupd.enable = true;
-}
--- a/hosts/common/services/irqbalance.nix
+++ b/hosts/common/services/irqbalance.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.irqbalance.enable = true;
-}
--- a/hosts/common/services/journald.nix
+++ b/hosts/common/services/journald.nix
@ -1,6 +0,0 @@
-{ ... }:
-{
-  services.journald.extraConfig = ''
-    MaxFileSec=30day
-  '';
-}
--- a/hosts/common/services/libinput.nix
+++ b/hosts/common/services/libinput.nix
@ -1,7 +0,0 @@
-{ config, ...}:
-{
-  services.libinput = {
-    enable = !config.machineVars.headless;
-    touchpad.disableWhileTyping = true;
-  };
-}
--- a/hosts/common/services/logind.nix
+++ b/hosts/common/services/logind.nix
@ -1,6 +0,0 @@
-{ ... }:
-{
-  services.logind = {
-    powerKeyLongPress = "poweroff";
-  };
-}
--- a/hosts/common/services/logrotate.nix
+++ b/hosts/common/services/logrotate.nix
@ -0,0 +1,42 @@
+{ ... }:
+{
+  # source: https://github.com/logrotate/logrotate/blob/main/examples/logrotate.service
+  systemd.services.logrotate = {
+    documentation = [ "man:logrotate(8)" "man:logrotate.conf(5)" ];
+    unitConfig.RequiresMountsFor = "/var/log";
+    serviceConfig = {
+      Nice = 19;
+      IOSchedulingClass = "best-effort";
+      IOSchedulingPriority = 7;
+
+      ReadWritePaths = [ "/var/log" ];
+
+      AmbientCapabilities = [ "" ];
+      CapabilityBoundingSet = [ "" ];
+      DeviceAllow = [ "" ];
+      LockPersonality = true;
+      MemoryDenyWriteExecute = true;
+      NoNewPrivileges = true; # disable for third party rotate scripts
+      PrivateDevices = true;
+      PrivateNetwork = true; # disable for mail delivery
+      PrivateTmp = true;
+      ProtectClock = true;
+      ProtectControlGroups = true;
+      ProtectHome = true; # disable for userdir logs
+      ProtectHostname = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      ProtectSystem = "full";
+      RestrictNamespaces = true;
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true; # disable for creating setgid directories
+      SocketBindDeny = [ "any" ];
+      SystemCallArchitectures = "native";
+      SystemCallFilter = [
+        "@system-service"
+      ];
+    };
+  };
+}
--- a/hosts/common/services/printing.nix
+++ b/hosts/common/services/printing.nix
@ -1,77 +1,4 @@
-{ config, lib, ... }:
-let
-  cfg = config.services.printing;
-in
+{ config, ... }:
 {
-  # services.printing.enable = !config.machineVars.headless;
-  services.printing.enable = false;
-
-  systemd.services = lib.mkIf cfg.enable {
-    cups.serviceConfig = {
-      PrivateTmp = true;
-      ProtectSystem = "strict";
-      ProtectHome = true;
-      ProtectClock= true;
-      ProtectControlGroups = true;
-      ProtectHostname = true;
-      ProtectKernelLogs = true;
-      ProtectKernelModules = true;
-      ProtectKernelTunables = true;
-      ProtectProc = "invisible";
-      PrivateDevices = true;
-      NoNewPrivileges = true;
-      # User =
-      AmbientCapabilities = [ "" ];
-      CapabilityBoundingSet = [ "" ];
-      DevicePolicy = "closed";
-      KeyringMode = "private";
-      LockPersonality = true;
-      MemoryDenyWriteExecute = true;
-      PrivateUsers = true;
-      RemoveIPC = true;
-      # RestrictAddressFamilies = [ "" ];
-      RestrictNamespaces=true;
-      RestrictRealtime=true;
-      RestrictSUIDSGID=true;
-      SystemCallArchitectures = "native";
-      SystemCallFilter = [
-        "@system-service"
-        "~@privileged"
-      ];
-      UMask = "0077";
-    };
-    cups-browsed.serviceConfig = lib.mkIf cfg.enable {
-      PrivateTmp = true;
-      ProtectSystem = "strict";
-      ProtectHome = true;
-      ProtectClock= true;
-      ProtectControlGroups = true;
-      ProtectHostname = true;
-      ProtectKernelLogs = true;
-      ProtectKernelModules = true;
-      ProtectKernelTunables = true;
-      ProtectProc = "invisible";
-      PrivateDevices = true;
-      NoNewPrivileges = true;
-      # User =
-      AmbientCapabilities = [ "" ];
-      CapabilityBoundingSet = [ "" ];
-      DevicePolicy = "closed";
-      KeyringMode = "private";
-      LockPersonality = true;
-      MemoryDenyWriteExecute = true;
-      PrivateUsers = true;
-      RemoveIPC = true;
-      # RestrictAddressFamilies = [ "" ];
-      RestrictNamespaces=true;
-      RestrictRealtime=true;
-      RestrictSUIDSGID=true;
-      SystemCallArchitectures = "native";
-      SystemCallFilter = [
-        "@system-service"
-        "~@privileged"
-      ];
-      UMask = "0077";
-    };
-  };
+  services.printing.enable = !config.machineVars.headless;
 }
--- a/hosts/common/services/uptimed.nix
+++ b/hosts/common/services/uptimed.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.uptimed.enable = true;
-}
--- a/hosts/common/services/userborn.nix
+++ b/hosts/common/services/userborn.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.userborn.enable = true;
-}
--- a/hosts/common/services/xserver.nix
+++ b/hosts/common/services/xserver.nix
@ -1,41 +1,19 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 {
-  services.displayManager = lib.mkIf (!config.machineVars.headless) {
-    enable = true;
-    defaultSession = "none+xmonad";
-    sddm = {
-      enable = true;
-      wayland.enable = config.machineVars.wayland;
-      package = pkgs.kdePackages.sddm;
-      theme = "sddm-astronaut-theme";
-      extraPackages = [
-        pkgs.kdePackages.qt5compat
-        # pkgs.sddm-astronaut
-      ];
-    };
-  };
-
-  environment.systemPackages = [
-    (pkgs.sddm-astronaut.override {
-      themeConfig = {
-        PartialBlur = false;
-        # Background = "Backgrounds/";
-      };
-    })
-  ];
-
-  services.xserver = lib.mkIf (!config.machineVars.headless) {
-    enable = true;
+  services.xserver = {
+    enable = !config.machineVars.headless;

    xkb = {
      layout = "us";
      options = "caps:escape";
    };

-    desktopManager = {
-      xterm.enable = true;
-      xfce.enable = true;
-    };
+    # desktopManager = {
+    #   xterm.enable = false;
+    #   xfce.enable = !config.machineVars.headless;
+    # };
+
+    displayManager.lightdm.enable = !config.machineVars.headless;

    windowManager.xmonad = {
      enable = true;
--- a/hosts/dosei/configuration.nix
+++ b/hosts/dosei/configuration.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 {
  imports = [
    ./hardware-configuration.nix
@ -34,8 +34,6 @@
    development = true;
    creative = true;

-    wayland = true;
-
    dataDrives = let
      main = "/data";
    in {
@ -79,11 +77,14 @@
    fstrim.enable = true;
  };

-  nix.buildMachines = lib.mkForce [ ];
-
  hardware = {
    bluetooth.enable = true;
    enableRedistributableFirmware = true;
    keyboard.zsa.enable = true;
+    opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
+    };
  };
 }
--- a/hosts/dosei/home/default.nix
+++ b/hosts/dosei/home/default.nix
@ -1,11 +1,7 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
  home.stateVersion = "24.05";

-  home.packages = with pkgs; [
-    groovy
-  ];
-
  programs.ssh.matchBlocks = {
    "tsuki-ws" = {
      user = "h7x4";
@ -13,8 +9,7 @@
      port = 10022;
    };

-    "hildring pvv-login".proxyJump = "tsuki-ws";
-    "drolsum pvv-login2 pvv".proxyJump = "tsuki-ws";
+    "hildring pvv-login pvv".proxyJump = "tsuki-ws";
  };

  sops.secrets."git/nordicsemi-maintenance-repos-config" = { };
@ -22,6 +17,4 @@
  programs.git.includes = [
    { path = config.sops.secrets."git/nordicsemi-maintenance-repos-config".path; }
  ];
-
-  programs.waybar.settings.mainBar.output = [ "DP-1" ];
-}
+}
--- a/hosts/dosei/services/wstunnel.nix
+++ b/hosts/dosei/services/wstunnel.nix
@ -7,16 +7,11 @@
    "services/networking/wstunnel.nix"
  ];

-  sops = {
-    secrets."wstunnel/http-upgrade-path-prefix" = {
-      sopsFile = ../../../secrets/common.yaml;
-    };
-    templates."wstunnel-environment.env".content = let
-      inherit (config.sops) placeholder;
-    in ''
-      WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"}
-      WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"}
-    '';
+  # NOTE: Contains
+  # - WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX
+  # - WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX
+  sops.secrets."wstunnel/http-upgrade-path-prefix-envvars" = {
+    sopsFile = ../../../secrets/common.yaml;
  };

  services.wstunnel = {
@ -26,7 +21,7 @@
      localToRemote = [
        "tcp://10022:localhost:22"
      ];
-      environmentFile = config.sops.templates."wstunnel-environment.env".path;
+      environmentFile = config.sops.secrets."wstunnel/http-upgrade-path-prefix-envvars".path;
    };
  };
 }
--- a/hosts/kasei/configuration.nix
+++ b/hosts/kasei/configuration.nix
@ -12,8 +12,6 @@
    ./services/keybase.nix

    ./nspawn-containers/arch.nix
-
-    ./testconfig.nix
  ];

  system.stateVersion = "22.05";
@ -78,8 +76,11 @@
  };

  services = {
-    openssh.enable = true;
-    xserver.videoDrivers = [ "nvidia" ];
+    openssh = {
+      enable = true;
+      settings.X11Forwarding = true;
+    };
+    xserver.videoDrivers = [ "amdgpu" ];
    tailscale.enable = true;
    avahi = {
      enable = true;
@ -95,6 +96,12 @@

  boot = {
    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+    initrd.kernelModules = [ "amdgpu" ];
+
+    # kernelPackages = pkgs.linuxKernel.packages.linux_zen.zfs;
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    kernelModules = [ "kvm-amd" ];
+    supportedFilesystems = [ "zfs" ];

    loader = {
      efi.canTouchEfiVariables = false;
@ -138,12 +145,10 @@
    enableRedistributableFirmware = true;
    keyboard.zsa.enable = true;
    sane.enable = true;
-
-    nvidia = {
-      modesetting.enable = true;
-      open = false;
-      nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+    opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
    };
  };
 }
--- a/hosts/kasei/testconfig.nix
+++ b/hosts/kasei/testconfig.nix
@ -1,6 +0,0 @@
-{ ... }:
-# NOTE: this file is a space where i put new configuration while i'm testing it.
-#       There shouldn't really be anything here, I'm not planning to commit any config here.
-{
-
-}
--- a/hosts/tsuki/configuration.nix
+++ b/hosts/tsuki/configuration.nix
@ -1,4 +1,4 @@
-{ config, lib, modulesPath, ... }:
+{ config, lib, secrets, modulesPath, ... }:
 {
  imports = [
    ./hardware-configuration.nix
@ -71,6 +71,12 @@
        isSystemUser = true;
        group = "media";
      };
+      nix-builder = {
+        description = "User for executing distributed builds via SSH";
+        isSystemUser = true;
+        group = "nix-builder";
+        openssh.authorizedKeys.keyFiles = [ secrets.keys.ssh.nixBuilders.tsuki.public ];
+      };
    };
    groups = {
      media = {};
@ -78,11 +84,7 @@
    };
  };

-  sops.secrets."drives/cirno/password" = { };
-  sops.templates."drive-cirno.creds".content = ''
-    username=h7x4
-    password=${config.sops.placeholder."drives/cirno/password"}
-  '';
+  sops.secrets."drives/cirno/credentials" = {};


  virtualisation = {
--- a/hosts/tsuki/services/hedgedoc.nix
+++ b/hosts/tsuki/services/hedgedoc.nix
@ -1,80 +1,71 @@
-{ pkgs, lib, config, ... }: let
+{ pkgs, lib, config, options, ... }: let
  cfg = config.services.hedgedoc;
 in {
-  sops = {
-    secrets = {
-      "hedgedoc/env/cmd_session_secret" = { };
-      "hedgedoc/env/cmd_oauth2_client_secret" = { };
-    };
-    templates."hedgedoc.env" = {
+  config = {
+    # Contains CMD_SESSION_SECRET and CMD_OAUTH2_CLIENT_SECRET
+    sops.secrets."hedgedoc/env" = {
      restartUnits = [ "hedgedoc.service" ];
      owner = "hedgedoc";
      group = "hedgedoc";
-      content = let
-        inherit (config.sops) placeholder;
-      in ''
-        CMD_SESSION_SECRET=${placeholder."hedgedoc/env/cmd_session_secret"}
-        CMD_OAUTH2_CLIENT_SECRET=${placeholder."hedgedoc/env/cmd_oauth2_client_secret"}
-      '';
    };
-  };

-  users.groups.hedgedoc.members = [ "nginx" ];
+    users.groups.hedgedoc.members = [ "nginx" ];

-  services.hedgedoc = {
-    enable = true;
-    environmentFile = config.sops.templates."hedgedoc.env".path;
-    settings = {
-      domain = "docs.nani.wtf";
-      email = false;
-      allowAnonymous = false;
-      allowAnonymousEdits = true;
-      protocolUseSSL = true;
+    services.hedgedoc = {
+      enable = true;
+      environmentFile = config.sops.secrets."hedgedoc/env".path;
+      settings = {
+        domain = "docs.nani.wtf";
+        email = false;
+        allowAnonymous = false;
+        allowAnonymousEdits = true;
+        protocolUseSSL = true;

-      path = "/run/hedgedoc/hedgedoc.sock";
+        path = "/run/hedgedoc/hedgedoc.sock";

-      db = {
-        username = "hedgedoc";
-        # TODO: set a password
-        database = "hedgedoc";
-        host = "/var/run/postgresql";
-        dialect = "postgres";
-      };
+        db = {
+          username = "hedgedoc";
+          # TODO: set a password
+          database = "hedgedoc";
+          host = "/var/run/postgresql";
+          dialect = "postgres";
+        };

-      oauth2 = let
-        authServerUrl = config.services.kanidm.serverSettings.origin;
-      in rec {
-        baseURL = "${authServerUrl}/oauth2";
-        tokenURL = "${authServerUrl}/oauth2/token";
-        authorizationURL = "${authServerUrl}/ui/oauth2";
-        userProfileURL = "${authServerUrl}/oauth2/openid/${clientID}/userinfo";
+        oauth2 = let
+          authServerUrl = config.services.kanidm.serverSettings.origin;
+        in rec {
+          baseURL = "${authServerUrl}/oauth2";
+          tokenURL = "${authServerUrl}/oauth2/token";
+          authorizationURL = "${authServerUrl}/ui/oauth2";
+          userProfileURL = "${authServerUrl}/oauth2/openid/${clientID}/userinfo";

-        clientID = "hedgedoc";
+          clientID = "hedgedoc";

-        scope = "openid email profile";
-        userProfileUsernameAttr = "name";
-        userProfileEmailAttr = "email";
-        userProfileDisplayNameAttr = "displayname";
+          scope = "openid email profile";
+          userProfileUsernameAttr = "name";
+          userProfileEmailAttr = "email";
+          userProfileDisplayNameAttr = "displayname";

-        providerName = "KaniDM";
+          providerName = "KaniDM";
+        };
      };
    };
-  };

-  services.postgresql = {
-    ensureDatabases = [ "hedgedoc" ];
+    services.postgresql = {
+      ensureDatabases = [ "hedgedoc" ];

-    ensureUsers = [{
-      name = "hedgedoc";
-      ensureDBOwnership = true;
-    }];
-  };
+      ensureUsers = [{
+        name = "hedgedoc";
+        ensureDBOwnership = true;
+      }];
+    };

-  systemd.services.hedgedoc = rec {
-    requires = [
-      "postgresql.service"
-      "kanidm.service"
-    ];
-    after = requires;
+    systemd.services.hedgedoc = rec {
+      requires = [
+        "postgresql.service"
+        "kanidm.service"
+      ];
+      after = requires;
+    };
  };
 }
--- a/hosts/tsuki/services/kanidm.nix
+++ b/hosts/tsuki/services/kanidm.nix
@ -27,7 +27,6 @@ in {
      tls_chain = "${credsDir}/fullchain.pem";
      tls_key = "${credsDir}/key.pem";
      bindaddress = "127.0.0.1:8300";
-      # log_level = "debug";
      online_backup = {
        path = "/data/backup/kanidm";
        schedule = "00 22 * * *";
--- a/hosts/tsuki/services/matrix/bridges/matrix-appservice-irc.nix
+++ b/hosts/tsuki/services/matrix/bridges/matrix-appservice-irc.nix
@ -1,54 +1,6 @@
-{ config, pkgs, lib, ... }: let
+{ config, ... }: let
  cfg = config.services.matrix-appservice-irc;
 in {
-  sops = {
-    secrets = {
-      "matrix/bridges/irc/id" = {};
-      "matrix/bridges/irc/hs_token" = {};
-      "matrix/bridges/irc/as_token" = {};
-    };
-
-    templates."matrix-appservice-irc-registration.yml" = {
-      owner = "matrix-appservice-irc";
-      group = "matrix-synapse";
-      mode = "0440";
-      file = let
-        inherit (config.sops) placeholder;
-      in (pkgs.formats.yaml {}).generate "matrix-appservice-irc-registration.yml" {
-        id = placeholder."matrix/bridges/irc/id";
-        hs_token = placeholder."matrix/bridges/irc/hs_token";
-        as_token = placeholder."matrix/bridges/irc/as_token";
-        url = cfg.registrationUrl;
-        sender_localpart = cfg.localpart;
-        "de.sorunome.msc2409.push_ephemeral" = true;
-        protocols = [ "irc" ];
-        namespaces = {
-          aliases = [
-            {
-              exclusive = true;
-              regex = "#lainchanirc_.*:nani\\.wtf";
-            }
-            {
-              exclusive = true;
-              regex = "#liberairc_.*:nani\\.wtf";
-            }
-          ];
-          users = [
-            {
-              exclusive = true;
-              regex = "@lainanon_.*:nani\\.wtf";
-            }
-            {
-              exclusive = true;
-              regex = "@liberauser_.*:nani\\.wtf";
-            }
-          ];
-        };
-        rate_limited = false;
-      };
-    };
-  };
-
  services.matrix-appservice-irc = {
    enable = true;
    registrationUrl = "http://localhost:${toString cfg.port}";
@ -62,145 +14,64 @@ in {

      database = {
        engine = "postgres";
-        # TODO: use unix socket
        connectionString = "postgres://matrix-appservice-irc:@localhost:${toString config.services.postgresql.port}/matrix-appservice-irc?sslmode=disable";
      };

-      ircService = {
-        mediaProxy.publicUrl = "https://irc-matrix.nani.wtf/media";
+      ircService.servers."irc.lainchan.org" = {
+        name = "lainchan";
+        port = 6697;
+        ssl = true;
+        networkId = "ircLainchanOrg";

-        servers = {
-          "irc.libera.chat" = {
-            name = "libera";
-            port = 6697;
-            ssl = true;
-            networkId = "ircLiberaChat";
+        botConfig.enable = false;

-            botConfig.enable = false;
+        dynamicChannels = {
+          enabled = true;
+          createAlias = true;
+          aliasTemplate = "#lainchanirc_$CHANNEL";
+          published = true;
+          useHomeserverDirectory = true;
+          joinRule = "public";
+          federate = true;
+        };

-            dynamicChannels = {
-              enabled = true;
-              createAlias = true;
-              aliasTemplate = "#liberairc_$CHANNEL";
-              published = true;
-              useHomeserverDirectory = true;
-              joinRule = "public";
-              federate = true;
+        matrixClients = {
+          userTemplate = "@lainanon_$NICK";
+        };
+
+        ircClients = {
+          nickTemplate = "$LOCALPART[m]";
+          allowNickChanges = true;
+        };
+
+        membershipLists = {
+          enabled = true;
+          global = {
+            ircToMatrix = {
+              initial = true;
+              incremental = true;
            };
-
-            matrixClients = {
-              userTemplate = "@liberauser_$NICK";
+            matrixToIrc = {
+              initial = true;
+              incremental = true;
            };
-
-            ircClients = {
-              nickTemplate = "$LOCALPART[m]";
-              allowNickChanges = true;
-            };
-
-            membershipLists = {
-              enabled = true;
-              global = {
-                ircToMatrix = {
-                  initial = true;
-                  incremental = true;
-                };
-                matrixToIrc = {
-                  initial = true;
-                  incremental = true;
-                };
-              };
-            };
-
-            permissions."@h7x4:nani.wtf" = "admin";
-
-            # TODO: Port forward
-            ident.enable = true;
-
-            # TODO: Metrics
-          };
-
-          "irc.lainchan.org" = {
-            name = "lainchan";
-            port = 6697;
-            ssl = true;
-            networkId = "ircLainchanOrg";
-
-            botConfig.enable = false;
-
-            dynamicChannels = {
-              enabled = true;
-              createAlias = true;
-              aliasTemplate = "#lainchanirc_$CHANNEL";
-              published = true;
-              useHomeserverDirectory = true;
-              joinRule = "public";
-              federate = true;
-            };
-
-            matrixClients = {
-              userTemplate = "@lainanon_$NICK";
-            };
-
-            ircClients = {
-              nickTemplate = "$LOCALPART[m]";
-              allowNickChanges = true;
-            };
-
-            membershipLists = {
-              enabled = true;
-              global = {
-                ircToMatrix = {
-                  initial = true;
-                  incremental = true;
-                };
-                matrixToIrc = {
-                  initial = true;
-                  incremental = true;
-                };
-              };
-            };
-
-            permissions."@h7x4:nani.wtf" = "admin";
-
-            # TODO: Port forward
-            ident.enable = true;
-
-            # TODO: Metrics
          };
        };
+
+        permissions."@h7x4:nani.wtf" = "admin";
+
+        # TODO: Port forward
+        ident.enable = true;
+
+        # TODO: Metrics
      };
    };
  };

-  services.matrix-synapse-next.settings.app_service_config_files = [
-    config.sops.templates."matrix-appservice-irc-registration.yml".path
-  ];
-
  systemd.services.matrix-appservice-irc = {
-    enableStrictShellChecks = false;
    requires = [
      "matrix-synapse.service"
      "postgresql.service"
    ];
-
-    serviceConfig.BindReadOnlyPaths = [
-      "${config.sops.templates."matrix-appservice-irc-registration.yml".path}:/var/lib/matrix-appservice-irc/registration.yml"
-    ];
-
-    preStart = lib.mkForce ''
-      umask 077
-      # Generate key for crypting passwords
-      if ! [ -f "${cfg.settings.ircService.passwordEncryptionKeyPath}" ]; then
-        ${pkgs.openssl}/bin/openssl genpkey \
-            -out "${cfg.settings.ircService.passwordEncryptionKeyPath}" \
-            -outform PEM \
-            -algorithm RSA \
-            -pkeyopt "rsa_keygen_bits:${toString cfg.passwordEncryptionKeyLength}"
-      fi
-
-      if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}"]; then
-        ${lib.getExe pkgs.nodejs} ${pkgs.matrix-appservice-irc}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}"
-      fi
-    '';
  };
 }
--- a/hosts/tsuki/services/matrix/coturn.nix
+++ b/hosts/tsuki/services/matrix/coturn.nix
@ -1,25 +1,16 @@
-{ config, lib, ... }:
-let
-  cfg = config.services.coturn;
-in
+{ secrets, ... }:
 {
-  sops.secrets."matrix_synapse/turn_shared_secret" = { };
-
-  services.coturn = let
-    # certName = config.services.nginx.virtualHosts.${cfg.realm}.useACMEHost;
-    certName = "nani.wtf";
-    certDir = config.security.acme.certs.${certName}.directory;
-  in rec {
-    enable = false;
+  services.coturn = rec {
+    enable = true;
    no-cli = true;
    no-tcp-relay = true;
-    min-port = 46000;
-    max-port = 47000;
+    min-port = secrets.ports.matrix.coturn.min;
+    max-port = secrets.ports.matrix.coturn.max;
    use-auth-secret = true;
-    static-auth-secret-file = config.sops.secrets."matrix_synapse/turn_shared_secret".path;
+    static-auth-secret = secrets.keys.matrix.static-auth-secret;
    realm = "turn.nani.wtf";
-    cert = "${certDir}/cert.pem";
-    pkey = "${certDir}/key.pem";
+    cert = "${secrets.keys.certificates.server.crt}";
+    pkey = "${secrets.keys.certificates.server.key}";
    extraConfig = ''
      # for debugging
      verbose
@ -49,19 +40,4 @@ in
      denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
    '';
  };
-
-  networking.firewall = lib.mkIf cfg.enable {
-    interfaces.enp2s0 = let
-      range = [{
-        from = cfg.min-port;
-        to = cfg.max-port;
-      }];
-    in
-    {
-      allowedUDPPortRanges = range;
-      allowedUDPPorts = [ cfg.listening-port ];
-      allowedTCPPortRanges = range;
-      allowedTCPPorts = [ cfg.listening-port ];
-    };
-  };
 }
--- a/hosts/tsuki/services/matrix/default.nix
+++ b/hosts/tsuki/services/matrix/default.nix
@ -1,4 +1,5 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, secrets, ... }: {
+
  imports = [
    ./bridges/matrix-appservice-irc.nix

@ -8,12 +9,6 @@
    ./coturn.nix
  ];

-  sops.secrets."matrix_synapse/registration_secret" = {
-    owner = "matrix-synapse";
-    group = "matrix-synapse";
-    mode = "0440";
-  };
-
  services.matrix-synapse-next = {
    enable = true;
    enableNginx = true;
@ -30,11 +25,9 @@

    settings = {
      turn_uris = let
-        inherit (config.services.coturn) realm listening-port;
-      in [
-        "turn:${realm}:${toString listening-port}?transport=udp"
-        "turn:${realm}:${toString listening-port}?transport=tcp"
-      ];
+        inherit (config.services.coturn) realm;
+        p = toString secrets.ports.matrix.default;
+      in ["turn:${realm}:${p}?transport=udp" "turn:${realm}:${p}?transport=tcp"];
      turn_shared_secret = config.services.coturn.static-auth-secret;
      turn_user_lifetime = "1h";

@ -63,7 +56,7 @@
      # with the registration shared secret
      enable_registration = false;

-      registration_shared_secret_path = config.sops.secrets."matrix_synapse/registration_secret".path;
+      registration_shared_secret = secrets.keys.matrix.registration-shared-secret;
      allow_public_rooms_over_federation = true;

      # password_config.enabled = lib.mkForce false;
@ -74,10 +67,16 @@
          user = "matrix-synapse";
          database = "matrix-synapse";
          host = "/var/run/postgresql";
-          port = config.services.postgresql.settings.port;
+          port = secrets.ports.postgres;
        };
      };

+      # TODO: Figure out a way to do this declaratively.
+      #       The files need to be owned by matrix-synapse
+      app_service_config_files = [
+        "/var/lib/matrix-synapse/irc-registration.yml"
+      ];
+
      # redis.enabled = true;
      max_upload_size = "100M";
      dynamic_thumbnails = true;
@ -93,4 +92,19 @@
  };

  services.redis.servers."".enable = true;
+
+  networking.firewall = {
+    interfaces.enp2s0 = let
+      range = with config.services.coturn; [ {
+      from = secrets.ports.matrix.coturn.min;
+      to = secrets.ports.matrix.coturn.max;
+    } ];
+    in
+    {
+      allowedUDPPortRanges = range;
+      allowedUDPPorts = [ secrets.ports.matrix.default ];
+      allowedTCPPortRanges = range;
+      allowedTCPPorts = [ secrets.ports.matrix.default ];
+    };
+  };
 }
--- a/hosts/tsuki/services/minecraft/default.nix
+++ b/hosts/tsuki/services/minecraft/default.nix
@ -1,4 +1,4 @@
-{ pkgs, lib, config, inputs, ... }:
+{ pkgs, lib, config, inputs, secrets, ... }:
 let
  cfg = config.services.minecraft-servers;

@ -145,9 +145,8 @@ in
      in {
        "server-icon.png" = rawFile ./extraFiles/server-icon.png;

-        # TODO: pull this through a sops template to render the secret before readding it here.
-        # "plugins/dynmap/configuration.txt" = 
-        #   yamlConfig "dynmap" ./pluginConfigs/dynmap.nix { inherit secrets; };
+        "plugins/dynmap/configuration.txt" = 
+          yamlConfig "dynmap" ./pluginConfigs/dynmap.nix { inherit secrets; };

        "plugins/VeinMiner/config.yml" =
          yamlConfig "VeinMiner" ./pluginConfigs/veinMiner.nix { };
--- a/hosts/tsuki/services/nginx/default.nix
+++ b/hosts/tsuki/services/nginx/default.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ pkgs, lib, config, secrets, inputs, ... }:
 {
  sops.secrets."cloudflare/api-key" = {};

@ -36,31 +36,20 @@
    recommendedTlsSettings = true;
    recommendedZstdSettings = true;

-    appendConfig = ''
-      pcre_jit on;
-      worker_processes auto;
-      worker_rlimit_nofile 100000;
-    '';
-    eventsConfig = ''
-      worker_connections 2048;
-      use epoll;
-      multi_accept on;
-    '';
-
    upstreams = let
+      inherit (secrets) ips ports;
      srv = config.services;
      sa = config.local.socketActivation;
    in {
      "atuin".servers."unix:${sa.atuin.newSocketAddress}" = { };
-      "dynmap".servers."localhost:8123" = { };
+      "dynmap".servers."localhost:${s ports.minecraft.dynmap}" = { };
      "grafana".servers."unix:/run/grafana/grafana.sock" = { };
      "headscale".servers."localhost:${s srv.headscale.port}" = { };
      "hedgedoc".servers."unix:${srv.hedgedoc.settings.path}" = { };
-      "idrac".servers."10.0.0.201" = { };
-      "irc-matrix-bridge-media".servers."localhost:${s srv.matrix-appservice-irc.settings.ircService.mediaProxy.bindPort}" = { };
+      "idrac".servers."${ips.idrac}" = { };
      "kanidm".servers."localhost:8300" = { };
-      "osuchan".servers."localhost:${s srv.osuchan.port}" = { };
-      "plex".servers."localhost:32400" = { };
+      "osuchan".servers."localhost:${s ports.osuchan}" = { };
+      "plex".servers."localhost:${s ports.plex}" = { };
      "vaultwarden".servers."unix:${sa.vaultwarden.newSocketAddress}" = { };
      "wstunnel".servers = let
        inherit (config.services.wstunnel.servers."ws-tsuki".listen) host port;
@ -72,7 +61,7 @@
    virtualHosts = let
      inherit (lib.attrsets) nameValuePair listToAttrs recursiveUpdate;
      inherit (lib.lists) head drop;
-      domains = [ "nani.wtf" ];
+      inherit (secrets) domains keys;

      cloudflare-origin-pull-ca = builtins.fetchurl {
        url = "https://developers.cloudflare.com/ssl/static/authenticated_origin_pull_ca.pem";
@ -81,7 +70,7 @@

      # nonCFHost =
      #   subdomains: extraSettings: let
-      #     settings = {
+      #     settings = with keys.certificates; {
      #       useACMEHost = "nani.wtf";
      #       forceSSL = true;
      #       kTLS = true;
@ -95,7 +84,7 @@

      host =
        subdomains: extraSettings: let
-          settings = {
+          settings = with keys.certificates; {
            serverAliases = drop 1 (generateServerAliases domains subdomains);
            useACMEHost = "nani.wtf";
            forceSSL = true;
@ -144,12 +133,11 @@
      (host ["testmap"] {
        root = "/var/lib/mcmap";
        locations = {
-          "@empty".return = "204";
-
-          "~* ^/maps/[^/]*/tiles/".extraConfig = ''
-            error_page 404 = @empty;
+          "~* ^/maps/[^/]*/tiles/[^/]*.json$".extraConfig = ''
+            error_page 404 =200 /assets/emptyTile.json;
            gzip_static always;
          '';
+          "~* ^/maps/[^/]*/tiles/[^/]*.png$".tryFiles = "$uri =204";
        };
      })
      (host ["www"] {
@ -163,9 +151,7 @@
        enableACME = lib.mkForce false;
        locations."/_synapse".proxyPass = "http://$synapse_backend";
      })
-      (proxy ["irc-matrix"] "http://irc-matrix-bridge-media" {})
-      
-      # (host ["madmin"] { root = "${pkgs.synapse-admin}/"; })
+      (host ["madmin"] { root = "${pkgs.synapse-admin}/"; })
      # (host ["cache"] { root = "/var/lib/nix-cache"; })
      # (proxy ["slack-bot"] "http://localhost:9898" {})
      (proxy ["atuin"] "http://atuin" {})
--- a/hosts/tsuki/services/osuchan.nix
+++ b/hosts/tsuki/services/osuchan.nix
@ -1,26 +1,12 @@
 { config, ... }:
 {
-  sops = {
-    secrets = {
-      "osuchan/env/channel_access_token" = { };
-      "osuchan/env/channel_id" = { };
-      "osuchan/env/channel_secret" = { };
-    };
-    templates."osuchan.env" = {
-      restartUnits = [ "osuchan.service" ];
-      content = let
-        inherit (config.sops) placeholder;
-      in ''
-        CHANNEL_ACCESS_TOKEN=${placeholder."osuchan/env/channel_access_token"}
-        CHANNEL_ID=${placeholder."osuchan/env/channel_id"}
-        CHANNEL_SECRET=${placeholder."osuchan/env/channel_secret"}
-      '';
-    };
+  sops.secrets."osuchan/envfile" = {
+    restartUnits = [ "osuchan.service" ];
  };

  services.osuchan = {
    enable = true;
    port = 9283;
-    secretFile = config.sops.templates."osuchan.env".path;
+    secretFile = config.sops.secrets."osuchan/envfile".path;
  };
 }
--- a/hosts/tsuki/services/postgres.nix
+++ b/hosts/tsuki/services/postgres.nix
@ -48,7 +48,32 @@ in {
    requires = [ "postgresql.service" ];
  };

-  systemd.services.postgresql.serviceConfig.ReadWritePaths = [ cfg.dataDir ];
+  systemd.services.postgresql = {
+    serviceConfig = {
+      Restart = "always";
+      RestartSec = 3;
+      ReadWritePaths = [ cfg.dataDir ];
+      NoNewPrivileges = true;
+      PrivateDevices = true;
+      ProtectClock = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      # PrivateMounts = true;
+      RestrictSUIDSGID = true;
+      ProtectHostname = true;
+      LockPersonality = true;
+      ProtectKernelTunables = true;
+      ProtectSystem = "strict";
+      ProtectProc = "invisible";
+      ProtectHome = true;
+      # PrivateNetwork = true;
+      PrivateUsers = true;
+      PrivateTmp = true;
+      UMask = "0077";
+      # RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ];
+      SystemCallArchitectures = "native";
+    };
+  };

  environment.systemPackages = [ config.services.postgresql.package ];
 }
--- a/hosts/tsuki/services/samba.nix
+++ b/hosts/tsuki/services/samba.nix
@ -5,25 +5,26 @@
    enable = true;
    # openFirewall = true;

-    settings = {
-      global = {
-        "workgroup" = "TSUKI";
-        "server string" = "smbnix";
-        "netbios name" = "smbnix";
+    extraConfig = ''
+      workgroup = TSUKI
+      server string = smbnix
+      netbios name = smbnix

-        "security" = "user";
+      security = user

-        "use sendfile" = "yes";
-        "min protocol" = "SMB2";
-        "smb encrypt" = "desired";
+      use sendfile = yes
+      min protocol = SMB2
+      smb encrypt = desired

-        # note: localhost is the ipv6 localhost ::1
-        "hosts allow" = "100.107.69.8 100.100.65.88";
-        "hosts deny" = "0.0.0.0/0";
+      # note: localhost is the ipv6 localhost ::1
+      hosts allow = 100.107.69.8 100.100.65.88
+      hosts deny = 0.0.0.0/0

-        "guest ok" = "no";
-        "map to guest" = "never";
-      };
+      guest ok = no
+      map to guest = never
+    '';
+
+    shares = {
      cirno = {
        path = "/data/cirno";
        browseable = "yes";
@ -65,4 +66,15 @@

  networking.firewall.interfaces."tailscale0".allowedTCPPorts = [ 139 445 ];
  networking.firewall.interfaces."tailscale0".allowedUDPPorts = [ 137 138 ];
+
+
+  systemd.slices.system-samba = {
+    description = "Samba slice";
+    after = [ "system.slice" ];
+    requires = [ "system.slice" ];
+  };
+
+  systemd.services.samba-smbd.serviceConfig.Slice = "system-samba.slice";
+  systemd.services.samba-nmbd.serviceConfig.Slice = "system-samba.slice";
+  systemd.services.samba-winbindd.serviceConfig.Slice = "system-samba.slice";
 }
--- a/hosts/tsuki/services/vaultwarden.nix
+++ b/hosts/tsuki/services/vaultwarden.nix
@ -21,6 +21,39 @@ in {

  systemd.services.vaultwarden = lib.mkIf cfg.enable {
    requires = [ "postgresql.service" ];
+
+    serviceConfig = {
+      # Extra hardening
+      CapabilityBoundingSet = "";
+      LockPersonality = true;
+      NoNewPrivileges = true;
+      # MemoryDenyWriteExecute = true;
+      PrivateMounts = true;
+      PrivateUsers = true;
+      ProcSubset = "pid";
+      ProtectClock = true;
+      ProtectControlGroups = true;
+      ProtectHostname = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+        "AF_UNIX"
+      ];
+      RemoveIPC = true;
+      RestrictNamespaces = true;
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true;
+      SystemCallArchitectures = "native";
+      SystemCallFilter = [
+        "@system-service"
+        "~@privileged"
+      ];
+      UMask = "0007";
+    };
  };

  services.postgresql = lib.mkIf cfg.enable {
--- a/hosts/tsuki/services/wstunnel.nix
+++ b/hosts/tsuki/services/wstunnel.nix
@ -7,16 +7,11 @@
    "services/networking/wstunnel.nix"
  ];

-  sops = {
-    secrets."wstunnel/http-upgrade-path-prefix" = {
-      sopsFile = ../../../secrets/common.yaml;
-    };
-    templates."wstunnel-environment.env".content = let
-      inherit (config.sops) placeholder;
-    in ''
-      WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"}
-      WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"}
-    '';
+  # NOTE: Contains
+  # - WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX
+  # - WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX
+  sops.secrets."wstunnel/http-upgrade-path-prefix-envvars" = {
+    sopsFile = ../../../secrets/common.yaml;
  };

  services.wstunnel = {
@ -27,7 +22,7 @@
        port = 8789;
      };
      enableHTTPS = false;
-      environmentFile = config.sops.templates."wstunnel-environment.env".path;
+      environmentFile = config.sops.secrets."wstunnel/http-upgrade-path-prefix-envvars".path;
    };
  };
 }
--- a/hosts/xps16/configuration.nix
+++ b/hosts/xps16/configuration.nix
@ -1,97 +0,0 @@
-{ config, lib, pkgs, inputs, specialArgs, ... }:
-{
-  imports = [
-    ./hardware-configuration.nix
-
-    ./services/btrfs.nix
-    ./services/docker.nix
-    ./services/fprintd.nix
-    ./services/keybase.nix
-    ./services/libvirtd.nix
-    ./services/logiops.nix
-    ./services/tailscale.nix
-    ./services/thermald.nix
-    ./services/tlp.nix
-
-    ./testconfig.nix
-  ];
-
-  sops.age.keyFile = "/var/lib/sops/age-key.txt";
-
-  system.stateVersion = "24.11";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.binfmt.emulatedSystems = [
-    "x86_64-windows"
-    "aarch64-linux"
-    "armv7l-linux"
-    "i686-linux"
-  ];
-
-  nix.settings.system-features = [
-    "kvm"
-    "benchmark"
-    "big-parallel"
-    "nixos-test"
-  ];
-
-  i18n.extraLocaleSettings = {
-    LC_ALL = "en_US.UTF-8";
-  };
-
-  console = {
-    earlySetup = true;
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
-    packages = with pkgs; [ terminus_font ];
-  };
-
-  boot.loader.systemd-boot.consoleMode = "1";
-
-  machineVars = {
-    headless = false;
-    gaming = true;
-    development = true;
-    creative = true;
-    wayland = true;
-  };
-
-  networking = {
-    hostName = "xps16";
-    networkmanager.enable = true;
-    firewall.enable = true;
-    # hostId = "f0660cef";
-  };
-
-  services = {
-    xserver.upscaleDefaultCursor = true;
-    xserver.dpi = 192;
-    displayManager.sddm = {
-      enableHidpi = true;
-      settings = {
-        X11.ServerArguments = "-nolisten tcp -dpi 192";
-      };
-    };
-    libinput.touchpad.accelSpeed = "0.5";
-    blueman.enable = true;
-  };
-
-  # ipu6 does not compile on latest yet
-  boot.kernelPackages = pkgs.linuxPackages_6_11;
-
-  hardware = {
-    bluetooth.enable = true;
-    enableRedistributableFirmware = true;
-    keyboard.zsa.enable = true;
-    sane.enable = true;
-    graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-    ipu6 = {
-      enable = true;
-      platform = "ipu6epmtl";
-    };
-  };
-}
--- a/hosts/xps16/hardware-configuration.nix
+++ b/hosts/xps16/hardware-configuration.nix
@ -1,119 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=root" "compress=zstd" "noatime" ];
-    };
-
-  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/88bbd92a-88b5-4175-9d6f-c14033607b70";
-  
-  fileSystems."/boot" =
-  { device = "/dev/disk/by-uuid/34BA-6EA6";
-    fsType = "vfat";
-  };
-
-  fileSystems."/home/h7x4" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/.snapshots" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/snapshots" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/git" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/git/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/ctf" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/ctf/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/downloads" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/downloads/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/pictures" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/pictures/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/music" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/music/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/home/h7x4/music/.snapshots" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=home/h7x4/music/snapshots" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=var/log/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/var/log/.snapshots" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=var/log/snapshots" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/var/lib" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=var/lib/active" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/var/lib/.snapshots" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=var/lib/snapshots" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/var/lib/docker" =
-    { device = "/dev/disk/by-uuid/178502e0-0481-47ed-842c-2d6b1cf81ac5";
-      fsType = "btrfs";
-      options = [ "subvol=var/lib/docker" "compress=zstd" "noatime" ];
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s13f0u1u4.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp2s0f0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/xps16/home/default.nix
+++ b/hosts/xps16/home/default.nix
@ -1,6 +0,0 @@
-{ config, ... }:
-{
-  home.stateVersion = "24.11";
-
-  programs.waybar.settings.mainBar.output = [ "eDP-1" ];
-}
--- a/hosts/xps16/services/btrfs.nix
+++ b/hosts/xps16/services/btrfs.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.btrfs.autoScrub.enable = true;
-}
--- a/hosts/xps16/services/docker.nix
+++ b/hosts/xps16/services/docker.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  virtualisation.docker.enable = true;
-}
--- a/hosts/xps16/services/fprintd.nix
+++ b/hosts/xps16/services/fprintd.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.fprintd.enable = true;
-}
--- a/Show More
+++ b/Show More