Home: Extract common nixos/darwin packages/programs/module-configs into terminal+packages modules

System: Use lib.networking to configure static networks
Lib/Networking: Add option to configure route-less addresses
2026-03-24 11:58:45 +01:00 · 2026-03-24 11:32:11 +01:00 · 2026-03-24 11:31:56 +01:00 · 2026-03-24 11:30:38 +01:00 · 2026-03-24 11:30:22 +01:00 · 2026-03-24 11:29:21 +01:00
73 changed files with 1617 additions and 1199 deletions
--- a/Btop.png
+++ b/Btop.png
--- a/Darwin.png
+++ b/Darwin.png
--- a/FastFetch.png
+++ b/FastFetch.png
--- a/NeoVim.png
+++ b/NeoVim.png
--- a/Niri.png
+++ b/Niri.png
--- a/README.md
+++ b/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`.
--- a/Rmpc.png
+++ b/Rmpc.png
--- a/flake.lock
+++ b/flake.lock
@ -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,
@ -593,16 +614,16 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1767313136,
-        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
+        "lastModified": 1773814637,
+        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
+        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -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",
--- a/flake.nix
+++ b/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,20 @@
    # 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 = [];
+      };
+    };
+
    # 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
--- a/home/christoph/darwinix/default.nix
+++ b/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 = {};
+  };
+}
--- a/home/christoph/default.nix
+++ b/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;
-      };
-
+      rofi.enable = false;
+      terminal.enable = true;
      waybar.enable = !headless;
-      yazi.enable = true;
      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 = 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";
-            }
-          ];
-        };
-      };
-
-      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 = {
--- a/home/christoph/nixinator/default.nix
+++ b/home/christoph/nixinator/default.nix
@ -101,6 +101,7 @@
        jellyfin-mpv-shim
        # tidal-hifi
        # tidal-dl-ng # TODO: Borked
+        # spotdl
        tiddl
        picard
        handbrake
--- a/home/homemodules/bat/default.nix
+++ b/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";
+      };
+    };
+  };
+}
--- a/home/homemodules/bat/options.nix
+++ b/home/homemodules/bat/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable bat";
+}
--- a/home/homemodules/cava/default.nix
+++ b/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}'";
+        };
+      };
+    };
+  };
+}
--- a/home/homemodules/cava/options.nix
+++ b/home/homemodules/cava/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable cava";
+}
--- a/home/homemodules/darwin.nix
+++ b/home/homemodules/darwin.nix
@ -0,0 +1,24 @@
+{inputs, ...}: {
+  imports = [
+    # My own HM modules
+    ./bat
+    ./btop
+    ./color
+    ./fastfetch
+    ./fish
+    ./git
+    ./kitty
+    ./lazygit
+    ./neovim
+    ./packages
+    ./paths
+    ./ssh
+    ./terminal
+    ./tmux
+    ./yazi
+
+    # HM modules imported from the flake inputs
+    inputs.nixvim.homeModules.nixvim
+    inputs.textfox.homeManagerModules.default
+  ];
+}
--- a/home/homemodules/default.nix
+++ b/home/homemodules/default.nix
@ -3,11 +3,14 @@
    # Obsolete modules are kept in "1_deprecated" for reference.

    # My own HM modules
+    ./bat
    ./beets
    ./btop
+    ./cava
    ./chromium
    ./color
    ./docs
+    ./fastfetch
    ./fcitx
    ./firefox
    ./fish
@ -18,11 +21,15 @@
    ./neovim
    ./niri
    ./nnn
+    ./packages
    ./paths
    ./qutebrowser
    ./rmpc
    ./rofi
    ./waybar
+    ./ssh
+    ./terminal
+    ./tmux
    ./yazi
    ./zathura

--- a/home/homemodules/fastfetch/default.nix
+++ b/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";
+          }
+        ];
+      };
+    };
+  };
+}
--- a/home/homemodules/fastfetch/options.nix
+++ b/home/homemodules/fastfetch/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable fastfetch";
+}
--- a/home/homemodules/fish/default.nix
+++ b/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/.*' -width 120";
-            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;
--- a/home/homemodules/kitty/default.nix
+++ b/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;
+        }
+      ];
    };
  };
 }
--- a/home/homemodules/neovim/default.nix
+++ b/home/homemodules/neovim/default.nix
@ -126,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;

@ -552,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;
@ -2160,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
--- a/home/homemodules/neovim/mappings.nix
+++ b/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 = [
--- a/home/homemodules/neovim/neovide_config.ini
+++ b/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
--- a/home/homemodules/neovim/vim_opts.nix
+++ b/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;
--- a/home/homemodules/niri/default.nix
+++ b/home/homemodules/niri/default.nix
@ -77,6 +77,40 @@ in {
      file = {
        # Link theme for flatpak
        ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
+
+        ".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 = {
@ -96,7 +130,7 @@ in {
        xwayland-satellite
        # ncpamixer # Audio control
        wiremix # Audio control
-        swaybg
+        swww
        waypaper

        # GTK apps (look good and work well with xdg portals)
@ -113,6 +147,41 @@ 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;
@ -367,7 +436,7 @@ in {

          spawn-at-startup = [
            {argv = ["ashell" "-c" "${config.paths.dotfiles}/ashell/config.toml"];}
-            {argv = ["waypaper" "--backend" "swaybg" "--fill" "fill" "--monitor" "All" "--folder" "${config.paths.nixflake}/wallpapers" "--random"];}
+            {argv = ["waypaper" "--restore"];}

            {argv = ["kitty" "--hold" "fastfetch"];}
            {argv = ["fcitx5"];}
@ -457,6 +526,11 @@ in {
              top = 4; # Somehow the bar eclusivity doesn't work as expected
              bottom = 2;
            };
+
+            shadow = {
+              enable = true;
+              draw-behind-window = true;
+            };
          };

          gestures = {
@ -557,6 +631,10 @@ in {
              # Waybar rounded corners background clipping fix
              matches = [{namespace = "waybar";}];
              opacity = 0.99;
+              shadow = {
+                enable = true;
+                draw-behind-window = true;
+              };
            }
          ];

@ -601,12 +679,12 @@ in {
              hotkey-overlay = {title = "Edit the NixFlake.";};
            };
            "Mod+W" = {
-              action = spawn "waypaper" "--backend" "swaybg" "--fill" "fill";
+              action = spawn "waypaper";
              hotkey-overlay = {title = "Open wallpaper chooser.";};
            };
            "Mod+Shift+W" = {
-              action = spawn "waypaper" "--backend" "swaybg" "--fill" "fill" "--monitor" "All";
-              hotkey-overlay = {title = "Switch wallpaper.";};
+              action = spawn "waypaper" "--random";
+              hotkey-overlay = {title = "Select random wallpaper.";};
            };

            "Mod+A" = {
--- a/home/homemodules/packages/default.nix
+++ b/home/homemodules/packages/default.nix
@ -0,0 +1,217 @@
+{
+  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 {
+    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
+
+          # 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
+
+          # Use NixCommunity binary cache
+          cachix
+        ]
+
+        # Common !headless packages
+        (lib.optionals (!headless) [
+          ripdrag # drag & drop from terminal
+          jellyfin-tui
+        ])
+
+        # 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)) [
+          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
+          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
+          # protonvpn-gui
+          # 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;
+      };
+    };
+  };
+}
--- a/home/homemodules/packages/options.nix
+++ b/home/homemodules/packages/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable common packages";
+}
--- a/home/homemodules/ssh/default.nix
+++ b/home/homemodules/ssh/default.nix
@ -0,0 +1,70 @@
+{
+  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 = "no";
+          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;
+            }
+          ];
+        };
+      };
+    };
+  };
+}
--- a/home/homemodules/ssh/options.nix
+++ b/home/homemodules/ssh/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable ssh";
+}
--- a/home/homemodules/terminal/default.nix
+++ b/home/homemodules/terminal/default.nix
@ -0,0 +1,43 @@
+{
+  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;
+      };
+
+      kitty.enable = true;
+      lazygit.enable = true;
+
+      neovim = {
+        enable = true;
+        alias = true;
+        neovide = !headless;
+      };
+
+      ssh.enable = true;
+      tmux.enable = true;
+      yazi.enable = true;
+    };
+  };
+}
--- a/home/homemodules/terminal/options.nix
+++ b/home/homemodules/terminal/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable terminal tools";
+}
--- a/home/homemodules/tmux/default.nix
+++ b/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"
+      '';
+    };
+  };
+}
--- a/home/homemodules/tmux/options.nix
+++ b/home/homemodules/tmux/options.nix
@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable tmux";
+}
--- a/home/homemodules/waybar/default.nix
+++ b/home/homemodules/waybar/default.nix
@ -24,13 +24,13 @@ in {
          output = waybar.monitors;

          modules-left = ["custom/launcher" "niri/workspaces" "niri/window"]; # "user"
-          modules-center = ["systemd-failed-units" "mpris"];
+          modules-center = ["mpris"]; # "systemd-failed-units"
          modules-right = ["privacy" "pulseaudio" "network" "disk" "cpu" "memory" "clock" "tray"];

          "custom/launcher" = {
            format = "<span></span>";
            interval = "once";
-            on-click = "rofi -drun-show-actions -show drun";
+            on-click = "walker -m desktopapplications";
          };

          systemd-failed-units = {
@ -77,11 +77,11 @@ in {
                tooltip = true;
                tooltip-icon-size = 24;
              }
-              {
-                type = "audio-out";
-                tooltip = true;
-                tooltip-icon-size = 24;
-              }
+              # {
+              #   type = "audio-out";
+              #   tooltip = true;
+              #   tooltip-icon-size = 24;
+              # }
              {
                type = "audio-in";
                tooltip = true;
@ -105,30 +105,29 @@ in {
          };

          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 = {
-            states = {
-              "warning" = 65;
-              "critical" = 85;
-            };
+            interval = 1;
+            # states = {
+            #   "critical" = 85;
+            # };
            format = "<span></span> {load}%";
-            format-warning = "<span color='#${color.hex.yellow}'><span></span> {load}%</span>";
-            format-critical = "<span color='#${color.hex.red}'><span></span> {load}%</span>";
+            # format-critical = "<span color='#${color.hex.red}'><span></span> {load}%</span>";
            on-click = "kitty --title=Btop btop";
            tooltip = false;
          };

          memory = {
-            states = {
-              "warning" = 65;
-              "critical" = 85;
-            };
+            interval = 1;
+            # states = {
+            #   "critical" = 85;
+            # };
            format = "<span></span> {percentage}%";
-            format-warning = "<span color='#${color.hex.yellow}'><span></span> {percentage}%</span>";
-            format-critical = "<span color='#${color.hex.red}'><span></span> {percentage}%</span>";
+            # 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";
@ -144,7 +143,7 @@ in {
              mode-mon-col = 3;
              on-scroll = -1;
              format = {
-                months = "<span color='#${color.hex.yellow}'><b>{}</b></span>";
+                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>";
@ -194,24 +193,26 @@ in {
        }

        /* Background colors */
-        #custom-launcher          {background-color: #${color.hex.accent};}
-        #workspaces button        {background-color: #${color.hex.lavender};}
-        #workspaces button.active {background-color: #${color.hex.pink};}
-        #window                   {background-color: #${color.hex.maroon};}
-        #systemd-failed-units     {background-color: #${color.hex.red};}
-        #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};}
+        #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,
-        #systemd-failed-units,
        #mpris,
        #tray {
          color: #${color.hex.mantle};
@ -260,10 +261,6 @@ in {
          margin: 0px 5px 0px 0px;
        }

-        #systemd-failed-units {
-          margin: 0px 5px 0px 0px;
-        }
-
        #tray {
          margin: 0px 0px 0px 5px;
        }
--- a/lib/containers.nix
+++ b/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}";
+  };
+}
--- a/lib/default.nix
+++ b/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;};
 }
--- a/lib/networking.nix
+++ b/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 = {
--- a/lib/nixos.nix
+++ b/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 # TODO:
+        ]
+
+        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,
--- a/system/darwinix/default.nix
+++ b/system/darwinix/default.nix
@ -0,0 +1,147 @@
+{
+  self,
+  lib,
+  mylib,
+  pkgs,
+  username,
+  config,
+  inputs,
+  publicKeys,
+  hostname,
+  ...
+}: {
+  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} = {
+    isHidden = false;
+    description = "Christoph";
+    home = "/Users/${username}";
+    createHome = 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;
+}
--- a/system/default.nix
+++ b/system/default.nix
@ -104,31 +104,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 = {
@ -276,7 +252,7 @@ with mylib.networking; {
    shell = pkgs.fish;

    openssh.authorizedKeys.keys = [
-      publicKeys.christoph.ssh
+      publicKeys.${username}.ssh
    ];

    # We do this with HomeManager
--- a/system/nixinator/default.nix
+++ b/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
      ];
    };

--- a/system/servenix/default.nix
+++ b/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
        };
      };

--- a/system/services/0_TEMPLATE.nix
+++ b/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 = [];

--- a/system/services/adguard.nix
+++ b/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 = [];

--- a/system/services/authelia.nix
+++ b/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 = [];

--- a/system/services/bazarr.nix
+++ b/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 = [];

--- a/system/services/box.nix
+++ b/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 = [];

--- a/system/services/comfyui.nix
+++ b/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 = [
--- a/system/services/fileflows-node.nix
+++ b/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 = [];

--- a/system/services/fileflows.nix
+++ b/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 = [];

--- a/system/services/gitea.nix
+++ b/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"
--- a/system/services/immich.nix
+++ b/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 = [];

--- a/system/services/jellyfin.nix
+++ b/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"
--- a/system/services/kopia.nix
+++ b/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 = [];

--- a/system/services/nextcloud.nix
+++ b/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"
--- a/system/services/nginx-proxy-manager.nix
+++ b/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 = [];

--- a/system/services/paperless.nix
+++ b/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 = [];

--- a/system/services/plex.nix
+++ b/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"
--- a/system/services/portainer-agent.nix
+++ b/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 = [];

--- a/system/services/portainer.nix
+++ b/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 = [];

--- a/system/services/prowlarr.nix
+++ b/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 = [];

--- a/system/services/pulse.nix
+++ b/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 = [];

--- a/system/services/radarr.nix
+++ b/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 = [];

--- a/system/services/sabnzbd-movies.nix
+++ b/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 = [];

--- a/system/services/sabnzbd-shows.nix
+++ b/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 = [];

--- a/system/services/sonarr.nix
+++ b/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 = [];

--- a/system/services/teamspeak.nix
+++ b/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 = [];

--- a/system/services/tinymediamanager.nix
+++ b/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 = [];

--- a/system/services/whats-up-docker.nix
+++ b/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"
--- a/system/systemmodules/impermanence/default.nix
+++ b/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)
@ -168,7 +169,6 @@ in {
            # (mkUDir ".config/unity3d" m755) # Unity
            # (mkUDir ".config/unityhub" m755) # Unity
            (mkUDir ".config/vlc" m755)
-            (mkUDir ".config/waypaper" m755)
            (mkUDir ".config/Zeal" m755)
            (mkUDir ".config/zed" m755)

@ -203,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)
          ];
        };
--- a/system/thinknix/default.nix
+++ b/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
        };
      };
Author	SHA1	Message	Date
Christoph Urlacher	5f17a04fbb	Home: Extract common nixos/darwin packages/programs/module-configs into terminal+packages modules	2026-03-24 11:58:45 +01:00
Christoph Urlacher	f514387f64	System: Use lib.networking to configure static networks	2026-03-24 11:32:11 +01:00
Christoph Urlacher	c328c188b8	Lib/Networking: Add option to configure route-less addresses	2026-03-24 11:31:56 +01:00
Christoph Urlacher	585f74ce0f	System: Use common nix configuration	2026-03-24 11:30:38 +01:00
Christoph Urlacher	8263fe01eb	Lib/Nixos: Add common nix configuration	2026-03-24 11:30:22 +01:00
Christoph Urlacher	d61e6f8b9c	Services: Use common dockerhub login	2026-03-24 11:29:21 +01:00
Christoph Urlacher	7c7c195083	Lib/Containers: Add common dockerhub login	2026-03-24 11:27:22 +01:00
Christoph Urlacher	2e78898c5a	Modules/Neovim: Add devdocs integration plugin	2026-03-24 10:38:34 +01:00
Christoph Urlacher	1f61e9958c	System/Darwinix: Add signal cask	2026-03-23 13:56:54 +01:00
Christoph Urlacher	c8954e5854	Home/Darwinix: Add speedtest-cli	2026-03-23 13:42:23 +01:00
Christoph Urlacher	e772d93f23	Home: Add speedtest-cli	2026-03-23 13:42:00 +01:00
Christoph Urlacher	4c17560020	Services/Comfyui: Update launch args	2026-03-23 13:06:43 +01:00
Christoph Urlacher	e1542a1168	System/Darwinix: Add casks (obsidian, discord, ...)	2026-03-23 13:02:46 +01:00
Christoph Urlacher	a351bf59ba	Services/Comfyui: Update image + launch args	2026-03-23 11:19:43 +01:00
Christoph Urlacher	7a62f38084	Modules/Waybar: Update widget intervals	2026-03-23 11:19:34 +01:00
Christoph Urlacher	b50c5f9f71	Modules/Fish: Update abbrs	2026-03-23 11:19:17 +01:00
Christoph Urlacher	0087145957	Services/ComfyUI: Open port	2026-03-23 10:37:29 +01:00
Christoph Urlacher	48c77e9654	System/Darwinix: Move sketchybar to correct location	2026-03-23 00:34:34 +01:00
Christoph Urlacher	71d06d61b1	Modules/Fish: Update abbrs for nix-darwin	2026-03-23 00:24:11 +01:00
Christoph Urlacher	75d024111e	Home/Darwinix: Enable sketchybar	2026-03-23 00:21:19 +01:00
Christoph Urlacher	b67aee2a64	Modules/Waybar: Update workspace widget colors (empty/occupied/active/urgent)	2026-03-23 00:20:59 +01:00
Christoph Urlacher	554a76b585	Modules/Waybar: Update warning colors	2026-03-22 23:24:19 +01:00
Christoph Urlacher	d9e7e315da	Modules/Waybar: Disable systemd-failed-units widget	2026-03-22 23:15:48 +01:00
Christoph Urlacher	daee8da3ae	Home: Move bat/cava/fastfetch/ssh/tmux configs to modules + deduplicate nix-darwin home config	2026-03-22 23:03:19 +01:00
Christoph Urlacher	c2b661adbb	System/Darwinix: Update trackpad/keyboard config	2026-03-22 22:43:08 +01:00
Christoph Urlacher	aa4ebfbc06	Home: Update nixinator ssh config	2026-03-22 22:42:28 +01:00
Christoph Urlacher	db850552e3	Add nix-darwin screenshot	2026-03-21 16:19:47 +01:00
Christoph Urlacher	63afac3d04	Modules/Fish: Add nix-darwin homebrew environment setup	2026-03-21 15:50:27 +01:00
Christoph Urlacher	645fc64ead	System/Darwinix: Set known network services	2026-03-21 15:41:48 +01:00
Christoph Urlacher	6561d4c979	Home/Darwinix: Set environment variables	2026-03-21 15:40:36 +01:00
Christoph Urlacher	f1ed339968	System/Darwinix: System settings	2026-03-21 15:39:01 +01:00
Christoph Urlacher	50d14ecf83	Home/Darwinix: Remove non-available packages	2026-03-21 15:03:34 +01:00
Christoph Urlacher	1cdc3f25e0	System/Darwinix: Add fonts	2026-03-21 15:00:32 +01:00
Christoph Urlacher	9e62f755bb	Modules/Neovim: Don't hardcode home directory	2026-03-21 14:46:11 +01:00
Christoph Urlacher	d0e6fe072a	Home/Darwinix: Disable keychain	2026-03-21 14:34:13 +01:00
Christoph Urlacher	86ea11c8e8	Modules/Fish: Add darwin rebuild abbr	2026-03-21 14:34:06 +01:00
Christoph Urlacher	1adacf5e1e	Home/Darwinix: Add programs	2026-03-21 14:18:23 +01:00
Christoph Urlacher	e53787deae	Modules/Fish: Update for nix-darwin	2026-03-21 14:18:10 +01:00
Christoph Urlacher	efce5c6293	Home/Darwinix: Add packages	2026-03-21 14:06:55 +01:00
Christoph Urlacher	6069a12e64	Modules/Neovim: Update for nix-darwin	2026-03-21 14:01:01 +01:00
Christoph Urlacher	91bd79a051	Modules/Kitty: Update for nix-darwin	2026-03-21 13:56:24 +01:00
Christoph Urlacher	9bec5f42b1	Modules/Fish: Update for nix-darwin	2026-03-21 13:44:12 +01:00
Christoph Urlacher	602aa4cd56	Initialize nix-darwin config for darwinix	2026-03-21 13:28:25 +01:00
Christoph Urlacher	3573a705af	Home: Disable rofi	2026-03-21 11:49:04 +01:00
Christoph Urlacher	615d886a98	Update screenshots	2026-03-21 11:22:51 +01:00
Christoph Urlacher	4416f39f0c	Modules/Niri: Enable dunst	2026-03-21 11:21:02 +01:00
Christoph Urlacher	0bb481c037	Modules/Niri: Use waypaper with swww backend instead of swaybg	2026-03-21 10:59:19 +01:00
Christoph Urlacher	98a3788f4f	Modules/Niri: Add wallpaper switcher keybindings	2026-03-21 01:45:07 +01:00