Home/Nixinator: Add gnome-boxes

README.md

@@ -1,16 +1,9 @@
 # NixOS Configuration
 
-Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop.
+Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop.
 
 ![](FastFetch.png)
-
-<p float="left" align="middle">
-  <img src="/NeoVim.png" width="33%" />
-  <img src="/Rmpc.png" width="33%" />
-  <img src="/Btop.png" width="33%" />
-</p>
-
-![](Niri.png)
+![](Darwin.png)
 
 To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
 Alternatively, use `nh os switch` or `nh os boot`.

config/navi/christoph.cheat

@@ -238,11 +238,11 @@ $ mode: echo -e "--export            \tExport public key\n--export-secret-keys\t
 
 % sops
 # Edit secrets.yaml
-sops ~/NixFlake/system/modules/sops-nix/secrets.yaml
+sops ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
 
 % sops
 # Rekey secrets.yaml
-sops updatekeys ~/NixFlake/system/modules/sops-nix/secrets.yaml
+sops updatekeys ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
 
 % ssh
 # Generate a new SSH key

flake.lock

@@ -287,11 +287,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1772972630,
-        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
+        "lastModified": 1774465523,
+        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
+        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773332277,
-        "narHash": "sha256-1V+wRrZD9Sw12AQBUWk9CR+XhDZQ8q6yBE0S3Wjbd1M=",
+        "lastModified": 1774534244,
+        "narHash": "sha256-WnmXKsbkwokDdrdI1XwRWH4RYYalOVKgV/hYQmL3/TE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4aeef1941f862fe3a70d1b8264b4e289358c2325",
+        "rev": "86014e836ca6f4a04d59b85111d39660bdda01cd",
         "type": "github"
       },
       "original": {
@@ -346,11 +346,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1773947929,
-        "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
+        "lastModified": 1774383212,
+        "narHash": "sha256-PyF1nTQp+q5oUYk05yjZMOFvd/rT43mMN1zXyycivBw=",
         "owner": "JPyke3",
         "repo": "hytale-launcher-nix",
-        "rev": "a8d0a974b187f0997c03c23000dea552194edf39",
+        "rev": "f9392e30a2e74e502116eec6c7d42da7be87de0f",
         "type": "github"
       },
       "original": {
@@ -456,11 +456,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1773329386,
-        "narHash": "sha256-Xoy4j0NKRrZEAkiFxtTKTsmtUumpvjh3ievyat00eA8=",
+        "lastModified": 1774489385,
+        "narHash": "sha256-xGyog2cPoxTo8O6vW0CiCCUhkt866qpI3PN2su9XjV0=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "815e692569fbb01701770a49ad2fe942cec7f431",
+        "rev": "11fe033ac3d0a97c1e62ffb33f9a6a1852fedab1",
         "type": "github"
       },
       "original": {
@@ -522,6 +522,27 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773000227,
+        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-darwin",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -577,11 +598,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1773222311,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "lastModified": 1774244481,
+        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
         "type": "github"
       },
       "original": {
@@ -593,16 +614,16 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1767313136,
-        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
+        "lastModified": 1774244481,
+        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
+        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -625,11 +646,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1773821835,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "lastModified": 1774106199,
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -673,11 +694,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1773122722,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -728,11 +749,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1772402258,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "lastModified": 1774309640,
+        "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554",
         "type": "github"
       },
       "original": {
@@ -772,11 +793,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773339783,
-        "narHash": "sha256-07iRHomuUvJ7Mmp+F7qo68xIb+y3gy0o/B7kuR1K2Qc=",
+        "lastModified": 1774534046,
+        "narHash": "sha256-7BrSW+vVmBFUJfpLhyyfymm70NWjjtax1bjgIWLEg2E=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1a4ca0d650fbfd4c58e1b1c2b153151fec77d6b2",
+        "rev": "ef199666902a675bca657f63e32c96649aade49d",
         "type": "github"
       },
       "original": {
@@ -824,6 +845,7 @@
         "masssprings": "masssprings",
         "niri": "niri",
         "nix-alien": "nix-alien",
+        "nix-darwin": "nix-darwin",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable_2",
@@ -880,11 +902,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773096132,
-        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "lastModified": 1774303811,
+        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
         "type": "github"
       },
       "original": {
@@ -976,11 +998,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773044834,
-        "narHash": "sha256-R2u3z09DuUbSoWClASPUqKXQG/QZYlBsiy8vYXrJ2VU=",
+        "lastModified": 1774424849,
+        "narHash": "sha256-kDRdpgTmxuwyqTyTcXYtgycBvU28tTXm9Es9g/sDpxI=",
         "owner": "adriankarlen",
         "repo": "textfox",
-        "rev": "0b8873d30db55a94e9e0dd934405dcac5e4d8a73",
+        "rev": "98ad395b4fb451b30dbca77be76975d04d97f281",
         "type": "github"
       },
       "original": {
@@ -1031,11 +1053,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1772429643,
-        "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
+        "lastModified": 1773622265,
+        "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
+        "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,8 +12,12 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
+    # Darwin
+    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
+    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
     # NOTE: Update this after May and November
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
 
     # Home Manager
     home-manager.url = "github:nix-community/home-manager";
@@ -58,51 +62,6 @@
     walker.url = "github:abenz1267/walker";
     walker.inputs.elephant.follows = "elephant";
 
-    # Quickshell
-    # quickshell.url = "github:quickshell-mirror/quickshell";
-    # quickshell.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Noctalia shell
-    # noctalia.url = "github:noctalia-dev/noctalia-shell";
-    # noctalia.inputs.nixpkgs.follows = "nixpkgs";
-    # noctalia.inputs.quickshell.follows = "quickshell";
-
-    # Lol
-    # waifu-cursors.url = "github:kagurazakei/waifu-cursors";
-
-    # Caelestia shell
-    # caelestia.url = "github:caelestia-dots/shell";
-    # caelestia.inputs.nixpkgs.follows = "nixpkgs";
-    # caelestia.inputs.quickshell.follows = "quickshell";
-    # caelestia-cli.url = "github:caelestia-dots/cli";
-    # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
-
-    # DankMaterialShell
-    # dgop.url = "github:AvengeMedia/dgop";
-    # dgop.inputs.nixpkgs.follows = "nixpkgs";
-    # dms-cli.url = "github:AvengeMedia/danklinux";
-    # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
-    # dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
-    # dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
-    # dank-material-shell.inputs.dgop.follows = "dgop";
-    # danksearch.url = "github:AvengeMedia/danksearch";
-    # danksearch.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Hyprland (use flake so plugins are not built from source)
-    # hyprland.url = "github:hyprwm/Hyprland";
-    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
-
-    # HyprPlugins
-    # hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
-    # hyprland-plugins.inputs.nixpkgs.follows = "nixpkgs";
-    # hyprland-plugins.inputs.hyprland.follows = "hyprland";
-    # hypr-dynamic-cursors.url = "github:VirtCode/hypr-dynamic-cursors";
-    # hypr-dynamic-cursors.inputs.nixpkgs.follows = "nixpkgs";
-    # hypr-dynamic-cursors.inputs.hyprland.follows = "hyprland";
-    # hyprspace.url = "github:KZDKM/Hyprspace";
-    # hyprspace.inputs.nixpkgs.follows = "nixpkgs";
-    # hyprspace.inputs.hyprland.follows = "hyprland";
-
     # NeoVim <3
     nixvim.url = "github:nix-community/nixvim";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
@@ -123,10 +82,6 @@
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
 
-    # ComfyUI
-    # nixified-ai.url = "github:nixified-ai/flake";
-    # comfyui-nix.url = "github:utensils/comfyui-nix";
-
     # HyTale
     hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
 
@@ -140,12 +95,14 @@
   outputs = {
     self,
     nixpkgs,
+    nix-darwin,
     ...
   } @ inputs: let
     # Our configuration is buildable on the following system/platform.
     # Configs can support more than a single system simultaneously,
     # e.g. NixOS (linux) and MacOS (darwin) or Arm.
     system = "x86_64-linux";
+    darwinSystem = "aarch64-darwin";
 
     # We configure our global packages here.
     # Usually, "nixpkgs.legacyPackages.${system}" is used (and more efficient),
@@ -188,6 +145,26 @@
       ];
     };
 
+    darwinPkgs = import nixpkgs {
+      system = darwinSystem;
+
+      hostPlatform = darwinSystem;
+      config.allowUnfree = true;
+      config.allowUnfreePredicate = pkg: true;
+
+      overlays = let
+        pkgs-stable = import inputs.nixpkgs-stable {
+          system = darwinSystem;
+
+          config.allowUnfree = true;
+          config.allowUnfreePredicate = pkg: true;
+        };
+      in [
+        # All my own overlays (derivations + modifications)
+        (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
+      ];
+    };
+
     # My own library functions are imported here.
     # They are made available to the system and HM configs by inheriting mylib.
     mylib = import ./lib {
@@ -202,8 +179,15 @@
       inherit (nixpkgs) lib;
     };
 
-    # NOTE: Keep public keys here so they're easy to rotate
+    darwinMylib = import ./lib {
+      inherit inputs darwinPkgs;
 
+      inherit (nixpkgs) lib;
+
+      pkgs = darwinPkgs;
+    };
+
+    # NOTE: Keep public keys here so they're easy to rotate
     publicKeys.christoph = {
       # /home/christoph/.ssh/id_ed25519.pub
       ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAoJac+GdGtzblCMA0lBfMdSR6aQ4YyovrNglCFGIny christoph.urlacher@protonmail.com";
@@ -227,6 +211,22 @@
     # Local shell for NixFlake directory
     devShells.${system}.default = import ./shell.nix {inherit pkgs;};
 
+    # Usage: sudo darwin-rebuild switch --flake .#darwinix
+    darwinConfigurations = {
+      darwinix = darwinMylib.nixos.mkDarwinConfigWithHomeManagerModule {
+        inherit publicKeys;
+
+        system = darwinSystem;
+        mylib = darwinMylib;
+        hostname = "darwinix";
+        username = "christoph";
+        headless = false;
+        extraModules = [
+          inputs.sops-nix.darwinModules.sops
+        ];
+      };
+    };
+
     # We give each configuration a (host)name to choose a configuration when rebuilding.
     # This makes it easy to add different configurations (e.g. for a laptop).
     # Usage: sudo nixos-rebuild switch --flake .#nixinator

home/christoph/darwinix/default.nix

@@ -0,0 +1,54 @@
+{
+  pkgs,
+  nixosConfig,
+  config,
+  lib,
+  mylib,
+  username,
+  inputs,
+  ...
+}: {
+  config = {
+    paths = rec {
+      nixflake = "${config.home.homeDirectory}/NixFlake";
+      dotfiles = "${nixflake}/config";
+    };
+
+    homemodules = {
+      color = {
+        scheme = "catppuccin-mocha";
+        accent = "mauve";
+        accentHl = "pink";
+        accentDim = "lavender";
+        accentText = "base";
+
+        font = "MonoLisa Alt Script";
+      };
+
+      packages.enable = true;
+      terminal.enable = true;
+    };
+
+    home = {
+      inherit username;
+
+      homeDirectory = "/Users/${config.home.username}";
+      enableNixpkgsReleaseCheck = true;
+
+      sessionVariables = {
+        LANG = "en_US.UTF-8";
+        EDITOR = "nvim";
+        MANPAGER = "nvim +Man!";
+        TERMINAL = "kitty";
+      };
+
+      # packages = with pkgs; []; # Configured in homemodules/packages
+
+      stateVersion = "25.11";
+    };
+
+    programs = {};
+
+    services = {};
+  };
+}

home/christoph/default.nix

@@ -34,8 +34,7 @@ in
 
     homemodules = {
       beets.enable = !headless;
-
-      btop.enable = true;
+      cava.enable = !headless;
 
       chromium = {
         enable = !headless;
@@ -78,37 +77,15 @@ in
         disableTabBar = true;
       };
 
-      fish.enable = true;
-
-      git = {
-        enable = true;
-
-        userName = "Christoph Urlacher";
-        userEmail = "christoph.urlacher@protonmail.com";
-        signCommits = true;
-      };
-
-      kitty.enable = !headless;
-      lazygit.enable = true;
       mpd.enable = !headless;
-
-      neovim = {
-        enable = true;
-        alias = true;
-        neovide = !headless;
-      };
-
       niri.enable = nixosConfig.programs.niri.enable;
       nnn.enable = false; # Use yazi
+      packages.enable = true;
       qutebrowser.enable = !headless;
       rmpc.enable = !headless;
-
-      rofi = {
-        enable = !headless;
-      };
-
-      waybar.enable = false;
-      yazi.enable = true;
+      rofi.enable = false;
+      terminal.enable = true;
+      waybar.enable = !headless;
       zathura.enable = !headless;
     };
 
@@ -270,375 +247,13 @@ in
       };
 
       # Add stuff for your user as you see fit:
-      # TODO: Make the headless installations smaller. Don't install stuff here if !headless but in nixinator config.
-      packages = with pkgs;
-        lib.mkMerge [
-          [
-            # Shell utils
-            (ripgrep.override {withPCRE2 = true;}) # fast as fuck
-            gdu # Alternative to du-dust (I like it better)
-            duf # Disk usage analyzer (for all disk overview)
-            sd # Sed alternative
-            fclones # Duplicate file finder
-            tealdeer # Very fast tldr (so readable man)
-            killall
-            atool # Archive preview
-            exiftool
-            ouch # Unified compression/decompression
-            ffmpegthumbnailer # Video thumbnails
-            mediainfo # Media meta information
-            file # File meta information
-            unrar # Cooler WinRar
-            p7zip # Zip stuff
-            unzip # Unzip stuff
-            progress # Find coreutils processes and show their progress
-            tokei # Text file statistics in a project
-            playerctl # Media player control
-            pastel # Color tools
-            nvd # Nix rebuild diff
-            nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options
-            nix-tree # Browse the nix store sorted by size (gdu for closures)
-            nurl # Generate nix fetcher sections based on URLs
-            python313 # Nicer scripting than bash
-            binsider # Analyze binaries
-            lazyjournal # Journalctl viewer
-            systemctl-tui
-            restic # Backups
-            gnumake
-            just # make alternative
-            binsider # .elf analyzer
-            jujutsu # git-like vcs
-            lurk # strace analysis
-            radare2
-
-            # Hardware/Software info
-            pciutils # lspci
-            mesa-demos # OpenGL info
-            wayland-utils # wayland-info
-            clinfo # OpenCL info
-            vulkan-tools # vulkaninfo
-            libva-utils # vainfo
-            vdpauinfo # Video-Decode and Presentation API for Unix info
-            hwloc # Generate CPU topology diagram
-            lm_sensors # Readout hardware sensors
-            acpica-tools # Dump ACPI tables etc.
-            smartmontools # Disk health
-            nvme-cli # NVME disk health
-
-            # Video/Image/Audio utils
-            ffmpeg-full # I love ffmpeg (including ffplay)
-            ffmpeg-normalize # Normalize audio
-            imagemagick # Convert image (magic)
-            mp3val # Validate mp3 files
-            flac # Validate flac files
-            # spotdl
-
-            # Document utils
-            poppler-utils # pdfunite
-            graphviz # generate graphs from code
-            d2 # generate diagrams from code
-            plantuml # generate diagrams
-            gnuplot # generate function plots
-            pdf2svg # extract vector graphics from pdf
-            pandoc # document converting madness
-
-            # Networking
-            dig # Make DNS requests
-            tcpdump # Listen in on TCP traffic
-            traceroute # "Follow" a packet
-            gping # ping with graph
-            curlie # curl a'la httpie
-            wget # download that shit
-            doggo # dns client
-            rsync # cp on steroids
-            rclone # Rsync for cloud
-            httpie # Cool http client
-            cifs-utils # Mount samba shares
-            nfs-utils # Mount NFS shares
-            sshfs # Mount remote directories via SSH
-
-            # Run unpatched binaries on NixOS
-            # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
-            # Usage: "nix-alien-ld -- <Executable>".
-            inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
-
-            # Search nixpkgs
-            inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
-
-            # Use NixCommunity binary cache
-            cachix
-          ]
-          (lib.mkIf (!headless) [
-            ripdrag # drag & drop from terminal
-            veracrypt
-            wl-clipboard
-
-            # Proton
-            protonvpn-gui
-            protonmail-bridge-gui
-
-            # GUI stuff
-            nautilus # Just in case
-            signal-desktop
-            anki
-            font-manager # Previews fonts, but doesn't set them
-            nextcloud-client
-            keepassxc
-            thunderbird # TODO: Email module
-            obsidian
-            zotero
-            zeal # docs browser
-            # helvum # unmaintained
-            crosspipe
-            vlc
-            audacity
-            ferdium
-            gparted
-            # feishin # electron :(
-            jellyfin-tui
-            czkawka-full # file deduplicator
-
-            # Office
-            kdePackages.wacomtablet # For xournalpp/krita
-            xournalpp # Write with a pen, like old people
-            hunspell # I cna't type
-            hunspellDicts.en_US
-            hunspellDicts.de_DE
-
-            inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
-          ])
-        ];
+      # packages = with pkgs; []; # Configured in homemodules/packages
     };
 
     # home.file.".options-doc".source = "${pkgs.modules-options-doc}";
 
     # Packages with extra options managed by HomeManager natively
     programs = {
-      # The home-manager management tool.
-      # Will only be enabled if HM is installed standalone.
-      home-manager.enable = true;
-
-      bat = {
-        enable = true;
-
-        themes = {
-          catppuccin-latte = {
-            src = pkgs.fetchFromGitHub {
-              owner = "catppuccin";
-              repo = "bat";
-              rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-              sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-            };
-            file = "Catppuccin-latte.tmTheme";
-          };
-        };
-
-        config = {
-          theme = "catppuccin-latte";
-        };
-      };
-
-      cava = {
-        enable = !headless;
-
-        settings = {
-          general = {
-            framerate = 60; # default 60
-            autosens = 1; # default 1
-            sensitivity = 100; # default 100
-            lower_cutoff_freq = 50; # not passed to cava if not provided
-            higher_cutoff_freq = 10000; # not passed to cava if not provided
-          };
-
-          smoothing = {
-            noise_reduction = 77; # default 77
-            monstercat = false; # default false
-            waves = false; # default false
-          };
-
-          color = {
-            # https://github.com/catppuccin/cava/blob/main/themes/latte-transparent.cava
-            gradient = 1;
-
-            gradient_color_1 = "'${color.hexS.teal}'";
-            gradient_color_2 = "'${color.hexS.sky}'";
-            gradient_color_3 = "'${color.hexS.sapphire}'";
-            gradient_color_4 = "'${color.hexS.blue}'";
-            gradient_color_5 = "'${color.hexS.mauve}'";
-            gradient_color_6 = "'${color.hexS.pink}'";
-            gradient_color_7 = "'${color.hexS.maroon}'";
-            gradient_color_8 = "'${color.hexS.red}'";
-          };
-        };
-      };
-
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
-      eza = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      # TODO: Module
-      fastfetch = {
-        enable = true;
-
-        settings = {
-          logo = {
-            padding = {
-              top = 3;
-              left = 1;
-              right = 2;
-            };
-          };
-
-          display = {
-            separator = "";
-            key.width = 17;
-          };
-
-          # Box Drawing: ╭ ─ ╮ ╰ ╯ │
-          modules = [
-            # Title
-            {
-              type = "title";
-              format = "{#1}╭─── {#}{user-name-colored}";
-            }
-
-            # System Information
-            {
-              type = "custom";
-              format = "{#1}│ {#}System Information";
-            }
-            {
-              type = "os";
-              key = "{#separator}│  {#keys}󰍹 OS";
-            }
-            {
-              type = "kernel";
-              key = "{#separator}│  {#keys}󰒋 Kernel";
-            }
-            {
-              type = "bootmgr";
-              key = "{#separator}│  {#keys}󰒋 BootMGR";
-            }
-            {
-              type = "uptime";
-              key = "{#separator}│  {#keys}󰅐 Uptime";
-            }
-            {
-              type = "packages";
-              key = "{#separator}│  {#keys}󰏖 Packages";
-              # format = "{all}";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Desktop Environment
-            {
-              type = "custom";
-              format = "{#1}│ {#}Desktop Environment";
-            }
-            {
-              type = "de";
-              key = "{#separator}│  {#keys}󰧨 DE";
-            }
-            {
-              type = "wm";
-              key = "{#separator}│  {#keys}󱂬 WM";
-            }
-            {
-              type = "wmtheme";
-              key = "{#separator}│  {#keys}󰉼 Theme";
-            }
-            {
-              type = "display";
-              key = "{#separator}│  {#keys}󰹑 Resolution";
-            }
-            {
-              type = "shell";
-              key = "{#separator}│  {#keys}󰞷 Shell";
-            }
-            {
-              type = "terminalfont";
-              key = "{#separator}│  {#keys}󰛖 Font";
-            }
-            {
-              type = "icons";
-              key = "{#separator}│  {#keys} Icons";
-            }
-            {
-              type = "cursor";
-              key = "{#separator}│  {#keys}󰆽 Cursor";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Hardware Information
-            {
-              type = "custom";
-              format = "{#1}│ {#}Hardware Information";
-            }
-            {
-              type = "board";
-              key = "{#separator}│  {#keys} Board";
-            }
-            {
-              type = "cpu";
-              key = "{#separator}│  {#keys}󰻠 CPU";
-            }
-            {
-              type = "gpu";
-              key = "{#separator}│  {#keys}󰢮 GPU";
-            }
-            {
-              type = "memory";
-              key = "{#separator}│  {#keys}󰍛 Memory";
-            }
-            # {
-            #   type = "disk";
-            #   key = "{#separator}│  {#keys}󰋊 Disk (/)";
-            #   folders = "/";
-            # }
-            # {
-            #   type = "disk";
-            #   key = "{#separator}│  {#keys}󰋊 Disk (~/Games)";
-            #   folders = "/home/christoph/Games";
-            # }
-            {
-              type = "btrfs";
-              key = "{#separator}│  {#keys}󰋊 BTRFS";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Colors Footer
-            {
-              type = "colors";
-              key = "{#separator}╰─── {#1}";
-              keyWidth = 6;
-              symbol = "circle";
-            }
-          ];
-        };
-      };
-
-      fd.enable = true;
-
-      fzf = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
       imv = {
         enable = !headless;
         settings = {
@@ -666,11 +281,6 @@ in
         };
       };
 
-      navi = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
       nix-index = {
         enable = true;
         enableFishIntegration = config.homemodules.fish.enable;
@@ -700,92 +310,6 @@ in
       #     pointer
       #   ];
       # };
-
-      ssh = {
-        enable = true;
-        enableDefaultConfig = false;
-
-        matchBlocks = {
-          "*" = {
-            forwardAgent = false;
-            addKeysToAgent = "no";
-            compression = true;
-            serverAliveInterval = 0;
-            serverAliveCountMax = 3;
-            hashKnownHosts = false;
-            userKnownHostsFile = "~/.ssh/known_hosts";
-            controlMaster = "no";
-            controlPath = "~/.ssh/master-%r@%n:%p";
-            controlPersist = "no";
-          };
-          "nixinator" = {
-            user = "christoph";
-            hostname = "192.168.86.50";
-          };
-          "servenix" = {
-            user = "christoph";
-            hostname = "local.chriphost.de";
-          };
-          "thinknix" = {
-            user = "christoph";
-            hostname = "think.chriphost.de";
-          };
-          "vps" = {
-            user = "root";
-            hostname = "vps.chriphost.de";
-          };
-          "mars" = {
-            user = "smchurla";
-            hostname = "mars.cs.tu-dortmund.de";
-            serverAliveInterval = 60;
-            localForwards = [
-              {
-                # Resultbrowser
-                bind.port = 22941;
-                host.address = "127.0.0.1";
-                host.port = 22941;
-              }
-              {
-                # Mysql
-                bind.port = 3306;
-                host.address = "127.0.0.1";
-                host.port = 3306;
-              }
-            ];
-          };
-        };
-      };
-
-      tmux = {
-        enable = false;
-
-        clock24 = true;
-        escapeTime = 0; # Delay after pressing escape
-        # keyMode = "vi";
-        terminal = "xterm-256color";
-
-        plugins = with pkgs; [
-          {
-            plugin = tmuxPlugins.catppuccin;
-            extraConfig = ''
-              set -g @plugin 'catppuccin/tmux'
-              set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
-            '';
-          }
-        ];
-
-        extraConfig = ''
-          set -g default-terminal "xterm-256color"
-          set-option -ga terminal-overrides ",xterm-256color:Tc"
-        '';
-      };
-
-      yt-dlp.enable = true;
-
-      zoxide = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
     };
 
     services = {

home/christoph/nixinator/default.nix

@@ -17,7 +17,7 @@
       # because it forces en-US keyboard layout.
       fcitx.enable = true;
 
-      waybar.monitor = "DP-1";
+      waybar.monitors = ["DP-1" "DP-2"];
     };
 
     home = let
@@ -101,11 +101,16 @@
         jellyfin-mpv-shim
         # tidal-hifi
         # tidal-dl-ng # TODO: Borked
+        # spotdl
         tiddl
         picard
         handbrake
         teamspeak6-client
 
+        # virt-manager # use system program option
+        virt-viewer
+        gnome-boxes # doesn't list VMs imported using virsh
+
         steam-devices-udev-rules
       ];
 

home/homemodules/bat/default.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) bat color;
+in {
+  options.homemodules.bat = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf bat.enable {
+    programs.bat = {
+      enable = true;
+
+      themes = {
+        catppuccin-latte = {
+          src = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+            sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+          };
+          file = "Catppuccin-latte.tmTheme";
+        };
+      };
+
+      config = {
+        theme = "catppuccin-latte";
+      };
+    };
+  };
+}

home/homemodules/bat/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable bat";
+}

home/homemodules/cava/default.nix

@@ -0,0 +1,48 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) cava color;
+in {
+  options.homemodules.cava = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf cava.enable {
+    programs.cava = {
+      enable = true;
+
+      settings = {
+        general = {
+          framerate = 60; # default 60
+          autosens = 1; # default 1
+          sensitivity = 100; # default 100
+          lower_cutoff_freq = 50; # not passed to cava if not provided
+          higher_cutoff_freq = 10000; # not passed to cava if not provided
+        };
+
+        smoothing = {
+          noise_reduction = 77; # default 77
+          monstercat = false; # default false
+          waves = false; # default false
+        };
+
+        color = {
+          # https://github.com/catppuccin/cava/blob/main/themes/latte-transparent.cava
+          gradient = 1;
+
+          gradient_color_1 = "'${color.hexS.teal}'";
+          gradient_color_2 = "'${color.hexS.sky}'";
+          gradient_color_3 = "'${color.hexS.sapphire}'";
+          gradient_color_4 = "'${color.hexS.blue}'";
+          gradient_color_5 = "'${color.hexS.mauve}'";
+          gradient_color_6 = "'${color.hexS.pink}'";
+          gradient_color_7 = "'${color.hexS.maroon}'";
+          gradient_color_8 = "'${color.hexS.red}'";
+        };
+      };
+    };
+  };
+}

home/homemodules/cava/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable cava";
+}

home/homemodules/darwin.nix

@@ -0,0 +1,25 @@
+{inputs, ...}: {
+  imports = [
+    # My own HM modules
+    ./bat
+    ./btop
+    ./color
+    ./fastfetch
+    ./fish
+    ./git
+    ./jellyfin-tui
+    ./kitty
+    ./lazygit
+    ./neovim
+    ./packages
+    ./paths
+    ./ssh
+    ./terminal
+    ./tmux
+    ./yazi
+
+    # HM modules imported from the flake inputs
+    inputs.nixvim.homeModules.nixvim
+    inputs.textfox.homeManagerModules.default
+  ];
+}

home/homemodules/default.nix

@@ -3,26 +3,34 @@
     # Obsolete modules are kept in "1_deprecated" for reference.
 
     # My own HM modules
+    ./bat
     ./beets
     ./btop
+    ./cava
     ./chromium
     ./color
     ./docs
+    ./fastfetch
     ./fcitx
     ./firefox
     ./fish
     ./git
+    ./jellyfin-tui
     ./kitty
     ./lazygit
     ./mpd
     ./neovim
     ./niri
     ./nnn
+    ./packages
     ./paths
     ./qutebrowser
     ./rmpc
     ./rofi
     ./waybar
+    ./ssh
+    ./terminal
+    ./tmux
     ./yazi
     ./zathura
 

home/homemodules/fastfetch/default.nix

@@ -0,0 +1,163 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) fastfetch color;
+in {
+  options.homemodules.fastfetch = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf fastfetch.enable {
+    programs.fastfetch = {
+      enable = true;
+
+      settings = {
+        logo = {
+          padding = {
+            top = 4;
+            left = 1;
+            right = 2;
+          };
+        };
+
+        display = {
+          separator = "";
+          key.width = 17;
+        };
+
+        # Box Drawing: ╭ ─ ╮ ╰ ╯ │
+        modules = [
+          # Title
+          {
+            type = "title";
+            format = "{#1}╭─── {#}{user-name-colored}";
+          }
+
+          # System Information
+          {
+            type = "custom";
+            format = "{#1}│ {#}System Information";
+          }
+          {
+            type = "os";
+            key = "{#separator}│  {#keys}󰍹 OS";
+          }
+          {
+            type = "kernel";
+            key = "{#separator}│  {#keys}󰒋 Kernel";
+          }
+          {
+            type = "bootmgr";
+            key = "{#separator}│  {#keys}󰒋 BootMGR";
+          }
+          {
+            type = "uptime";
+            key = "{#separator}│  {#keys}󰅐 Uptime";
+          }
+          {
+            type = "packages";
+            key = "{#separator}│  {#keys}󰏖 Packages";
+            # format = "{all}";
+          }
+          {
+            type = "custom";
+            format = "{#1}│";
+          }
+
+          # Desktop Environment
+          {
+            type = "custom";
+            format = "{#1}│ {#}Desktop Environment";
+          }
+          {
+            type = "de";
+            key = "{#separator}│  {#keys}󰧨 DE";
+          }
+          {
+            type = "wm";
+            key = "{#separator}│  {#keys}󱂬 WM";
+          }
+          {
+            type = "wmtheme";
+            key = "{#separator}│  {#keys}󰉼 Theme";
+          }
+          {
+            type = "display";
+            key = "{#separator}│  {#keys}󰹑 Resolution";
+          }
+          {
+            type = "shell";
+            key = "{#separator}│  {#keys}󰞷 Shell";
+          }
+          {
+            type = "terminalfont";
+            key = "{#separator}│  {#keys}󰛖 Font";
+          }
+          {
+            type = "icons";
+            key = "{#separator}│  {#keys} Icons";
+          }
+          {
+            type = "cursor";
+            key = "{#separator}│  {#keys}󰆽 Cursor";
+          }
+          {
+            type = "custom";
+            format = "{#1}│";
+          }
+
+          # Hardware Information
+          {
+            type = "custom";
+            format = "{#1}│ {#}Hardware Information";
+          }
+          {
+            type = "board";
+            key = "{#separator}│  {#keys} Board";
+          }
+          {
+            type = "cpu";
+            key = "{#separator}│  {#keys}󰻠 CPU";
+          }
+          {
+            type = "gpu";
+            key = "{#separator}│  {#keys}󰢮 GPU";
+          }
+          {
+            type = "memory";
+            key = "{#separator}│  {#keys}󰍛 Memory";
+          }
+          # {
+          #   type = "disk";
+          #   key = "{#separator}│  {#keys}󰋊 Disk (/)";
+          #   folders = "/";
+          # }
+          # {
+          #   type = "disk";
+          #   key = "{#separator}│  {#keys}󰋊 Disk (~/Games)";
+          #   folders = "/home/christoph/Games";
+          # }
+          {
+            type = "btrfs";
+            key = "{#separator}│  {#keys}󰋊 BTRFS";
+          }
+          {
+            type = "custom";
+            format = "{#1}│";
+          }
+
+          # Colors Footer
+          {
+            type = "colors";
+            key = "{#separator}╰─── {#1}";
+            keyWidth = 6;
+            symbol = "circle";
+          }
+        ];
+      };
+    };
+  };
+}

home/homemodules/fastfetch/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable fastfetch";
+}

home/homemodules/fish/default.nix

@@ -42,163 +42,198 @@ in {
       fish_pager_color_description ${color.hex.overlay0}
     '';
 
-    programs.fish = {
-      enable = true;
-      generateCompletions = nixosConfig.programs.fish.generateCompletions;
+    programs.fish = let
+      # Only add " | bat" if bat is installed
+      batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
 
-      functions = lib.mergeAttrsList [
-        (lib.optionalAttrs config.homemodules.nnn.enable {
-          nnncd = {
-            wraps = "nnn";
-            description = "support nnn quit and change directory";
-            body = ''
-              # Block nesting of nnn in subshells
-              if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
-                  echo "nnn is already running"
-                  return
-              end
+      # Same as above but with args for bat
+      batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
 
-              # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
-              # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
-              # see. To cd on quit only on ^G, remove the "-x" from both lines below,
-              # without changing the paths.
-              if test -n "$XDG_CONFIG_HOME"
-                  set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
-              else
-                  set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
-              end
+      # These can be used for my config.homemodules and for HM config.programs,
+      # as both of these add the package to home.packages
+      hasHomePackage = package: (mylib.modules.contains config.home.packages package);
 
-              # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
-              # stty start undef
-              # stty stop undef
-              # stty lwrap undef
-              # stty lnext undef
+      # Only add fish abbr if package is installed
+      abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
+    in
+      lib.mkMerge [
+        # Darwin exclusive config
+        (lib.mkIf pkgs.stdenv.isDarwin {
+          shellInit = ''
+            set fish_greeting
+            yes | fish_config theme save "system-theme"
 
-              # The command function allows one to alias this function to `nnn` without
-              # making an infinitely recursive alias
-              command nnn $argv
+            set --global --export HOMEBREW_PREFIX "/opt/homebrew"
+            set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
+            set --global --export HOMEBREW_REPOSITORY "/opt/homebrew"
+            fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin"
+            if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end;
+            if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end;
+          '';
 
-              if test -e $NNN_TMPFILE
-                  source $NNN_TMPFILE
-                  rm $NNN_TMPFILE
-              end
-            '';
-          };
+          shellAbbrs = lib.mkMerge [
+            {
+              rebuild = "sudo darwin-rebuild switch --flake .#darwinix";
+            }
+
+            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'darwin,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
+          ];
         })
+
+        # Linux exclusive config
+        (lib.mkIf pkgs.stdenv.isLinux {
+          generateCompletions = nixosConfig.programs.fish.generateCompletions;
+
+          shellInit = ''
+            set fish_greeting
+            yes | fish_config theme save "system-theme"
+          '';
+
+          functions = lib.mergeAttrsList [
+            (lib.optionalAttrs config.homemodules.nnn.enable {
+              nnncd = {
+                wraps = "nnn";
+                description = "support nnn quit and change directory";
+                body = ''
+                  # Block nesting of nnn in subshells
+                  if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+                      echo "nnn is already running"
+                      return
+                  end
+
+                  # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+                  # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+                  # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+                  # without changing the paths.
+                  if test -n "$XDG_CONFIG_HOME"
+                      set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+                  else
+                      set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+                  end
+
+                  # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+                  # stty start undef
+                  # stty stop undef
+                  # stty lwrap undef
+                  # stty lnext undef
+
+                  # The command function allows one to alias this function to `nnn` without
+                  # making an infinitely recursive alias
+                  command nnn $argv
+
+                  if test -e $NNN_TMPFILE
+                      source $NNN_TMPFILE
+                      rm $NNN_TMPFILE
+                  end
+                '';
+              };
+            })
+          ];
+
+          shellAbbrs = lib.mkMerge [
+            # Abbrs that are always available are defined here.
+            {
+              # Tools
+              blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
+              blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
+
+              ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
+            }
+
+            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
+
+            # Doesn't work with abbrify because I have nnn.override...
+            (lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
+            (lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
+
+            (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
+
+            (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
+
+            # (abbrify pkgs.sd {sed = "sd";})
+          ];
+        })
+
+        # Common config
+        {
+          enable = true;
+
+          shellAbbrs = lib.mkMerge [
+            {
+              # Shell
+              c = "clear";
+              q = "exit";
+              mkdir = "mkdir -p"; # also create parents (-p)
+              watch = "watch -d -c -n 0.5";
+              sy = "sudo yazi";
+              cd = "z"; # zoxide for quickjump to previously visited locations
+              cdd = "zi";
+              b = "z -"; # jump to previous dir
+
+              # Fish
+              h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
+              abbrs = batifyWithArgs "abbr" "-l fish";
+
+              # Nix
+              nd = "nix develop";
+              nb = "nix build -L";
+              ns = "nix shell nixpkgs#";
+              nr = "nix run";
+              nps = "nps -e";
+            }
+
+            # Abbrs only available if package is installed
+            (abbrify pkgs.rsync rec {
+              rsync = "rsync -ahv --inplace --partial --info=progress2";
+              copy = rsync;
+            })
+
+            (abbrify pkgs.duf {
+              disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
+              alldisks = "duf";
+            })
+
+            (abbrify pkgs.ripgrep {
+              rg = "rg --trim --pretty";
+              # grep = rg;
+            })
+
+            (abbrify pkgs.eza {
+              ls = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions";
+              lsl = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l";
+              lsa = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l -a";
+              tre = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -T -L 2";
+            })
+
+            (abbrify pkgs.fd {find = "fd";})
+
+            (abbrify pkgs.fzf {fuzzy = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";})
+
+            (abbrify pkgs.gdu {
+              # du = "gdu";
+              storage = "gdu";
+            })
+
+            (abbrify pkgs.git {
+              gs = "git status";
+              gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";
+              gl = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
+              ga = "git add";
+              gap = "git add --patch";
+              gc = "git commit --verbose";
+              gcm = "git commit -m";
+              gcl = "git clone";
+            })
+
+            (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
+
+            (abbrify pkgs.lazygit {lg = "lazygit";})
+          ];
+
+          plugins = [];
+        }
       ];
 
-      plugins = [];
-
-      shellInit = ''
-        set fish_greeting
-        yes | fish_config theme save "system-theme"
-      '';
-
-      shellAbbrs = let
-        # Only add " | bat" if bat is installed
-        batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
-
-        # Same as above but with args for bat
-        batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
-
-        # These can be used for my config.homemodules and for HM config.programs,
-        # as both of these add the package to home.packages
-        hasHomePackage = package: (mylib.modules.contains config.home.packages package);
-
-        # Only add fish abbr if package is installed
-        abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-      in
-        lib.mkMerge [
-          # Abbrs that are always available are defined here.
-          {
-            # Shell basics
-            c = "clear";
-            q = "exit";
-
-            # Fish
-            h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
-            abbrs = batifyWithArgs "abbr" "-l fish";
-
-            # Tools
-            cd = "z"; # zoxide for quickjump to previously visited locations
-            cdd = "zi";
-            b = "z -"; # jump to previous dir
-            mkdir = "mkdir -p"; # also create parents (-p)
-            blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
-            blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
-            watch = "watch -d -c -n 0.5";
-            nps = "nps -e";
-            nd = "nix develop";
-            nb = "nix build -L";
-            ns = "nix shell nixpkgs#";
-            nr = "nix run";
-
-            ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
-            sy = "sudo -E -u ${username} yazi";
-          }
-
-          # Abbrs only available if package is installed
-
-          (abbrify pkgs.duf {
-            disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*'";
-            alldisks = "duf";
-          })
-
-          (abbrify pkgs.eza {
-            ls = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions";
-            lsl = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l";
-            lsa = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l -a";
-            tre = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -T -L 2";
-          })
-
-          (abbrify pkgs.fd {find = "fd";})
-
-          (abbrify pkgs.fzf {fuzzy = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";})
-
-          (abbrify pkgs.gdu {
-            # du = "gdu";
-            storage = "gdu";
-          })
-
-          (abbrify pkgs.git {
-            gs = "git status";
-            gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";
-            gl = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
-            ga = "git add";
-            gap = "git add --patch";
-            gc = "git commit --verbose";
-            gcm = "git commit -m";
-            gcl = "git clone";
-          })
-
-          (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
-
-          (abbrify pkgs.lazygit {lg = "lazygit";})
-
-          (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
-
-          # Doesn't work with abbrify because I have nnn.override...
-          (lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
-          (lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
-
-          (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
-
-          (abbrify pkgs.ripgrep rec {
-            rg = "rg --trim --pretty";
-            # grep = rg;
-          })
-
-          (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
-
-          (abbrify pkgs.rsync rec {
-            rsync = "rsync -ahv --inplace --partial --info=progress2";
-            copy = rsync;
-          })
-
-          # (abbrify pkgs.sd {sed = "sd";})
-        ];
-    };
-
     programs.starship = {
       enable = true;
       enableFishIntegration = config.homemodules.fish.enable;

home/homemodules/jellyfin-tui/default.nix

@@ -0,0 +1,91 @@
+{
+  config,
+  nixosConfig,
+  darwinConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) jellyfin-tui color;
+
+  systemConfig =
+    if pkgs.stdenv.isLinux
+    then nixosConfig
+    else darwinConfig;
+in {
+  options.homemodules.jellyfin-tui = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf jellyfin-tui.enable {
+    home = {
+      packages = [
+        pkgs.jellyfin-tui
+      ];
+
+      file = let
+        jellyfinUrl =
+          if pkgs.stdenv.isLinux
+          then "https://jellyfin.local.chriphost.de"
+          else "https://jellyfin.vps.chriphost.de";
+
+        configFile = ''
+          servers:
+          - name: Mafia Dortmund
+            url: ${jellyfinUrl}
+            username: root
+            password_file: ${systemConfig.sops.secrets.jellyfin-password.path}
+            default: true
+
+          # All following settings are OPTIONAL. What you see here are the defaults.
+
+          # Show album cover image
+          art: true
+          # Save and restore the state of the player (queue, volume, etc.)
+          persist: true
+          # Grab the primary color from the cover image (false => uses the current theme's `accent` instead)
+          auto_color: false
+          # Time in milliseconds to fade between colors when the track changes
+          auto_color_fade_ms: 400
+          # Always show the lyrics pane, even if no lyrics are available
+          lyrics: 'always' # options: 'always', 'never', 'auto'
+
+          rounded_corners: true
+
+          transcoding:
+            bitrate: 320
+            # container: mp3
+
+          # Discord Rich Presence. Shows your listening status on your Discord profile if Discord is running.
+          # NOTE: I think we're allowed to leak this to the public (hopefully)?
+          discord: 1466134677537685546 # https://discord.com/developers/applications
+          # Displays album art on your Discord profile if enabled
+          # !!CAUTION!! - Enabling this will expose the URL of your Jellyfin instance to all Discord users!
+          discord_art: false
+
+          # Customize the title of the terminal window
+          window_title: true # default -> {title} – {artist} ({year})
+          # window_title: false # disable
+          # Custom title: choose from current track's {title} {artist} {album} {year}
+          # window_title: "\"{title}\" by {artist} ({year}) – jellyfin-tui"
+
+          # Options specified here will be passed to mpv - https://mpv.io/manual/master/#options
+          mpv:
+            log-file: /tmp/mpv.log
+            no-config: true
+            # af: lavfi=[loudnorm=I=-23:TP=-1]
+            gapless-audio: weak
+            prefetch-playlist: yes
+            replaygain: no
+        '';
+      in
+        lib.mkMerge [
+          (lib.optionalAttrs pkgs.stdenv.isLinux {
+            ".config/jellyfin-tui/config.yaml".text = configFile;
+          })
+          (lib.optionalAttrs pkgs.stdenv.isDarwin {
+            "Library/Application Support/jellyfin-tui/config.yaml".text = configFile;
+          })
+        ];
+    };
+  };
+}

home/homemodules/jellyfin-tui/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable jellyfin-tui";
+}

home/homemodules/kitty/default.nix

@@ -3,6 +3,7 @@
   config,
   lib,
   mylib,
+  pkgs,
   ...
 }: let
   inherit (config.homemodules) kitty color;
@@ -27,96 +28,102 @@ in {
         "kitty_mod+l" = "next_layout";
       };
 
-      settings = {
-        editor = config.home.sessionVariables.EDITOR;
-        scrollback_lines = 10000;
-        window_padding_width = 10; # Looks stupid with editors if bg doesn't match
-        # hide_window_decorations = "yes";
-        enabled_layouts = "grid,vertical,horizontal";
+      settings = lib.mkMerge [
+        # Linux config
+        (lib.mkIf pkgs.stdenv.isLinux {
+          allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
+          listen_on = "unix:@mykitty";
+        })
 
-        allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
-        listen_on = "unix:@mykitty";
+        # Common config
+        {
+          editor = config.home.sessionVariables.EDITOR;
+          scrollback_lines = 10000;
+          window_padding_width = 10; # Looks stupid with editors if bg doesn't match
+          # hide_window_decorations = "yes";
+          enabled_layouts = "grid,vertical,horizontal";
 
-        tab_bar_min_tabs = 2; # Don't show a single tab
-        tab_bar_edge = "bottom";
-        tab_bar_style = "powerline";
-        tab_powerline_style = "round";
-        tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
+          tab_bar_min_tabs = 2; # Don't show a single tab
+          tab_bar_edge = "bottom";
+          tab_bar_style = "powerline";
+          tab_powerline_style = "round";
+          tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
 
-        #
-        # Color Theme
-        #
+          #
+          # Color Theme
+          #
 
-        # The basic colors
-        background = color.hexS.base;
-        foreground = color.hexS.text;
-        selection_foreground = color.hexS.base;
-        selection_background = color.hexS.rosewater;
+          # The basic colors
+          background = color.hexS.base;
+          foreground = color.hexS.text;
+          selection_foreground = color.hexS.base;
+          selection_background = color.hexS.rosewater;
 
-        # Cursor colors
-        cursor = color.hexS.rosewater;
-        cursor_text_color = color.hexS.base;
+          # Cursor colors
+          cursor = color.hexS.rosewater;
+          cursor_text_color = color.hexS.base;
 
-        # URL underline color when hovering with mouse
-        url_color = color.hexS.rosewater;
+          # URL underline color when hovering with mouse
+          url_color = color.hexS.rosewater;
 
-        # Kitty window border colors
-        active_border_color = color.hexS.lavender;
-        inactive_border_color = color.hexS.overlay0;
-        bell_border_color = color.hexS.yellow;
+          # Kitty window border colors
+          active_border_color = color.hexS.lavender;
+          inactive_border_color = color.hexS.overlay0;
+          bell_border_color = color.hexS.yellow;
 
-        # OS Window titlebar colors
-        wayland_titlebar_color = "system";
-        macos_titlebar_color = "system";
+          # OS Window titlebar colors
+          wayland_titlebar_color = "system";
+          macos_titlebar_color = "system";
 
-        # Tab bar colors
-        active_tab_foreground = color.hexS.base;
-        active_tab_background = color.hexS.lavender;
-        inactive_tab_foreground = color.hexS.text;
-        inactive_tab_background = color.hexS.crust;
-        tab_bar_background = color.hexS.base;
+          # Tab bar colors
+          active_tab_foreground = color.hexS.base;
+          active_tab_background = color.hexS.lavender;
+          inactive_tab_foreground = color.hexS.text;
+          inactive_tab_background = color.hexS.crust;
+          tab_bar_background = color.hexS.base;
 
-        # Color for marks (marked text in the terminal)
-        mark1_foreground = color.hexS.base;
-        mark1_background = color.hexS.lavender;
-        mark2_foreground = color.hexS.base;
-        mark2_background = color.hexS.mauve;
-        mark3_foreground = color.hexS.base;
-        mark3_background = color.hexS.sapphire;
+          # Color for marks (marked text in the terminal)
+          mark1_foreground = color.hexS.base;
+          mark1_background = color.hexS.lavender;
+          mark2_foreground = color.hexS.base;
+          mark2_background = color.hexS.mauve;
+          mark3_foreground = color.hexS.base;
+          mark3_background = color.hexS.sapphire;
 
-        # The 16 terminal colors
-        # black
-        color0 = color.hexS.subtext1;
-        color8 = color.hexS.subtext0;
+          # The 16 terminal colors
+          # black
+          color0 = color.hexS.subtext1;
+          color8 = color.hexS.subtext0;
 
-        # red
-        color1 = color.hexS.red;
-        color9 = color.hexS.red;
+          # red
+          color1 = color.hexS.red;
+          color9 = color.hexS.red;
 
-        # green
-        color2 = color.hexS.green;
-        color10 = color.hexS.green;
+          # green
+          color2 = color.hexS.green;
+          color10 = color.hexS.green;
 
-        # yellow
-        color3 = color.hexS.yellow;
-        color11 = color.hexS.yellow;
+          # yellow
+          color3 = color.hexS.yellow;
+          color11 = color.hexS.yellow;
 
-        # blue
-        color4 = color.hexS.blue;
-        color12 = color.hexS.blue;
+          # blue
+          color4 = color.hexS.blue;
+          color12 = color.hexS.blue;
 
-        # magenta
-        color5 = color.hexS.pink;
-        color13 = color.hexS.pink;
+          # magenta
+          color5 = color.hexS.pink;
+          color13 = color.hexS.pink;
 
-        # cyan
-        color6 = color.hexS.teal;
-        color14 = color.hexS.teal;
+          # cyan
+          color6 = color.hexS.teal;
+          color14 = color.hexS.teal;
 
-        # white
-        color7 = color.hexS.surface2;
-        color15 = color.hexS.surface1;
-      };
+          # white
+          color7 = color.hexS.surface2;
+          color15 = color.hexS.surface1;
+        }
+      ];
     };
   };
 }

home/homemodules/neovim/default.nix

@@ -77,6 +77,7 @@ in {
             typstyle
             mbake
             just-formatter
+            tombi
           ])
 
           [
@@ -125,7 +126,7 @@ in {
         maplocalleader = ",";
       };
 
-      opts = import ./vim_opts.nix {inherit lib mylib;};
+      opts = import ./vim_opts.nix {inherit config lib mylib;};
       extraConfigLuaPost = builtins.readFile ./extraConfigLuaPost.lua;
       extraConfigLua = builtins.readFile ./extraConfigLua.lua;
 
@@ -526,6 +527,7 @@ in {
                 qml = ["qmlformat"];
                 rust = ["rustfmt"];
                 svelte = ["prettierd" "prettier"];
+                toml = ["tombi"];
                 typescript = ["prettierd" "prettier"];
                 typst = ["typstyle"];
               };
@@ -550,6 +552,21 @@ in {
             };
           };
 
+          devdocs = rec {
+            name = "devdocs";
+            pkg = pkgs.vimPlugins.devdocs-nvim;
+            lazy = true;
+            cmd = ["DevDocs"];
+            dependencies = [snacks];
+            config = mkDefaultConfig name;
+            # opts = {
+            #   ensure_installed = [
+            #     "c"
+            #     "cpp"
+            #   ];
+            # };
+          };
+
           direnv = {
             name = "direnv";
             pkg = pkgs.vimPlugins.direnv-vim;
@@ -2158,6 +2175,7 @@ in {
 
           # dap # Debug adapter protocol # TODO:
           # dap-ui # Debugger UI # TODO:
+          devdocs
           diffview # Git diff # TODO: Check the keybindings
 
           direnv # Automatically load local environments

home/homemodules/neovim/mappings.nix

@@ -505,6 +505,48 @@ _: let
       action = "<cmd>lua Snacks.picker.help()<cr>";
       options.desc = "Helptags Picker";
     }
+    {
+      mode = "n";
+      key = "<leader>hd";
+      action = "+devdocs";
+    }
+    # {
+    #   mode = "n";
+    #   key = "<leader>hdd";
+    #   action.__raw = ''
+    #     function()
+    #       local devdocs = require("devdocs")
+    #       local installedDocs = devdocs.GetInstalledDocs()
+    #       vim.ui.select(installedDocs, {}, function(selected)
+    #         if not selected then
+    #           return
+    #         end
+    #         local docDir = devdocs.GetDocDir(selected)
+    #         -- prettify the filename as you wish
+    #         Snacks.picker.files({ cwd = docDir })
+    #       end)
+    #     end
+    #   '';
+    #   options.desc = "Open Devdocs";
+    # }
+    {
+      mode = "n";
+      key = "<leader>hdd";
+      action = "<cmd>DevDocs get<cr>";
+      options.desc = "Open Devdocs in Split";
+    }
+    {
+      mode = "n";
+      key = "<leader>hdi";
+      action = "<cmd>DevDocs install<cr>";
+      options.desc = "Install Devdocs";
+    }
+    {
+      mode = "n";
+      key = "<leader>hdD";
+      action = "<cmd>DevDocs delete<cr>";
+      options.desc = "Delete Devdocs";
+    }
   ];
 
   leader-quit = [

home/homemodules/neovim/neovide_config.ini

@@ -1,5 +1,5 @@
 fork = true # Start neovide detached
-frame = "none" # full, buttonless, none
+frame = "full" # full, buttonless, none
 idle = true # Don't render frames without changes
 title-hidden = true
 tabs = false

home/homemodules/neovim/vim_opts.nix

@@ -1,4 +1,4 @@
-_: {
+{config, ...}: {
   showmode = false; # Status line already shows this
   backspace = ["indent" "eol" "start"];
   termguicolors = true; # Required by multiple plugins
@@ -37,7 +37,7 @@ _: {
   # swapfile = true;
   # backup = false;
   undofile = true;
-  undodir = "/home/christoph/.vim/undo";
+  undodir = "${config.home.homeDirectory}/.vim/undo";
   undolevels = 10000;
   # autochdir = true;
   confirm = true;

home/homemodules/niri/default.nix

@@ -19,30 +19,43 @@ in {
       }
     ];
 
-    gtk = {
-      enable = true;
-      iconTheme.package = color.iconPackage;
-      iconTheme.name = color.iconTheme;
+    gtk = let
+      gtkConfig = {
+        enable = true;
 
-      colorScheme = "dark";
-      gtk3.colorScheme = "dark";
-      gtk4.colorScheme = "dark";
+        colorScheme = "dark";
 
-      theme = {
-        # name = "adw-gtk3-dark";
-        # package = pkgs.adw-gtk3;
-        name = "catppuccin-mocha-mauve-standard";
-        package = pkgs.catppuccin-gtk.override {
-          variant = "mocha";
-          accents = ["mauve"];
-          size = "standard";
+        iconTheme = {
+          package = color.iconPackage;
+          name = color.iconTheme;
+        };
+
+        cursorTheme = {
+          name = color.cursor;
+          package = color.cursorPackage;
+        };
+
+        theme = {
+          # name = "adw-gtk3-dark";
+          # package = pkgs.adw-gtk3;
+          name = "catppuccin-mocha-mauve-standard";
+          package = pkgs.catppuccin-gtk.override {
+            variant = "mocha";
+            accents = ["mauve"];
+            size = "standard";
+          };
         };
       };
 
-      gtk3.extraConfig = {
+      gtkExtraConfig = {
         gtk-application-prefer-dark-theme = 1;
       };
-    };
+    in
+      gtkConfig
+      // {
+        gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
+        gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
+      };
 
     dconf = {
       enable = true;
@@ -53,15 +66,64 @@ in {
       };
     };
 
-    # Disable niri polkit if we use DMS, as it has its own
+    # Disable Niri's kde auth agent and start gnome auth agent instead
     systemd.user.services.niri-flake-polkit = lib.mkForce {};
+    systemd.user.services.polkit-gnome-authentication-agent-1 = {
+      Unit = {
+        Description = "polkit-gnome-authentication-agent-1";
+        Wants = ["graphical-session.target"];
+        After = ["graphical-session.target"];
+      };
+      Install = {
+        WantedBy = ["graphical-session.target"];
+      };
+      Service = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
+      };
+    };
 
     home = {
       file = {
         # Link theme for flatpak
         ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
 
-        ".config/ashell/config.toml".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.dotfiles}/ashell/config.toml";
+        ".config/waypaper/config.ini".text = lib.generators.toINI {} {
+          Settings = {
+            use_xdg_state = true;
+
+            # Those are contained in the statefile (.local/state/waypaper/state.ini):
+            # backend = "swww";
+            # folder = "~/NixFlake/wallpapers";
+            # monitors = "All";
+            # wallpaper =
+
+            language = "en";
+            show_path_in_tooltip = true;
+            fill = "fill";
+            sort = "name";
+            color = "#ffffff";
+            subfolders = false;
+            all_subfolders = false;
+            show_hidden = false;
+            show_gifs_only = false;
+            zen_mode = false;
+            number_of_columns = 3;
+            swww_transition_type = "wipe";
+            swww_transition_step = 90;
+            swww_transition_angle = 30;
+            swww_transition_duration = 1;
+            swww_transition_fps = 60;
+            mpvpaper_sound = false;
+            # mpvpaper_options = "";
+            # post_command =
+            # stylesheet = /home/christoph/.config/waypaper/style.css
+            # keybindings = ~/.config/waypaper/keybindings.ini
+          };
+        };
       };
 
       sessionVariables = {
@@ -81,8 +143,9 @@ in {
         xwayland-satellite
         # ncpamixer # Audio control
         wiremix # Audio control
-
-        ashell # Wayland bar
+        swww
+        waypaper
+        wtype # For elephant
 
         # GTK apps (look good and work well with xdg portals)
         nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
@@ -98,10 +161,259 @@ in {
       ];
     };
 
+    services = {
+      dunst = {
+        enable = true;
+
+        iconTheme.package = color.iconPackage;
+        iconTheme.name = color.iconTheme;
+
+        settings = {
+          global = {
+            # monitor = config.homemodules.waybar.monitor;
+            follow = "keyboard";
+            font = "${color.font} 11";
+            offset = "9x11";
+            background = color.hexS.base;
+            foreground = color.hexS.text;
+            frame_width = 2;
+            corner_radius = 8;
+            separator_color = "frame";
+          };
+
+          urgency_low = {
+            frame_color = color.hexS.green;
+          };
+
+          urgency_normal = {
+            frame_color = color.hexS.green;
+          };
+
+          urgency_critical = {
+            frame_color = color.hexS.red;
+          };
+        };
+      };
+    };
+
     programs = {
       walker = {
         enable = true;
         runAsService = true;
+
+        # https://github.com/abenz1267/walker/blob/master/resources/config.toml
+        config = {
+          theme = "cattpuccin-mocha";
+
+          providers = {
+            default = ["desktopapplications"];
+          };
+          empty = ["desktopapplications"];
+
+          selection_wrap = true;
+          hide_quick_activation = true;
+          actions_as_menu = true;
+        };
+
+        themes."cattpuccin-mocha" = let
+          border-radius = "8px";
+        in {
+          style = ''
+            @define-color rosewater #${color.hex.rosewater};
+            @define-color flamingo #${color.hex.flamingo};
+            @define-color pink #${color.hex.pink};
+            @define-color mauve #${color.hex.mauve};
+            @define-color red #${color.hex.red};
+            @define-color maroon #${color.hex.maroon};
+            @define-color peach #${color.hex.peach};
+            @define-color yellow #${color.hex.yellow};
+            @define-color green #${color.hex.green};
+            @define-color teal #${color.hex.teal};
+            @define-color sky #${color.hex.sky};
+            @define-color sapphire #${color.hex.sapphire};
+            @define-color blue #${color.hex.blue};
+            @define-color lavender #${color.hex.lavender};
+            @define-color text #${color.hex.text};
+            @define-color subtext1 #${color.hex.subtext1};
+            @define-color subtext0 #${color.hex.subtext0};
+            @define-color overlay2 #${color.hex.overlay2};
+            @define-color overlay1 #${color.hex.overlay1};
+            @define-color overlay0 #${color.hex.overlay0};
+            @define-color surface2 #${color.hex.surface2};
+            @define-color surface1 #${color.hex.surface1};
+            @define-color surface0 #${color.hex.surface0};
+            @define-color base #${color.hex.base};
+            @define-color mantle #${color.hex.mantle};
+            @define-color crust #${color.hex.crust};
+
+            @define-color accent #${color.hex.accent};
+
+            * {
+              all: unset;
+              font-family: ${color.font};
+            }
+
+            .normal-icons {
+              -gtk-icon-size: 16px;
+            }
+
+            .large-icons {
+              -gtk-icon-size: 32px;
+            }
+
+            scrollbar {
+              opacity: 0;
+            }
+
+            .box-wrapper {
+              box-shadow:
+                0 19px 38px rgba(0, 0, 0, 0.3),
+                0 15px 12px rgba(0, 0, 0, 0.22);
+              background: @base;
+              padding: 20px;
+              border-radius: ${border-radius};
+              border: 2px solid @accent;
+            }
+
+            .preview-box,
+            .elephant-hint,
+            .placeholder {
+              color: @text;
+            }
+
+            .search-container {
+              border-radius: ${border-radius};
+              background: @mantle;
+              padding: 8px;
+            }
+
+            .input placeholder {
+              opacity: 0.5;
+            }
+
+            .input selection {
+              background: @surface1;
+            }
+
+            .input {
+              caret-color: @text;
+              background: none;
+              padding: 10px;
+              color: @text;
+            }
+
+            .list {
+              color: @text;
+            }
+
+            .item-box {
+              border-radius: ${border-radius};
+              padding: 10px;
+            }
+
+            .item-quick-activation {
+              background: alpha(@mauve, 0.25);
+              border-radius: ${border-radius};
+              padding: 10px;
+            }
+
+            child:selected .item-box,
+            row:selected .item-box {
+              background: alpha(@surface0, 0.6);
+            }
+
+            .item-subtext {
+              font-size: 12px;
+              opacity: 0.5;
+            }
+
+            .providerlist .item-subtext {
+              font-size: unset;
+              opacity: 0.75;
+            }
+
+            .item-image-text {
+              font-size: 28px;
+            }
+
+            .preview {
+              border: 1px solid alpha(@mauve, 0.25);
+              border-radius: ${border-radius};
+              color: @text;
+            }
+
+            .calc .item-text {
+              font-size: 24px;
+            }
+
+            .symbols .item-image {
+              font-size: 24px;
+            }
+
+            .todo.done .item-text-box {
+              opacity: 0.25;
+            }
+
+            .todo.urgent {
+              font-size: 24px;
+            }
+
+            .todo.active {
+              font-weight: bold;
+            }
+
+            .bluetooth.disconnected {
+              opacity: 0.5;
+            }
+
+            .preview .large-icons {
+              -gtk-icon-size: 64px;
+            }
+
+            .keybinds {
+              padding-top: 10px;
+              border-top: 1px solid @surface0;
+              font-size: 12px;
+              color: @text;
+            }
+
+            .keybind-button {
+              opacity: 0.5;
+            }
+
+            .keybind-button:hover {
+              opacity: 0.75;
+            }
+
+            .keybind-bind {
+              text-transform: lowercase;
+              opacity: 0.35;
+            }
+
+            .keybind-label {
+              padding: 2px 4px;
+              border-radius: ${border-radius};
+              border: 1px solid @text;
+            }
+
+            .error {
+              padding: 10px;
+              background: @red;
+              color: @base;
+            }
+
+            :not(.calc).current {
+              font-style: italic;
+            }
+
+            .preview-content.archlinuxpkgs,
+            .preview-content.dnfpackages {
+              font-family: monospace;
+            }
+          '';
+
+          # layouts = {};
+        };
       };
 
       # TODO: Extract options
@@ -141,9 +453,8 @@ in {
           prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
 
           spawn-at-startup = [
-            # TODO: Depend on options
-            # {argv = ["noctalia-shell"];}
-            {argv = ["dms" "run"];}
+            {argv = ["ashell" "-c" "${config.paths.dotfiles}/ashell/config.toml"];}
+            {argv = ["waypaper" "--restore"];}
 
             {argv = ["kitty" "--hold" "fastfetch"];}
             {argv = ["fcitx5"];}
@@ -233,6 +544,11 @@ in {
               top = 4; # Somehow the bar eclusivity doesn't work as expected
               bottom = 2;
             };
+
+            shadow = {
+              enable = true;
+              draw-behind-window = true;
+            };
           };
 
           gestures = {
@@ -330,14 +646,13 @@ in {
 
           layer-rules = [
             {
-              # Set the overview wallpaper on the backdrop (Noctalia).
-              matches = [{namespace = "^noctalia-overview*";}];
-              place-within-backdrop = true;
-            }
-            {
-              # Set the overview wallpaper on the backdrop (DMS).
-              matches = [{namespace = "^dms:blurwallpaper$";}];
-              place-within-backdrop = true;
+              # Waybar rounded corners background clipping fix
+              matches = [{namespace = "waybar";}];
+              opacity = 0.99;
+              shadow = {
+                enable = true;
+                draw-behind-window = true;
+              };
             }
           ];
 
@@ -346,11 +661,113 @@ in {
             honor-xdg-activation-with-invalid-serial = [];
           };
 
-          # TODO: Only start hypr... stuff with hyprland, not systemd (hypridle, hyprpaper currently)
-
           # TODO: Move values to config option and set in home/christoph/niri.nix
-          binds = with config.lib.niri.actions; {
+          binds = with config.lib.niri.actions; let
+            sessionMenu = mylib.rofi.mkMenu {
+              prompt = "Session";
+              layers = [
+                {
+                  "󰤂  Poweroff" = "poweroff";
+                  "󰜉  Reboot" = "reboot";
+                  "󰌾  Lock" = "loginctl lock-session";
+                  # "  Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
+                  # "  Reload Hyprland" = "hyprctl reload";
+                  # "  Exit Hyprland" = "hyprctl dispatch exit";
+                  "  Exit Niri" = "niri msg action quit";
+                }
+              ];
+              prompts = ["Select Session Action"];
+              rofiCmd = "walker -d";
+            };
+            wallpaperMenu = mylib.rofi.mkMenu {
+              prompt = "Wallpaper";
+              layers = [
+                "eza -1 ${config.paths.nixflake}/wallpapers"
+              ];
+              prompts = ["Select Wallpaper"];
+              # Use waypaper instead of swww directly, so the chosen wallpaper will be restored after reboot
+              command = "waypaper --wallpaper ${config.paths.nixflake}/wallpapers/$OPTION0";
+              rofiCmd = "walker -d";
+            };
+            # No lectures anymore :) - Kept as example
+            lecturesMenu = mylib.rofi.mkMenu {
+              prompt = "Lecture";
+              layers = [
+                "eza -1 -D ~/Notes/TU"
+                "eza -1 -D ~/Notes/TU/$OPTION0"
+                "eza -1 ~/Notes/TU/$OPTION0/$OPTION1 | grep '.pdf'"
+              ];
+              prompts = [
+                "Select Lecture"
+                "Select Subfolder"
+                "Select Deck"
+              ];
+              command = "xdg-open ~/Notes/TU/$OPTION0/$OPTION1/$OPTION2";
+              rofiCmd = "walker -d";
+            };
+            # niriMenu = mylib.rofi.mkMenu {
+            #   prompt = "Niri";
+            #   layers = [
+            #     {
+            #       "󰹑  Take Region Screenshot" = "niri msg action screenshot -p false";
+            #       "󰹑  Take Window Screenshot" = "niri msg action screenshot-window -p false -d true";
+            #       "󰹑  Take Full-Screen Screenshot" = "niri msg action screenshot-screen -p false -d true";
+            #     }
+            #   ];
+            #   prompts = ["Execute Niri Action"];
+            #   rofiCmd = "walker -d";
+            # };
+            globalMenu = mylib.rofi.mkMenu {
+              prompt = "Global";
+              layers = [
+                {
+                  "  Control Session" = "${sessionMenu}/bin/rofi-menu-Session";
+                  "󰸉  Change Wallpaper" = "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
+                  "󰋗  View Keybindings" = "niri msg action show-hotkey-overlay";
+                  "  Open Lecture Material" = "${lecturesMenu}/bin/rofi-menu-Lecture";
+                  # "  Niri Actions" = "${niriMenu}/bin/rofi-menu-Niri";
+                  # TODO: What else? SSH menu?
+                }
+              ];
+              prompts = ["Select Action"];
+              rofiCmd = "walker -d";
+            };
+          in {
+            # DMenu
+            "Mod+Shift+A" = {
+              action = spawn "walker" "-m" "providerlist";
+              hotkey-overlay = {title = "Toggle the launcher.";};
+            };
+            "Mod+A" = {
+              action = spawn "walker" "-m" "desktopapplications";
+              hotkey-overlay = {title = "Toggle the application launcher.";};
+            };
+            "Mod+C" = {
+              action = spawn "walker" "-m" "clipboard";
+              hotkey-overlay = {title = "Show clipboard history.";};
+            };
+            "Mod+Escape" = {
+              action = spawn "${sessionMenu}/bin/rofi-menu-Session";
+              hotkey-overlay = {title = "Toggle the session menu.";};
+            };
+            "Mod+W" = {
+              action = spawn "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
+              hotkey-overlay = {title = "Open wallpaper menu.";};
+            };
+            "Mod+D" = {
+              action = spawn "${globalMenu}/bin/rofi-menu-Global";
+              hotkey-overlay = {title = "Open global menu.";};
+            };
+
             # Applications
+            "Mod+Ctrl+W" = {
+              action = spawn "waypaper";
+              hotkey-overlay = {title = "Open waypaper.";};
+            };
+            "Mod+Shift+W" = {
+              action = spawn "waypaper" "--random";
+              hotkey-overlay = {title = "Select random wallpaper.";};
+            };
             "Mod+T" = {
               action = spawn "kitty";
               hotkey-overlay = {title = "Spawn Kitty.";};
@@ -384,36 +801,23 @@ in {
               hotkey-overlay = {title = "Edit the NixFlake.";};
             };
 
-            "Mod+A" = {
-              action = spawn "walker";
-              hotkey-overlay = {title = "Toggle the application launcher.";};
-            };
-
-            # DankMaterialShell
-            # "Mod+A" = {
-            #   action = spawn "dms" "ipc" "call" "spotlight" "toggle";
-            #   hotkey-overlay = {title = "Toggle the application launcher.";};
-            # };
-            # "Mod+Ctrl+L" = {
-            #   action = spawn "dms" "ipc" "call" "lock" "lock";
-            #   hotkey-overlay = {title = "Lock the screen.";};
-            # };
-            # "Mod+Escape" = {
-            #   action = spawn "dms" "ipc" "call" "powermenu" "toggle";
-            #   hotkey-overlay = {title = "Toggle the session menu.";};
-            # };
-            # "Mod+C" = {
-            #   action = spawn "dms" "ipc" "call" "clipboard" "toggle";
-            #   hotkey-overlay = {title = "Show clipboard history.";};
-            # };
-
             # Screenshots
             "Mod+S" = {
-              action.screenshot-window = {write-to-disk = true;};
+              action.screenshot-window = {
+                write-to-disk = true;
+                show-pointer = false;
+              };
               hotkey-overlay = {title = "Take a screenshot of the current window.";};
             };
+            "Mod+Ctrl+S" = {
+              action.screenshot-screen = {
+                write-to-disk = true;
+                show-pointer = false;
+              };
+              hotkey-overlay = {title = "Take a screenshot of the current screen.";};
+            };
             "Mod+Shift+S" = {
-              action.screenshot = {show-pointer = true;};
+              action.screenshot = {show-pointer = false;};
               hotkey-overlay = {title = "Take a screenshot of a region.";};
             };
 

home/homemodules/packages/default.nix

@@ -0,0 +1,220 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  headless,
+  inputs,
+  ...
+}: let
+  inherit (config.homemodules) packages color;
+in {
+  options.homemodules.packages = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf packages.enable {
+    # TODO: Add extra packages option and use that from host-specific configs
+    home.packages = with pkgs;
+      lib.mkMerge [
+        # Common packages
+        [
+          # Shell utils
+          (ripgrep.override {withPCRE2 = true;}) # fast as fuck
+          gdu # Alternative to du-dust (I like it better)
+          duf # Disk usage analyzer (for all disk overview)
+          sd # Sed alternative
+          fclones # Duplicate file finder
+          tealdeer # Very fast tldr (so readable man)
+          killall
+          atool # Archive preview
+          exiftool
+          ouch # Unified compression/decompression
+          ffmpegthumbnailer # Video thumbnails
+          mediainfo # Media meta information
+          file # File meta information
+          unrar # Cooler WinRar
+          p7zip # Zip stuff
+          unzip # Unzip stuff
+          progress # Find coreutils processes and show their progress
+          tokei # Text file statistics in a project
+          ttyper
+          wiki-tui
+
+          # Nix
+          nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options
+          nix-tree # Browse the nix store sorted by size (gdu for closures)
+          inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default # Search nixpkgs
+
+          # Video/Image/Audio utils
+          ffmpeg-full # I love ffmpeg (including ffplay)
+          ffmpeg-normalize # Normalize audio
+
+          # Document utils
+          poppler-utils # pdfunite
+          pdf2svg # extract vector graphics from pdf
+          pandoc # document converting madness
+
+          # Networking
+          dig # Make DNS requests
+          tcpdump # Listen in on TCP traffic
+          gping # ping with graph
+          curlie # curl a'la httpie
+          wget # download that shit
+          doggo # dns client
+          rsync # cp on steroids
+          rclone # Rsync for cloud
+          httpie # Cool http client
+          speedtest-cli
+          bandwhich
+          snitch
+
+          # Use NixCommunity binary cache
+          cachix
+        ]
+
+        # Common !headless packages
+        (lib.optionals (!headless) [
+          ripdrag # drag & drop from terminal
+          # jellyfin-tui # Use module
+        ])
+
+        # Linux exclusive packages
+        (lib.optionals (pkgs.stdenv.isLinux) [
+          pastel # Color tools
+          nvd # Nix rebuild diff
+          nurl # Generate nix fetcher sections based on URLs
+          python313 # Nicer scripting than bash
+          lazyjournal # Journalctl viewer
+          systemctl-tui
+          restic # Backups
+          gnumake
+          just # make alternative
+          binsider # .elf analyzer
+          jujutsu # git-like vcs
+          lurk # strace analysis
+          radare2
+
+          # Hardware/Software info
+          pciutils # lspci
+          mesa-demos # OpenGL info
+          wayland-utils # wayland-info
+          clinfo # OpenCL info
+          vulkan-tools # vulkaninfo
+          libva-utils # vainfo
+          vdpauinfo # Video-Decode and Presentation API for Unix info
+          hwloc # Generate CPU topology diagram
+          lm_sensors # Readout hardware sensors
+          acpica-tools # Dump ACPI tables etc.
+          smartmontools # Disk health
+          nvme-cli # NVME disk health
+
+          # Video/Image/Audio utils
+          imagemagick # Convert image (magic)
+          mp3val # Validate mp3 files
+          flac # Validate flac files
+
+          # Document utils
+          graphviz # generate graphs from code
+          d2 # generate diagrams from code
+          plantuml # generate diagrams
+          gnuplot # generate function plots
+
+          # Networking
+          traceroute # "Follow" a packet
+          cifs-utils # Mount samba shares
+          nfs-utils # Mount NFS shares
+          sshfs # Mount remote directories via SSH
+
+          # Run unpatched binaries on NixOS
+          # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
+          # Usage: "nix-alien-ld -- <Executable>".
+          inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
+        ])
+
+        # Linux exclusive packages (!headless)
+        (lib.optionals (pkgs.stdenv.isLinux && (!headless)) [
+          wl-clipboard
+
+          # Proton
+          proton-vpn
+          protonmail-bridge-gui
+
+          # GUI stuff
+          nautilus # Just in case
+          signal-desktop
+          anki
+          font-manager # Previews fonts, but doesn't set them
+          nextcloud-client
+          keepassxc
+          thunderbird # TODO: Email module
+          obsidian
+          zotero
+          zeal # docs browser
+          # helvum # unmaintained
+          crosspipe
+          vlc
+          audacity
+          ferdium
+          gparted
+          # feishin # electron :(
+          playerctl # Media player control
+          czkawka-full # file deduplicator
+
+          # Office
+          kdePackages.wacomtablet # For xournalpp/krita
+          xournalpp # Write with a pen, like old people
+          hunspell # I cna't type
+          hunspellDicts.en_US
+          hunspellDicts.de_DE
+
+          inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
+        ])
+
+        # Darwin exclusive packages
+        (lib.optionals pkgs.stdenv.isDarwin [
+          # Use homebrew instead
+          # alt-tab-macos
+          # discord
+          # obsidian
+          # nextcloud-client
+          # proton-vpn
+          # iina
+        ])
+      ];
+
+    programs = {
+      # The home-manager management tool.
+      # Will only be enabled if HM is installed standalone.
+      home-manager.enable = true;
+
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+      };
+
+      eza = {
+        enable = true;
+        enableFishIntegration = config.homemodules.fish.enable;
+      };
+
+      fd.enable = true;
+
+      fzf = {
+        enable = true;
+        enableFishIntegration = config.homemodules.fish.enable;
+      };
+
+      navi = {
+        enable = true;
+        enableFishIntegration = config.homemodules.fish.enable;
+      };
+
+      yt-dlp.enable = true;
+
+      zoxide = {
+        enable = true;
+        enableFishIntegration = config.homemodules.fish.enable;
+      };
+    };
+  };
+}

home/homemodules/packages/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable common packages";
+}

home/homemodules/ssh/default.nix

@@ -0,0 +1,73 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) ssh color;
+in {
+  options.homemodules.ssh = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf ssh.enable {
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+
+      matchBlocks = {
+        "*" = {
+          forwardAgent = false;
+          addKeysToAgent =
+            if pkgs.stdenv.isLinux
+            then "no"
+            else "yes"; # Don't have keychain on darwin
+          compression = true;
+          serverAliveInterval = 0;
+          serverAliveCountMax = 3;
+          hashKnownHosts = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
+          controlMaster = "no";
+          controlPath = "~/.ssh/master-%r@%n:%p";
+          controlPersist = "no";
+        };
+        "nixinator" = {
+          port = 5432;
+          user = "christoph";
+          hostname = "vps.chriphost.de";
+        };
+        "servenix" = {
+          user = "christoph";
+          hostname = "local.chriphost.de";
+        };
+        "thinknix" = {
+          user = "christoph";
+          hostname = "think.chriphost.de";
+        };
+        "vps" = {
+          user = "root";
+          hostname = "vps.chriphost.de";
+        };
+        "mars" = {
+          user = "smchurla";
+          hostname = "mars.cs.tu-dortmund.de";
+          serverAliveInterval = 60;
+          localForwards = [
+            {
+              # Resultbrowser
+              bind.port = 22941;
+              host.address = "127.0.0.1";
+              host.port = 22941;
+            }
+            {
+              # Mysql
+              bind.port = 3306;
+              host.address = "127.0.0.1";
+              host.port = 3306;
+            }
+          ];
+        };
+      };
+    };
+  };
+}

home/homemodules/ssh/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable ssh";
+}

home/homemodules/terminal/default.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  headless,
+  ...
+}: let
+  inherit (config.homemodules) terminal color;
+in {
+  options.homemodules.terminal = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf terminal.enable {
+    homemodules = {
+      bat.enable = true;
+      btop.enable = true;
+      fastfetch.enable = true;
+      fish.enable = true;
+
+      git = {
+        enable = true;
+
+        userName = "Christoph Urlacher";
+        userEmail = "christoph.urlacher@protonmail.com";
+        signCommits = true;
+      };
+
+      jellyfin-tui.enable = true;
+      kitty.enable = true;
+      lazygit.enable = true;
+
+      neovim = {
+        enable = true;
+        alias = true;
+        neovide = !headless;
+      };
+
+      ssh.enable = true;
+      tmux.enable = true;
+      yazi.enable = true;
+    };
+  };
+}

home/homemodules/terminal/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable terminal tools";
+}

home/homemodules/tmux/default.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) tmux color;
+in {
+  options.homemodules.tmux = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf tmux.enable {
+    programs.tmux = {
+      enable = true;
+
+      clock24 = true;
+      escapeTime = 0; # Delay after pressing escape
+      # keyMode = "vi";
+      terminal = "xterm-256color";
+
+      plugins = with pkgs; [
+        {
+          plugin = tmuxPlugins.catppuccin;
+          extraConfig = ''
+            set -g @plugin 'catppuccin/tmux'
+            set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
+          '';
+        }
+      ];
+
+      extraConfig = ''
+        set -g default-terminal "xterm-256color"
+        set-option -ga terminal-overrides ",xterm-256color:Tc"
+      '';
+    };
+  };
+}

home/homemodules/tmux/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable tmux";
+}

home/homemodules/waybar/default.nix

@@ -21,126 +21,230 @@ in {
           spacing = 0;
           margin = "10px 10px 0px 10px";
           fixed-center = true;
-          output = ["${waybar.monitor}"];
+          output = waybar.monitors;
 
-          modules-left = ["custom/launcher" "user" "hyprland/window"];
-          modules-center = ["hyprland/workspaces"];
-          modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "clock" "tray"];
+          modules-left = ["custom/launcher" "niri/workspaces" "niri/window"]; # "user"
+          modules-center = ["mpris"]; # "systemd-failed-units"
+          modules-right = ["privacy" "pulseaudio" "network" "disk" "cpu" "memory" "clock" "tray"];
 
           "custom/launcher" = {
-            format = "<span></span>";
+            format = "<span></span>";
             interval = "once";
-            on-click = "rofi -drun-show-actions -show drun";
+            on-click = "walker -m desktopapplications";
           };
 
-          "hyprland/workspaces" = {
+          systemd-failed-units = {
+            hide-on-ok = true;
+            format = " {nr_failed}";
+            format-ok = "✔️";
+            system = true;
+            user = true;
+          };
+
+          "niri/workspaces" = {
             all-outputs = false;
-            format = "{name}";
-            on-click = "activate";
-            sort-by-coordinates = false;
-            sort-by-name = true;
-            sort-by-number = false;
+            format = "{icon}";
+            format-icons = {
+              default = "";
+              focused = "";
+              active = "";
+            };
           };
 
-          "pulseaudio" = {
-            format = "<span></span> {volume}%";
-            format-muted = "<span></span> ";
-            on-click = "kitty ncpamixer -t o";
+          "niri/window" = {
+            format = "{title}";
+            separate-outputs = false;
+            icon = true;
+            icon-size = 22;
           };
 
-          "network" = {
-            format = "<span></span> {ipaddr}";
+          mpris = {
+            format = "<span>󰎇</span> {dynamic}";
+            format-paused = "<span>{status_icon}</span> <i>{dynamic}</i>";
+            dynamic-order = ["artist" "title"];
+            status-icons = {
+              paused = "󰏤";
+            };
+          };
+
+          privacy = {
+            icon-spacing = 4;
+            icon-size = 16;
+            transition-duration = 250;
+            modules = [
+              {
+                type = "screenshare";
+                tooltip = true;
+                tooltip-icon-size = 24;
+              }
+              # {
+              #   type = "audio-out";
+              #   tooltip = true;
+              #   tooltip-icon-size = 24;
+              # }
+              {
+                type = "audio-in";
+                tooltip = true;
+                tooltip-icon-size = 24;
+              }
+            ];
+            ignore-monitor = true;
+          };
+
+          pulseaudio = {
+            format = "<span>󰕾</span> {volume}%";
+            format-muted = "<span>󰝟</span> ";
+            on-click = "kitty --title=WireMix wiremix";
+          };
+
+          network = {
+            format = "<span>󰌀</span> {ipaddr}";
             format-disconnected = "<span></span> ";
             interface = "enp8s0";
-            tooltip-format = "{ifname} via {gwaddr}";
+            tooltip = false;
+          };
+
+          disk = {
+            interval = 5;
+            format = "<span>󰋊</span> {percentage_used}%";
+            on-click = "kitty --hold --title=Duf duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
           };
 
           cpu = {
-            format = "<span></span> {load}%";
+            interval = 1;
+            # states = {
+            #   "critical" = 85;
+            # };
+            format = "<span></span> {load}%";
+            # format-critical = "<span color='#${color.hex.red}'><span></span> {load}%</span>";
+            on-click = "kitty --title=Btop btop";
+            tooltip = false;
           };
 
           memory = {
-            format = "<span></span> {percentage}%";
-          };
-
-          temperature = {
-            format = "<span></span> {temperatureC}°C";
-            thermal-zone = 3;
+            interval = 1;
+            # states = {
+            #   "critical" = 85;
+            # };
+            format = "<span></span> {percentage}%";
+            # format-critical = "<span color='#${color.hex.red}'><span></span> {percentage}%</span>";
+            on-click = "kitty --title=Btop btop";
+            tooltip = true;
+            tooltip-format = "RAM:  {used}GiB / {total}GiB\nSwap: {swapUsed}GiB / {swapTotal}GiB";
           };
 
           clock = {
-            format = "<span></span> {:%H:%M}";
+            format = "<span>󰥔</span> {:%H:%M}";
             timezone = "Europe/Berlin";
             tooltip-format = "<tt><small>{calendar}</small></tt>";
+            calendar = {
+              mode = "month";
+              weeks-pos = "right";
+              mode-mon-col = 3;
+              on-scroll = -1;
+              format = {
+                months = "<span color='#${color.hex.peach}'><b>{}</b></span>";
+                days = "<span color='#${color.hex.flamingo}'><b>{}</b></span>";
+                weeks = "<span color='#${color.hex.teal}'><b>W{}</b></span>";
+                weekdays = "<span color='#${color.hex.lavender}'><b>{}</b></span>";
+                today = "<span color='#${color.hex.accent}'><b><u>{}</u></b></span>";
+              };
+            };
+            actions = {
+              on-click-right = "mode";
+              on-scroll-up = "shift_up";
+              on-scroll-down = "shift_down";
+            };
           };
 
           tray = {
-            icon-size = 20;
+            icon-size = 22;
             show-passive-items = true;
             spacing = 5;
           };
         };
       };
 
-      style = ''
+      style = let
+        border-width = "2px";
+        border-radius = "10px";
+      in ''
         /* Order is Top-Right-Bottom-Left for combined properties */
         * {
-          color: #${color.hex.dark.base};
           font-family: ${color.font};
-          font-weight: bold;
         }
 
         window#waybar {
           border-style: solid;
-          border-width: 2px;
-          border-radius: 6px;
-          border-color: #${color.hex.dark.lavender};
-          background-color: rgba(${color.rgbString.light.base}, 0.3);
+          border-width: ${border-width};
+          border-radius: ${border-radius};
+          border-color: #${color.hex.accent};
+          background-color: rgba(${color.rgbS.mantle}, 1.0);
         }
 
         tooltip {
-          border-style: solid;
-          border-width: 2px;
-          border-radius: 6px;
-          border-color: #${color.hex.dark.lavender};
-          background-color: rgba(${color.rgbString.light.base}, 0.7);
+          color: #${color.hex.text};
           font-weight: normal;
+          border-style: solid;
+          border-width: ${border-width};
+          border-radius: ${border-radius};
+          border-color: #${color.hex.accent};
+          background-color: rgba(${color.rgbS.mantle}, 1.0);
         }
 
         /* Background colors */
-        #custom-launcher          {background-color: #${color.hex.dark.lavender};}
-        #user                     {background-color: #${color.hex.dark.pink};}
-        #window                   {background-color: #${color.hex.dark.mauve};}
-        #workspaces button        {background-color: #${color.hex.dark.lavender};}
-        #workspaces button.active {background-color: #${color.hex.dark.pink};}
-        #pulseaudio               {background-color: #${color.hex.dark.maroon};}
-        #network                  {background-color: #${color.hex.dark.peach};}
-        #cpu                      {background-color: #${color.hex.dark.yellow};}
-        #memory                   {background-color: #${color.hex.dark.green};}
-        #temperature              {background-color: #${color.hex.dark.teal};}
-        #clock                    {background-color: #${color.hex.dark.sky};}
-        #tray                     {background-color: #${color.hex.dark.lavender};}
+        #custom-launcher           {background-color: #${color.hex.accent};}
+        #workspaces button         {background-color: #${color.hex.blue};}
+        #workspaces button.empty   {background-color: #${color.hex.lavender};}
+        #workspaces button.active  {background-color: #${color.hex.green};}
+        #workspaces button.urgent  {background-color: #${color.hex.red};}
+        #window                    {background-color: #${color.hex.maroon};}
+
+        #mpris                     {background-color: #${color.hex.accent};}
+
+        #privacy                   {background-color: #${color.hex.red};}
+        #pulseaudio                {background-color: #${color.hex.maroon};}
+        #network                   {background-color: #${color.hex.peach};}
+        #disk                      {background-color: #${color.hex.yellow};}
+        #cpu                       {background-color: #${color.hex.green};}
+        #memory                    {background-color: #${color.hex.teal};}
+        #clock                     {background-color: #${color.hex.sky};}
+        #tray                      {background-color: #${color.hex.accent};}
 
         /* Square Widgets */
         #custom-launcher,
-        #workspaces button,
+        #mpris,
         #tray {
+          color: #${color.hex.mantle};
+          font-weight: bold;
           padding: 0px 10px 0px 10px;
-          border-radius: 6px;
+          border-radius: ${border-radius};
+        }
+
+        /* Workspaces */
+        #workspaces button {
+          color: #${color.hex.mantle};
+          font-weight: bold;
+          padding: 0px 2px 0px 2px;
+          margin: 8px 2px 8px 2px;
+          border-radius: ${border-radius};
         }
 
         /* Rectangle Widgets */
         #user,
         #window,
         #pulseaudio,
+        #privacy,
         #network,
+        #disk,
         #cpu,
         #memory,
-        #temperature,
         #clock {
+          color: #${color.hex.mantle};
+          font-weight: bold;
           padding: 0px 10px 0px 10px;
           margin: 8px 5px 8px 5px;
-          border-radius: 6px;
+          border-radius: ${border-radius};
         }
 
         /* Make window module transparent when no windows present */
@@ -153,14 +257,10 @@ in {
         /* Tux Icon */
         #custom-launcher {
           font-size: 26px;
-          padding-right: 10px;
+          padding-right: 13px;
           margin: 0px 5px 0px 0px;
         }
 
-        #workspaces button {
-          margin: 0px 5px 0px 5px;
-        }
-
         #tray {
           margin: 0px 0px 0px 5px;
         }

home/homemodules/waybar/options.nix

@@ -7,9 +7,9 @@ with lib;
 with mylib.modules; {
   enable = mkEnableOption "Waybar";
 
-  monitor = mkOption {
-    type = types.str;
-    example = "HDMI-A-1";
+  monitors = mkOption {
+    type = types.listOf types.str;
+    example = ''["HDMI-A-1", "DP-1"]'';
     description = "What monitor to display the Waybar on";
   };
 }

lib/containers.nix

@@ -0,0 +1,13 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: {
+  # Standard DockerHub login used by all oci-container services.
+  # Usage: login = mylib.containers.mkDockerLogin config;
+  mkDockerLogin = config: {
+    username = "christoph.urlacher@protonmail.com";
+    passwordFile = "${config.sops.secrets.docker-password.path}";
+  };
+}

lib/default.nix

@@ -13,4 +13,5 @@
   rofi = import ./rofi.nix {inherit inputs pkgs lib;};
   generators = import ./generators.nix {inherit inputs pkgs lib;};
   color = import ./color.nix {inherit inputs pkgs lib;};
+  containers = import ./containers.nix {inherit inputs pkgs lib;};
 }

lib/networking.nix

@@ -43,6 +43,8 @@
     routers,
     nameservers,
     routable,
+    # Extra addresses declared without creating routes (e.g. IPv6 ULA).
+    extraAddresses ? [],
   }: {
     enable = true;
 
@@ -56,7 +58,8 @@
     address = ips;
     gateway = routers;
     dns = nameservers;
-    routes = builtins.map (r: {Gateway = r;}) routers; # TODO: We need to add a way to specify addresses without routes (IPv6 ULA)
+    routes = builtins.map (r: {Gateway = r;}) routers;
+    addresses = builtins.map (a: {Address = a;}) extraAddresses;
 
     # See man systemd.network
     networkConfig = {

lib/nixos.nix

@@ -4,6 +4,26 @@
   lib,
   ...
 }: {
+  # Common nix daemon settings shared between NixOS and nix-darwin.
+  # Darwin additionally needs nix.enable = true.
+  mkCommonNixSettings = username: {
+    enable = true;
+    package = pkgs.nixVersions.stable;
+    extraOptions = ''
+      experimental-features = nix-command flakes pipe-operators
+    '';
+    settings.trusted-users = ["root" username];
+    gc.automatic = false;
+    gc.options = "--delete-older-than 5d";
+    settings.auto-optimise-store = true;
+    optimise.automatic = true;
+    registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
+    nixPath = [
+      "nixpkgs=${inputs.nixpkgs.outPath}"
+      "home-manager=${inputs.home-manager.outPath}"
+    ];
+  };
+
   mkNixosConfigWithHomeManagerModule = {
     system,
     mylib,
@@ -80,6 +100,75 @@
       ];
     };
 
+  mkDarwinConfigWithHomeManagerModule = {
+    system,
+    mylib,
+    hostname,
+    username,
+    publicKeys,
+    extraModules ? [],
+    headless ? false,
+  }:
+    inputs.nix-darwin.lib.darwinSystem {
+      inherit system;
+
+      # Values in "specialArgs" are propagated to all system modules.
+      specialArgs = {
+        inherit inputs system hostname mylib username publicKeys headless;
+      };
+
+      modules = builtins.concatLists [
+        [
+          # Replace the default "pkgs" with my configured version
+          # to allow installation of unfree software and my own overlays.
+          {nixpkgs.pkgs = pkgs;}
+
+          # Import the toplevel system configuration module.
+          ../system/cachix.nix
+
+          # Host specific configuration
+          ../system/${hostname}
+
+          # Import all of my custom system modules
+          ../system/systemmodules/darwin.nix
+        ]
+
+        extraModules
+
+        # HM is installed as a system module when using mkNixosConfigWithHomeManagerModule.
+        [
+          inputs.home-manager.darwinModules.home-manager
+          {
+            home-manager = {
+              # Values in "extraSpecialArgs" are propagated to all HM modules.
+              extraSpecialArgs = {
+                inherit inputs system hostname mylib username publicKeys headless;
+              };
+
+              # Use the "pkgs" from the system configuration.
+              # This disables "nixpkgs.*" options in HM modules.
+              useGlobalPkgs = true;
+
+              # Packages in "users.${username}.packages" will be installed
+              # to /etc/profiles instead of ~/.nix-profile.
+              useUserPackages = true;
+
+              users.${username}.imports = [
+                # Host specific configuration
+                ../home/${username}/${hostname}
+              ];
+
+              sharedModules = [
+                # Import all of my custom HM modules.
+                # Putting them into sharedModules enables correct nixd completions.
+                ../home/homemodules/darwin.nix
+              ];
+            };
+          }
+        ]
+      ];
+    };
+
   mkNixosSystemConfig = {
     system,
     mylib,

lib/rofi.nix

@@ -3,75 +3,164 @@
   pkgs,
   lib,
   ...
-}: rec {
+}: {
   # Receives attrs like:
   # {
   #   "Poweroff" = "poweroff";
   #   "Reload Hyprland" = "hyprctl reload";
   # }
-  mkSimpleMenu = let
-    # Makes a string like ''"Poweroff" "Reload Hyprland"''
-    unpack-options = attrs: "\"${lib.concatStringsSep "\" \"" (builtins.attrNames attrs)}\"";
+  # mkSimpleMenu = let
+  #   # Makes a string like ''"Poweroff" "Reload Hyprland"''
+  #   unpack-options = attrs: "\"${lib.concatStringsSep "\" \"" (builtins.attrNames attrs)}\"";
+  #
+  #   mkCase = option: action: "else if test \"${option}\" = $OPTION\n    set ACTION \"${action}\"";
+  #
+  #   cases = attrs:
+  #     attrs
+  #     |> builtins.mapAttrs mkCase
+  #     |> builtins.attrValues
+  #     |> builtins.concatStringsSep "\n";
+  # in
+  #   {
+  #     prompt,
+  #     attrs,
+  #     command ? ''rofi -dmenu -i'',
+  #   }:
+  #     pkgs.writeScriptBin "rofi-menu-${prompt}" ''
+  #       #! ${pkgs.fish}/bin/fish
+  #
+  #       # OPTIONS contains all possible values Rofi will display
+  #       set OPTIONS ${unpack-options attrs}
+  #
+  #       # We choose a single OPTION using Rofi
+  #       set OPTION (echo -e (string join "\n" $OPTIONS) | ${command} -p "${prompt}")
+  #
+  #       # Check if the chosen OPTION is a valid choice from OPTIONS
+  #       if not contains $OPTION $OPTIONS
+  #           exit
+  #       end
+  #
+  #       # Set a command to execute based on the chosen OPTION
+  #       if false
+  #           exit # Easier to generate with this
+  #       ${cases attrs}
+  #       else
+  #           exit
+  #       end
+  #
+  #       # Execute the command
+  #       eval $ACTION
+  #     '';
 
-    mkCase = option: action: "else if test \"${option}\" = $OPTION\n    set ACTION \"${action}\"";
+  # Rofi/Dmenu menu generator.
+  #
+  # Each element in `layers` is one of:
+  #   - attrset { "Label" = "value"; } # static options: selected value → $OPTIONn
+  #   - string  "shell-cmd"            # dynamic options from command: selected text → $OPTIONn
+  #                                    # may reference $OPTION0, $OPTION1, ... from earlier layers
+  #
+  # The "command" is the last action, it can reference $OPTION0, $OPTION1, ...
+  # If no "command" is given and the last layer is a static attrset, its selected value is evaluated directly.
+  #
+  # The "prompts" list are optional per-layer prompt strings (falls back to "prompt" if not provided).
+  #
+  # vpn.fish equivalent:
+  #   mkMenu {
+  #     prompt = "vpn";
+  #     layers = [
+  #       "cat /etc/rofi-vpns"
+  #       { "start" = "start"; "stop" = "stop"; "status" = "status"; }
+  #     ];
+  #     command = "systemctl $OPTION1 $OPTION0.service";
+  #   }
+  #
+  # lectures.fish equivalent:
+  #   mkMenu {
+  #     prompt = "lecture";
+  #     layers = [
+  #       "eza -1 -D ~/Notes/TU"
+  #       "eza -1 ~/Notes/TU/$OPTION0/Lecture | grep '.pdf'"
+  #     ];
+  #     command = "xdg-open ~/Notes/TU/$OPTION0/Lecture/$OPTION1";
+  #   }
+  mkMenu = {
+    prompt,
+    layers,
+    prompts ? [],
+    command ? null,
+    rofiCmd ? "rofi -dmenu -i",
+  }: let
+    isStaticLayer = layer: builtins.isAttrs layer && !(layer ? options);
+    isDynamicLayer = layer: builtins.isString layer;
 
-    cases = attrs:
-      attrs
-      |> builtins.mapAttrs mkCase
-      |> builtins.attrValues
-      |> builtins.concatStringsSep "\n";
-  in
-    prompt: attrs:
-      pkgs.writeScriptBin "rofi-menu-${prompt}" ''
-        #! ${pkgs.fish}/bin/fish
+    escStr = s: builtins.replaceStrings [''"'' "\\"] [''\"'' "\\\\"] s;
 
-        # OPTIONS contains all possible values Rofi will display
-        set OPTIONS ${unpack-options attrs}
+    layerPrompt = i:
+      if i < builtins.length prompts
+      then lib.elemAt prompts i
+      else prompt;
 
-        # We choose a single OPTION using Rofi
-        set OPTION (echo -e (string join "\n" $OPTIONS) | rofi -dmenu -p " ${prompt} " -i)
-
-        # Check if the chosen OPTION is a valid choice from OPTIONS
-        if not contains $OPTION $OPTIONS
+    # Static layer: attrset of label -> value
+    # Displays labels in rofi; maps selected label to its value -> $OPTIONi
+    mkStaticLayer = i: attrs: let
+      lp = layerPrompt i;
+      labels = builtins.attrNames attrs;
+      optsStr = "\"${lib.concatStringsSep "\" \"" (map escStr labels)}\"";
+      mkCase = label: value: "else if test \"${escStr label}\" = $_LABEL${toString i}\n    set OPTION${toString i} \"${escStr value}\"";
+      casesStr =
+        builtins.concatStringsSep "\n"
+        (builtins.attrValues (builtins.mapAttrs mkCase attrs));
+    in {
+      script = ''
+        set _OPTS${toString i} ${optsStr}
+        set _LABEL${toString i} (echo -e (string join "\n" $_OPTS${toString i}) | ${rofiCmd} -p "${lp}")
+        if not contains $_LABEL${toString i} $_OPTS${toString i}
             exit
         end
-
-        # Set a command to execute based on the chosen OPTION
         if false
-            exit # Easier to generate with this
-        ${cases attrs}
+            exit
+        ${casesStr}
         else
             exit
         end
-
-        # Execute the command
-        eval $ACTION
       '';
+    };
 
-  # TODO: I want to generate the containers menu using the actionsA and actionsB attrs:
-  #       - actionsA will be generated from the stuff in oci-containers.containers
-  #       - actionsB will be set statically for start, stop, status
+    # Dynamic layer: shell command string whose output is piped to rofi
+    # Selected text -> $OPTIONi; may reference earlier $OPTIONn variables
+    mkDynamicLayer = i: cmd: let
+      lp = layerPrompt i;
+    in {
+      script = ''
+        set OPTION${toString i} (${cmd} | ${rofiCmd} -p "${lp}")
+        if test -z $OPTION${toString i}
+            exit
+        end
+      '';
+    };
 
-  # Receives attrs like:
-  # {
-  #   optionA = "exa -1 -D ~/Notes/TU";
-  #   optionB = "exa -1 -D ~/Notes/TU/$OPTIONA/Lecture | grep \".pdf\"";
-  #   commandB = "xdg-open ~/Notes/TU/$OPTIONA/Lecture/$OPTIONB";
-  # }
-  #
-  # Keys:
-  # - optionA, optionB   # Command that generates Rofi options:
-  #                        exa -1 -D ~/Notes/TU
-  #                        cat /etc/rofi-vpns
-  # - commandA, commandB # Action to execute after sth. was chosen (mutually excl. with command)
-  # - actionsA, actionsB # Configure actions by lookup (mutually excl. with command):
-  #                        actionsB = {"status" = "systemctl status..."}
-  # - colorA, colorB     # Configure highlighting conditions:
-  #                        colorA = {"red" = "systemctl ... | grep ..."};
-  #
-  # Use $OPTIONA and $OPTIONB to use the options chosen by option<A/B>-command and rofi
-  # Use $EVALA and $EVALB to use the outputs generated by command<A/B>
-  mkMenu = let
+    mkLayer = i: layer:
+      if isStaticLayer layer
+      then mkStaticLayer i layer
+      else if isDynamicLayer layer
+      then mkDynamicLayer i layer
+      else throw "mkMenu: layer ${toString i} has invalid type";
+
+    layerResults = lib.imap0 mkLayer layers; # Map with 0-based index
+    layerScripts = map (r: r.script) layerResults;
+    lastLayer = lib.last layers;
+
+    finalCmd =
+      if command != null
+      then command
+      else if isStaticLayer lastLayer
+      then "$OPTION${toString (builtins.length layers - 1)}"
+      else throw "mkMenu: 'command' must be set when the last layer is not a static attrset";
   in
-    prompt: attrs: "";
+    pkgs.writeScriptBin "rofi-menu-${prompt}" ''
+      #! ${pkgs.fish}/bin/fish
+
+      ${lib.concatStringsSep "\n" layerScripts}
+      eval "${finalCmd}"
+    '';
 }

system/darwinix/default.nix

@@ -0,0 +1,163 @@
+{
+  self,
+  lib,
+  mylib,
+  pkgs,
+  username,
+  config,
+  inputs,
+  publicKeys,
+  hostname,
+  ...
+}: {
+  systemmodules = {
+    sops-nix.bootSecrets.${username} = [
+      "user-password"
+    ];
+
+    sops-nix.secrets.${username} = [
+      "ssh-private-key"
+      "nix-github-token"
+      "docker-password"
+      "jellyfin-password"
+    ];
+  };
+
+  nix = mylib.nixos.mkCommonNixSettings username;
+
+  networking = {
+    hostName = "${hostname}";
+    localHostName = "${hostname}";
+    computerName = "${hostname}";
+
+    applicationFirewall = {
+      enable = true;
+      enableStealthMode = false;
+      allowSigned = true;
+      allowSignedApp = true;
+      blockAllIncoming = false;
+    };
+
+    knownNetworkServices = [
+      "Wi-Fi"
+      "Thunderbold Bridge"
+    ];
+
+    dns = [
+      "192.168.86.26"
+      "8.8.8.8"
+      "8.8.4.4"
+    ];
+
+    # wg-quick = {};
+  };
+
+  power = {
+    # restartAfterFreeze = false;
+    # restartAfterPowerFailure = false;
+
+    sleep = {
+      computer = 10; # 10 minutes until sleep
+      display = 5;
+      harddisk = 5;
+    };
+  };
+
+  system = {
+    primaryUser = "${username}";
+
+    # TODO:
+    defaults = {
+      # dock = {};
+
+      trackpad = {
+        ActuateDetents = true; # Haptic feedback
+        ActuationStrength = 1;
+        Clicking = true; # Tap to click
+        Dragging = true; # Double tap to drag
+        TrackpadRightClick = true;
+        TrackpadPinch = true;
+      };
+    };
+
+    keyboard = {
+      enableKeyMapping = true;
+      swapLeftCtrlAndFn = false;
+      swapLeftCommandAndLeftAlt = false;
+    };
+  };
+
+  users.users.${username} = {
+    name = "${username}";
+    description = "Christoph";
+    uid = 501;
+    gid = 20;
+    createHome = false;
+    home = "/Users/${username}";
+    isHidden = false;
+
+    # NOTE: Not set if the user already exists on darwin, so use chsh for the root user
+    shell = pkgs.fish;
+
+    openssh.authorizedKeys.keys = [
+      publicKeys.${username}.ssh
+    ];
+
+    # packages = with pkgs; [];
+  };
+
+  environment.shells = with pkgs; [pkgs.fish];
+
+  environment.systemPackages = with pkgs; [
+    alejandra
+    neovim
+    wget
+  ];
+
+  fonts.packages = with pkgs; [
+    nerd-fonts.jetbrains-mono
+    monolisa
+  ];
+
+  programs = {
+    fish.enable = true;
+  };
+
+  services = {
+    # For another time maybe
+    # sketchybar = {};
+    # skhd = {};
+    # yabai = {};
+  };
+
+  # NOTE: Not installed automatically
+  homebrew = {
+    enable = true;
+    enableFishIntegration = true;
+
+    onActivation = {
+      autoUpdate = true;
+      cleanup = "zap"; # Uninstall unlisted casks and associated files on rebuild
+      upgrade = true;
+    };
+
+    brews = [];
+
+    casks = [
+      "alt-tab"
+      "discord"
+      "iina"
+      "nextcloud"
+      "obsidian"
+      "protonvpn"
+      "signal"
+    ];
+  };
+
+  # Set Git commit hash for darwin-version.
+  # system.configurationRevision = self.rev or self.dirtyRev or null;
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 6;
+}

system/default.nix

@@ -91,6 +91,7 @@ with mylib.networking; {
       "ssh-private-key"
       "nix-github-token"
       "docker-password"
+      "jellyfin-password"
     ];
   };
 
@@ -104,31 +105,7 @@ with mylib.networking; {
   };
 
   # Enable flakes
-  nix = {
-    package = pkgs.nixVersions.stable;
-    extraOptions = ''
-      experimental-features = nix-command flakes pipe-operators
-    '';
-
-    settings.trusted-users = ["root" "${username}"];
-
-    # Auto garbage-collect and optimize store
-    gc.automatic = false; #  Done by nh.clean.enable;
-    gc.options = "--delete-older-than 5d";
-    settings.auto-optimise-store = true;
-    optimise.automatic = true;
-
-    # This will add your inputs as registries, making operations with them (such
-    # as nix shell nixpkgs#name) consistent with your flake inputs.
-    # (Registry contains flakes)
-    registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
-
-    # Set NIX_PATH to find nixpgks
-    nixPath = [
-      "nixpkgs=${inputs.nixpkgs.outPath}"
-      "home-manager=${inputs.home-manager.outPath}"
-    ];
-  };
+  nix = mylib.nixos.mkCommonNixSettings username;
 
   # Bootloader/Kernel stuff
   boot = {
@@ -258,6 +235,7 @@ with mylib.networking; {
     description = "Christoph";
     group = "users";
     uid = 1000;
+    home = "/home/${username}";
     extraGroups = [
       "networkmanager"
       "wheel"
@@ -276,7 +254,7 @@ with mylib.networking; {
     shell = pkgs.fish;
 
     openssh.authorizedKeys.keys = [
-      publicKeys.christoph.ssh
+      publicKeys.${username}.ssh
     ];
 
     # We do this with HomeManager

system/nixinator/default.nix

@@ -124,6 +124,7 @@
         # 31431 # Parsec
         5173 # SvelteKit
         8090 # PocketBase
+        8188 # ComfyUI
       ];
 
       allowedUDPPorts = [
@@ -134,6 +135,7 @@
         # 31431 # Parsec
         5173 # SvelteKit
         8090 # PocketBase
+        8188 # ComfyUI
       ];
     };
 
@@ -156,7 +158,7 @@
   };
 
   boot = {
-    # kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
     # kernelPackages = pkgs.linuxPackages_latest;
 
     # Why do I need to know if something fails during boot???
@@ -191,7 +193,25 @@
     # };
   };
 
-  # environment.systemPackages = with pkgs; [];
+  environment.systemPackages = with pkgs; [
+    spice
+    spice-gtk
+  ];
+
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      qemu = {
+        package = pkgs.qemu_kvm;
+        # ovmf.enable = true; # deprecated
+        swtpm.enable = true;
+        runAsRoot = true;
+      };
+    };
+    spiceUSBRedirection.enable = true;
+  };
+
+  networking.firewall.trustedInterfaces = ["virbr0"]; # libvirt
 
   programs = {
     ausweisapp = {
@@ -203,6 +223,8 @@
       enable = true;
       gdb = true;
     };
+
+    virt-manager.enable = true;
   };
 
   services = {

system/servenix/default.nix

@@ -65,52 +65,13 @@
       useNetworkManager = false;
 
       networks = {
-        # "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
-        #   interface = "ens18";
-        #   ips = ["192.168.86.25/24" "fd00::19/64"];
-        #   routers = ["192.168.86.5" "fd00::5"];
-        #   nameservers = ["8.8.8.8" "2001:4860:4860::8888"]; # NOTE: Use reliable DNS for servers instead of 192.168.86.26
-        #   routable = true;
-        # };
-
-        # TODO: mylib.networking.mkStaticSystemdNetwork needs improvement to accomodate for this
-        "10-ether-1G" = rec {
-          enable = true;
-
-          # See man systemd.link, man systemd.netdev, man systemd.network
-          matchConfig = {
-            # This corresponds to the [MATCH] section
-            Name = "ens18"; # Match ethernet interface
-          };
-
-          # Static IP + DNS + Gateway
-          address = ["192.168.86.25/24"];
-          gateway = ["192.168.86.5"]; # Don't add IPv6 gateway, rely on router advertisement instead
-          dns = ["8.8.8.8" "8.8.4.4" "2001:4860:4860:8888" "2001:4860:4860:8844"];
-          routes = builtins.map (r: {Gateway = r;}) gateway;
-
-          # See man systemd.network
-          networkConfig = {
-            # This corresponds to the [NETWORK] section
-            DHCP = "no";
-
-            IPv6AcceptRA = "yes"; # Accept Router Advertisements
-            # MulticastDNS = "no";
-            # LLMNR = "no";
-            # LinkLocalAddressing = "ipv6";
-          };
-
-          addresses = [
-            {
-              # Don't add this to address, we don't want to create any routes with this
-              Address = "fd00::19/64";
-            }
-          ];
-
-          linkConfig = {
-            # This corresponds to the [LINK] section
-            RequiredForOnline = "routable";
-          };
+        "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
+          interface = "ens18";
+          ips = ["192.168.86.25/24"];
+          routers = ["192.168.86.5"]; # Don't add IPv6 gateway, rely on router advertisement instead
+          nameservers = ["8.8.8.8" "8.8.4.4" "2001:4860:4860:8888" "2001:4860:4860:8844"]; # NOTE: Use reliable DNS for servers instead of 192.168.86.26
+          routable = true;
+          extraAddresses = ["fd00::19/64"]; # IPv6 ULA — declared without creating a route
         };
       };
 

system/services/0_TEMPLATE.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -16,14 +17,7 @@ in {
       image = "TEMPLATE:${TEMPLATEVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/adguard.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "adguard/adguardhome:${adguardVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/authelia.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "authelia/authelia:${autheliaVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/bazarr.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/bazarr:${bazarrVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/box.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "stashapp/stash:${boxVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/comfyui.nix

@@ -1,24 +1,19 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
   ...
 }: let
-  comfyuiVersion = "cu128-slim-20260316";
+  # comfyuiVersion = "cu128-slim-20260316";
+  comfyuiVersion = "cu128-megapak-20260323";
 in {
   virtualisation.oci-containers.containers = {
     comfyui = {
       image = "yanwk/comfyui-boot:${comfyuiVersion}";
       autoStart = false;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -42,6 +37,13 @@ in {
         PUID = "1000";
         PGID = "1000";
         TZ = "Europe/Berlin";
+
+        # https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
+        # --use-sage-attention # => OOM
+        # --lowvram
+        # --disable-pinned-memory
+        # --cache-none
+        # CLI_ARGS = "--use-sage-attention";
       };
 
       extraOptions = [

system/services/fileflows-node.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "revenz/fileflows:${fileflowsVersion}";
       autoStart = false;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/fileflows.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "revenz/fileflows:${version}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/gitea.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -27,14 +28,7 @@ in {
       image = "postgres:14";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -59,14 +53,7 @@ in {
       image = "gitea/gitea:${giteaVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         "gitea-db"
@@ -107,14 +94,7 @@ in {
       image = "gitea/act_runner:${runnerVersion}"; # NOTE: vegardit has other runner images
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         "gitea"

system/services/immich.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -39,14 +40,7 @@ in {
       image = "redis";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/jellyfin.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/jellyfin:${jellyfinVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         # "pihole"

system/services/kopia.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -18,14 +19,7 @@ in {
       image = "kopia/kopia:${kopiaVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/nextcloud.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -33,14 +34,7 @@ in {
       image = "postgres:alpine";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -67,14 +61,7 @@ in {
       image = "redis:alpine";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -97,14 +84,7 @@ in {
       image = "nextcloud:${nextcloudVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         "nextcloud-db"

system/services/nginx-proxy-manager.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "jc21/nginx-proxy-manager:${nginxVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/paperless.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -16,14 +17,7 @@ in {
       image = "flor1der/paperless-nextcloud-sync:${paperlessNCVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -59,14 +53,7 @@ in {
       image = "redis:7";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 
@@ -87,14 +74,7 @@ in {
       image = "postgres:15";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/plex.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "plexinc/pms-docker:${plexVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         # "pihole"

system/services/portainer-agent.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -13,14 +14,7 @@ in {
       image = "portainer/agent:${portainerVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/portainer.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -12,14 +13,7 @@ in {
       image = "portainer/portainer-ce:${portainerVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/prowlarr.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/prowlarr:${prowlarrVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/pulse.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "rcourtman/pulse:${pulseVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/radarr.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/radarr:${radarrVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/sabnzbd-movies.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/sabnzbd:${sabnzbdVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/sabnzbd-shows.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/sabnzbd:${sabnzbdVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/sonarr.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "linuxserver/sonarr:${sonarrVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/teamspeak.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "teamspeaksystems/teamspeak6-server:${teamspeakVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/tinymediamanager.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "tinymediamanager/tinymediamanager:${version}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [];
 

system/services/whats-up-docker.nix

@@ -1,4 +1,5 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
@@ -11,14 +12,7 @@ in {
       image = "getwud/wud:${wudVersion}";
       autoStart = true;
 
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
+      login = mylib.containers.mkDockerLogin config;
 
       dependsOn = [
         # "pihole"

system/systemmodules/darwin.nix

@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./sops-nix
+  ];
+}

system/systemmodules/docker/default.nix

@@ -72,7 +72,6 @@ in {
         if docker.podman
         then "podman"
         else "docker"; # "docker" or "podman"
-      libvirtd.enable = true;
     };
 
     systemd.services = let

system/systemmodules/impermanence/default.nix

@@ -97,6 +97,7 @@ in {
             #       which leads to /home not being unmounted correctly during shutdown...
           ];
 
+          # TODO: I need something that lists stale folders in /persist (folders that are no longer mounted into the system)
           directories = [
             # Home directory
             (mkUDir "Downloads" m755)
@@ -151,13 +152,13 @@ in {
             (mkUDir ".config/ghidra" m755)
             (mkUDir ".config/impermanence" m755)
             (mkUDir ".config/jellyfin-mpv-shim" m755)
-            (mkUDir ".config/jellyfin-tui" m755) # TODO: Generate this config file, have to use sops because it includes the password in cleartext
+            # (mkUDir ".config/jellyfin-tui" m755) # Configured using nix
             (mkUDir ".config/JetBrains" m755)
             (mkUDir ".config/kdeconnect" m755)
             (mkUDir ".config/keepassxc" m755)
             (mkUDir ".config/Msty" m755)
             (mkUDir ".config/Nextcloud" m755)
-            (mkUDir ".config/niri/dms" m755)
+            # (mkUDir ".config/niri/dms" m755)
             (mkUDir ".config/obsidian" m755)
             (mkUDir ".config/obs-studio" m755)
             (mkUDir ".config/Signal" m755)
@@ -181,7 +182,7 @@ in {
             (mkUDir ".local/share/hytale-launcher" m755)
             (mkUDir ".local/share/Hytale" m755)
             (mkUDir ".local/share/jellyfin-desktop" m755)
-            (mkUDir ".local/share/jellyfin-tui" m755)
+            # (mkUDir ".local/share/jellyfin-tui" m755) # Configured using nix
             (mkUDir ".local/share/JetBrains" m755) # Unity
             (mkUDir ".local/share/keyrings" m755) # m700
             (mkUDir ".local/share/IsolatedStorage" m755) # JetBrains license data
@@ -202,6 +203,7 @@ in {
             (mkUDir ".local/state/lazygit" m755)
             (mkUDir ".local/state/nix" m755)
             (mkUDir ".local/state/nvim" m755)
+            (mkUDir ".local/state/waypaper" m755)
             (mkUDir ".local/state/wireplumber" m755)
           ];
         };

system/systemmodules/sops-nix/default.nix

@@ -26,17 +26,23 @@ in {
       defaultSopsFile = ./secrets.yaml;
 
       age = {
-        keyFile = lib.mkDefault "/home/${username}/.secrets/age/age.key";
+        keyFile = lib.mkDefault "${config.users.users.${username}.home}/.secrets/age/age.key";
         generateKey = false;
         sshKeyPaths = [];
       };
 
       secrets = let
         mkSecret = name: {
-          ${name} = {
-            owner = config.users.users.${username}.name;
-            group = config.users.users.${username}.group;
-          };
+          ${name} = lib.mkMerge [
+            (lib.optionalAttrs pkgs.stdenv.isLinux {
+              owner = config.users.users.${username}.name;
+              group = config.users.users.${username}.group;
+            })
+            (lib.optionalAttrs pkgs.stdenv.isDarwin {
+              owner = config.users.users.${username}.name;
+              group = "staff"; # Apparently there's no way to get the primary group?
+            })
+          ];
         };
 
         mkBootSecret = name: {

system/systemmodules/sops-nix/secrets.yaml

@@ -5,6 +5,7 @@ user-password: ENC[AES256_GCM,data:okgvaTTesCDwriI8PxhNdHZF8XgzB4yxapuFl2/CK8x4W
 ssh-private-key: ENC[AES256_GCM,data:JrRarfeS3y6b9gxg4Za5GIc5Ci3aGR+OyZxQybj4dcv2mzxXmT/bm7KOwM1zkz1PFl1xW5X82T5jte+XQOKx0+6m4ovjUgUmQUMP4E/yosp8XSdi0+YlUKBEHEJx6HqCZy+v6qx5kfp9JC6fZqCbL1J6FIqWqAoKTFXoiou1YnhmBa2fM17Q++i6TflDWiVrUS7X9xjuZFq1hz1aQXS303uvJEUOEpXdqPyJvUKJWzVsFrAwpa9FG+reO70SSc+1hBbqdw1QjrzNWh3eNnztwZURauJtVFBYUZ5ozHmWBr4aVFjYvqz+t6G1SAunmBRbVqbH4bjBv9jXXjHAB4U0wanvkJN2C+EY1zxwjyx2fWckMdhoLr9gtC1FJKMbV49UFHJ3iXWNczKj1t7LrctehEKXJa0Eb3UogYuaRxbVYbC++kD8LvL4AY8ertgc9/pxQQZmogdINJmIxKN4HTlGbX8kSDLbohZLheOfzZ5ycTlrbOjfJ1EBMLo+mJcMUW0qhFySl1aamPqTeII7lvgTOE3xV/d/9VAQTFKsftWPNkfhAJIym51bYrrMPV8AVeFQnLhSid3d3zK4w20zIQKSYnq9A8zcNhM0keddiv4XC+M=,iv:7HP7VCFpMRZXRD6GD/zFzDSBO02V/DyxKLmuDCLXTLU=,tag:Ugx81JwCP8HmhtflYoevLg==,type:str]
 nix-github-token: ENC[AES256_GCM,data:AXV0ODLhfa4M6+7clulfIKm0qCOeo3lQ+66iYgoDeR12RxZOV19UtA==,iv:1XECVKyzH3NumKwRSPKNlUwJMLFwptcG8DQ09U4LrGk=,tag:QdtvJNV8BttWjhH4v0RtRQ==,type:str]
 docker-password: ENC[AES256_GCM,data:mK5YWEQPKWBtVCgRBZvwWTdVAi8MEGbLnLeP7hfDkcc=,iv:Az8+eAK6R6xssmmbhuEsDbLU+ks8lS+qzc4L33WfefA=,tag:NSXvRhbIuRZZqRR28Tu0PQ==,type:str]
+jellyfin-password: ENC[AES256_GCM,data:ugfwgpkIiLY0O+m/UGnBB5AFPBkCcai+RQOkxiCSohE=,iv:VP+Jyv2lUIBz1dFow038uN0KT+tQKK9uGr7/T5crlgk=,tag:rPGPpaqZApfHkecLBSs4Yw==,type:str]
 #
 #ENC[AES256_GCM,data:y5dlZFhK38dR+Q==,iv:1JYizUeyWeMR4KUblkj7kVSHPCL5l8mFpaQdo774BcM=,tag:kUTnBZb46KYQyi8bgIYSOQ==,type:comment]
 #
@@ -33,7 +34,7 @@ sops:
             SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h
             FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-19T01:29:00Z"
-    mac: ENC[AES256_GCM,data:IzLYRuOlkUpry37sw7OB5MglntVflMjCcNiWpi7rvT2suOivLX9IT36qZFfYIbVIFXDmfsi1hsTvsPyekD7vVWQ1vkajAlGQYYTVpnO2cFrK3+TfWCyYjiD01rQBiRikybrR11zWRq6atieurDIxMUMEI7ypiqFOwpYaqSePAFc=,iv:9bc6rc4gjuiJWNjg1g0KfySqxnPjpzmlzDi/R+Iv2g4=,tag:tEwthVZAmdXbwRtoNykGrQ==,type:str]
+    lastmodified: "2026-03-26T19:30:04Z"
+    mac: ENC[AES256_GCM,data:DGsz+TNyYXuX45Go4fkFDoWePhx1KUzq94awp+1bQtmq2MC+bPJrTNqvhBDx/I2OWFUNSh/0lXJVvaz4gfeYT9z8YCniJeb3z53ui7ldFL0BNnA6ua1iIViWbJvYARgWlSiuU7wTsb8om57Kainkpm9C9pp2U+vQqQ4suxLmrko=,iv:sUibX01AHDrscPqz+gIPyJhLRJYkyW4DPcQ3QtUGha0=,tag:8yuSGHMg1Z7kDMo2Bx4QlA==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.12.2

system/thinknix/default.nix

@@ -46,52 +46,13 @@
       useNetworkManager = false;
 
       networks = {
-        # "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
-        #   interface = "ens18";
-        #   ips = ["192.168.86.26/24" "fd00::1a/64"];
-        #   routers = ["192.168.86.5" "fd00::5"];
-        #   nameservers = ["8.8.8.8" "2001:4860:4860::8888"]; # NOTE: Use reliable DNS for servers instead of 127.0.0.1
-        #   routable = true;
-        # };
-
-        # TODO: mylib.networking.mkStaticSystemdNetwork needs improvement to accomodate for this
-        "10-ether-1G" = rec {
-          enable = true;
-
-          # See man systemd.link, man systemd.netdev, man systemd.network
-          matchConfig = {
-            # This corresponds to the [MATCH] section
-            Name = "ens18"; # Match ethernet interface
-          };
-
-          # Static IP + DNS + Gateway
-          address = ["192.168.86.26/24"];
-          gateway = ["192.168.86.5"]; # Don't add "fd00::5", rely on router advertisement instead
-          dns = ["8.8.8.8" "8.8.4.4" "2001:4860:4860::8888" "2001:4860:4860::8844"];
-          routes = builtins.map (r: {Gateway = r;}) gateway;
-
-          # See man systemd.network
-          networkConfig = {
-            # This corresponds to the [NETWORK] section
-            DHCP = "no";
-
-            IPv6AcceptRA = "yes"; # Accept Router Advertisements
-            # MulticastDNS = "no";
-            # LLMNR = "no";
-            # LinkLocalAddressing = "ipv6";
-          };
-
-          addresses = [
-            {
-              # Don't add this to address, we don't want to create any routes with this
-              Address = "fd00::1a/64"; # IPv6 Unique-Local Address (ULA)
-            }
-          ];
-
-          linkConfig = {
-            # This corresponds to the [LINK] section
-            RequiredForOnline = "routable";
-          };
+        "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
+          interface = "ens18";
+          ips = ["192.168.86.26/24"];
+          routers = ["192.168.86.5"]; # Don't add "fd00::5", rely on router advertisement instead
+          nameservers = ["8.8.8.8" "8.8.4.4" "2001:4860:4860::8888" "2001:4860:4860::8844"]; # NOTE: Use reliable DNS for servers instead of 127.0.0.1
+          routable = true;
+          extraAddresses = ["fd00::1a/64"]; # IPv6 ULA — declared without creating a route
         };
       };