Modules/Neovim: Add perlnavigator lsp in addition to PLS

config/flake.nix

@@ -98,38 +98,65 @@ rec {
         buildDebug = mkBuildScript "Debug";
         buildRelease = mkBuildScript "Release";
 
-        # Use this to specify commands that should be ran after entering fish shell
+        # Add project-local fish abbrs here
-        initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
+        abbrs = {
-          echo "Entering \"${description}\" environment..."
-
-          # Determine the project root, used e.g. in cmake scripts
-          set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
-
           # Rust Bevy:
-          # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
+          # build-release-windows = "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc";
 
           # C/C++:
-          # abbr -a cmake-debug "${cmakeDebug}"
+          # cmake-debug = "${cmakeDebug}";
-          # abbr -a cmake-release "${cmakeRelease}"
+          # cmake-release = "${cmakeRelease}";
-          # abbr -a build-debug "${buildDebug}"
+          # build-debug = "${buildDebug}";
-          # abbr -a build-release "${buildRelease}"
+          # build-release = "${buildRelease}";
 
           # Clojure:
-          # abbr -a clojure-deps "deps-lock --lein"
+          # clojure-deps = "deps-lock --lein";
 
           # Python:
-          # abbr -a run "python ./app/main.py"
+          # run = "python ./app/main.py";
-          # abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
+          # profile = "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg";
-          # abbr -a ptop "py-spy top -- python ./app/main.py"
+          # ptop = "py-spy top -- python ./app/main.py";
+        };
+
+        eraseAbbr = name: value: ''abbr --erase ${name} 2>/dev/null'';
+        createAbbr = name: value: ''abbr -a ${name} "${value}"'';
+
+        # This will be sourced by the global fish config if INIT_PROJECT_SHELL gets unset
+        unloadProjectShell = pkgs.writers.writeFish "unload-shell.fish" ''
+          echo "Unloading \"${description}\" environment..."
+
+          ${builtins.concatStringsSep "\n" (lib.mapAttrsToList eraseAbbr abbrs)}
+        '';
+
+        # This will be sourced by the global fish config if INIT_PROJECT_SHELL gets set
+        initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
+          # Unload just in case, to not have redefinition errors
+          source ${unloadProjectShell}
+
+          echo "Sourcing \"${description}\" environment..."
+
+          ${builtins.concatStringsSep "\n" (lib.mapAttrsToList createAbbr abbrs)}
         '';
       in
         builtins.concatStringsSep "\n" [
           # Launch into pure fish shell
           ''
-            exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
+            # Determine the project root, used e.g. in cmake scripts
+            export FLAKE_PROJECT_ROOT="$(git rev-parse --show-toplevel)"
+
+            # Can't do the "exec" with nix-direnv
+            # - The "exec fish" would call direnv again => Infinite loop
+            # - The shellHook is Bash/POSIX, so fish syntax doesn't work
+
+            # Use this for "nix develop" without direnv
+            # exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
+
+            # Use this for direnv without "nix develop"
+            export INIT_PROJECT_SHELL="${initProjectShell}"
+            export UNLOAD_PROJECT_SHELL="${unloadProjectShell}"
           ''
 
-          # Qt: Launch into wrapped fish shell
+          # Qt: Launch into wrapped fish shell (direnv incompatible)
           # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
           # ''
           #   fishdir=$(mktemp -d)

config/navi/christoph.cheat

@@ -238,11 +238,11 @@ $ mode: echo -e "--export            \tExport public key\n--export-secret-keys\t
 
 % sops
 # Edit secrets.yaml
-sops ~/NixFlake/system/modules/sops-nix/secrets.yaml
+sops ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
 
 % sops
 # Rekey secrets.yaml
-sops updatekeys ~/NixFlake/system/modules/sops-nix/secrets.yaml
+sops updatekeys ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
 
 % ssh
 # Generate a new SSH key
@@ -308,27 +308,33 @@ mkdir -p "<name>" && cd "<name>" && spotdl --client-id (cat /home/christoph/.sec
 
 % ffmpeg
 # Create a slow motion version of a video with interpolated/blended frames
-ffmpeg -i "<input>" -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
+ffmpeg -i <input> -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
 $ input: eza -f -1
 
 % ffmpeg
 # Detect black bar dimensions automatically by looking at the first 10 frames
-ffmpeg -i "<input>" -vframes 10 -vf cropdetect -f null -
+ffmpeg -i <input> -vframes 10 -vf cropdetect -f null -
 $ input: eza -f -1
 
 % ffmpeg
 # Preview video with applied crop settings
-ffplay -vf crop=<width>:<height>:<x>:<y> "<input>"
+ffplay -vf crop=<width>:<height>:<x>:<y> <input>
 $ input: eza -f -1
 
 % ffmpeg
 # Re-encode the video with applied crop settings
-ffmpeg -i "<input>" -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
+ffmpeg -i <input> -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
 $ input: eza -f -1
 
 % ffmpeg
 # Reencode and compress the video using the h265 codec
-ffmpeg -i "<input>" -vcodec libx265 -crf <quality> "out_<input>"
+ffmpeg -i <input> -vcodec libx265 -crf <quality> out_<input>
+$ input: eza -f -1
+$ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
+
+% ffmpeg
+# Reencode, compress and scale the video using the h265 codec
+ffmpeg -i <input> -vcodec libx265 -crf <quality> -vf scale=<width>:-2,setsar=1:1 out_<input>
 $ input: eza -f -1
 $ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
 

config/obsidian/css_snippets/bordered_image.css

@@ -0,0 +1,10 @@
+.bordered-images img {
+  border-radius: var(--callout-radius);
+  /* border-style: solid; */
+  /* border-width: var(--callout-border-width); */
+  /* border-color: var(--color-purple-rgb); */
+  /* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); */
+
+  /* Background color so PNGs with transparent backgrounds don't look weird */
+  /* background-color: var(--background-secondary); */
+}

config/obsidian/css_snippets/center_image.css

@@ -1,5 +1,5 @@
-img[alt*="center"] {
+.center-images img {
-  display: block;
+  display: block !important;
-  margin-left: auto;
+  margin-left: auto !important;
-  margin-right: auto;
+  margin-right: auto !important;
 }

config/obsidian/css_snippets/fullwidth_image.css

@@ -0,0 +1,4 @@
+.fullwidth-images img {
+  width: 100% !important;
+  height: auto !important;
+}

config/obsidian/css_snippets/justify_text.css

@@ -0,0 +1,5 @@
+.justify-text.cm-s-obsidian,
+.justify-text.markdown-preview-view {
+  text-align: justify;
+  hyphens: auto;
+}

flake.lock

@@ -1,5 +1,24 @@
 {
   "nodes": {
+    "comfyui-nix": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1776979072,
+        "narHash": "sha256-1BUQDAMWGVcUhPuI5JFQmCTYlBmN/Fmon6MGmaKXrCk=",
+        "owner": "utensils",
+        "repo": "comfyui-nix",
+        "rev": "8a90889efc8fae81a8e03b8d9a8406c9f8ff425b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "utensils",
+        "repo": "comfyui-nix",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1754269165,
@@ -17,7 +36,7 @@
     },
     "devshell": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1768818222,
@@ -33,6 +52,28 @@
         "type": "github"
       }
     },
+    "direnv-instant": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1776984766,
+        "narHash": "sha256-QkT7k2MCfPDcmAXwTC0ZDbMxD1UX2l7SkDPWWoAE4ZY=",
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "rev": "c51044f2cf19a5361bb8b3a50e9206ba4b6eaa26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -56,15 +97,15 @@
     },
     "elephant": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1773079031,
+        "lastModified": 1775706155,
-        "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=",
+        "narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=",
         "owner": "abenz1267",
         "repo": "elephant",
-        "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c",
+        "rev": "376ee71c66db38683daabd57350bf3f6f086eaf8",
         "type": "github"
       },
       "original": {
@@ -96,29 +137,6 @@
         "type": "github"
       }
     },
-    "firefox-addons": {
-      "inputs": {
-        "nixpkgs": [
-          "textfox",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1754512310,
-        "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2",
-        "type": "gitlab"
-      },
-      "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -165,6 +183,45 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "direnv-instant",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "lanzaboote",
@@ -185,7 +242,7 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -193,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1775087534,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -206,7 +263,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -287,11 +344,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1772972630,
+        "lastModified": 1776983936,
-        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
         "type": "github"
       },
       "original": {
@@ -307,11 +364,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773332277,
+        "lastModified": 1777594677,
-        "narHash": "sha256-1V+wRrZD9Sw12AQBUWk9CR+XhDZQ8q6yBE0S3Wjbd1M=",
+        "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4aeef1941f862fe3a70d1b8264b4e289358c2325",
+        "rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
         "type": "github"
       },
       "original": {
@@ -343,14 +400,14 @@
     },
     "hytale-launcher": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1773947929,
+        "lastModified": 1777394001,
-        "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
+        "narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=",
         "owner": "JPyke3",
         "repo": "hytale-launcher-nix",
-        "rev": "a8d0a974b187f0997c03c23000dea552194edf39",
+        "rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8",
         "type": "github"
       },
       "original": {
@@ -362,7 +419,7 @@
     "impermanence": {
       "inputs": {
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1769548169,
@@ -382,7 +439,7 @@
       "inputs": {
         "crane": "crane",
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -412,11 +469,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773343116,
+        "lastModified": 1776677689,
-        "narHash": "sha256-5wnd9z3atP264FMin5MNq4ZaOR/2SYYspFXw8cecrKA=",
+        "narHash": "sha256-wzdMqyyNkEPEfuCqSTzaz3ikH3+Rm7oWILNcURNax34=",
         "ref": "refs/heads/main",
-        "rev": "6248c10a251c5f2628389b982919ba4a8125d71e",
+        "rev": "768d26aa3fe80949bd64f62d6c5b35455c8cb768",
-        "revCount": 139,
+        "revCount": 140,
         "type": "git",
         "url": "https://gitea.local.chriphost.de/christoph/cpp-masssprings"
       },
@@ -428,7 +485,7 @@
     "naersk": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1763384566,
@@ -456,11 +513,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1773329386,
+        "lastModified": 1777542749,
-        "narHash": "sha256-Xoy4j0NKRrZEAkiFxtTKTsmtUumpvjh3ievyat00eA8=",
+        "narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "815e692569fbb01701770a49ad2fe942cec7f431",
+        "rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
         "type": "github"
       },
       "original": {
@@ -489,11 +546,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1773130184,
+        "lastModified": 1777468255,
-        "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
+        "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
+        "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
         "type": "github"
       },
       "original": {
@@ -506,14 +563,14 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1771150922,
+        "lastModified": 1776242217,
-        "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
+        "narHash": "sha256-TRts0fKUPFcf1i6rZHFGUDTfti/x3oKEg/CqsPRpSgs=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
+        "rev": "4c5e52dda0d6ab3de814e364046769321d3e1021",
         "type": "github"
       },
       "original": {
@@ -529,11 +586,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773000227,
+        "lastModified": 1775037210,
-        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
+        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
+        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
         "type": "github"
       },
       "original": {
@@ -567,11 +624,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771130777,
+        "lastModified": 1775970782,
-        "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
+        "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
+        "rev": "bedba5989b04614fc598af9633033b95a937933f",
         "type": "github"
       },
       "original": {
@@ -581,6 +638,69 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1766902085,
+        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1762156382,
         "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
@@ -596,39 +716,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1773222311,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1773814637,
-        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1764242076,
         "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
@@ -644,13 +732,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1777268161,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
@@ -660,7 +748,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1768564909,
         "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@@ -676,39 +764,39 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1773122722,
+        "lastModified": 1775710090,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1752077645,
         "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@@ -724,13 +812,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
-        "lastModified": 1768564909,
+        "lastModified": 1775710090,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -742,18 +830,18 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ],
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1772402258,
+        "lastModified": 1777236345,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
         "type": "github"
       },
       "original": {
@@ -787,17 +875,17 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_5",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1773339783,
+        "lastModified": 1777624369,
-        "narHash": "sha256-07iRHomuUvJ7Mmp+F7qo68xIb+y3gy0o/B7kuR1K2Qc=",
+        "narHash": "sha256-nQOSodcDhXiKlfCKb4pE/4GBAs2FnBOD+AHVem0EqOc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1a4ca0d650fbfd4c58e1b1c2b153151fec77d6b2",
+        "rev": "c3ec6b994c235a53a28304564da6422a45230603",
         "type": "github"
       },
       "original": {
@@ -834,7 +922,9 @@
     },
     "root": {
       "inputs": {
+        "comfyui-nix": "comfyui-nix",
         "devshell": "devshell",
+        "direnv-instant": "direnv-instant",
         "disko": "disko",
         "elephant": "elephant",
         "hardware": "hardware",
@@ -847,7 +937,7 @@
         "nix-alien": "nix-alien",
         "nix-darwin": "nix-darwin",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable_2",
         "nixvim": "nixvim",
         "nps": "nps",
@@ -902,11 +992,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773096132,
+        "lastModified": 1777338324,
-        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
         "type": "github"
       },
       "original": {
@@ -992,17 +1082,16 @@
     },
     "textfox": {
       "inputs": {
-        "firefox-addons": "firefox-addons",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1773044834,
+        "lastModified": 1777451299,
-        "narHash": "sha256-R2u3z09DuUbSoWClASPUqKXQG/QZYlBsiy8vYXrJ2VU=",
+        "narHash": "sha256-Okqpw+zxAwHKXuuxlwYy9Ge9JUpnTbsMXqws2eOKfKo=",
         "owner": "adriankarlen",
         "repo": "textfox",
-        "rev": "0b8873d30db55a94e9e0dd934405dcac5e4d8a73",
+        "rev": "3af57df1ed3a38eb584475fd9e032d9643f2a94d",
         "type": "github"
       },
       "original": {
@@ -1011,20 +1100,41 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "direnv-instant",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "walker": {
       "inputs": {
         "elephant": [
           "elephant"
         ],
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1773675699,
+        "lastModified": 1777299395,
-        "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=",
+        "narHash": "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=",
         "owner": "abenz1267",
         "repo": "walker",
-        "rev": "d2702235710da3d7daf55c912ca7534261cf20f5",
+        "rev": "7b0cb0fd1f8b0a60b241081483aea4277f0b4500",
         "type": "github"
       },
       "original": {
@@ -1053,11 +1163,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1772429643,
+        "lastModified": 1773622265,
-        "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
+        "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
+        "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
         "type": "github"
       },
       "original": {

flake.nix

@@ -78,10 +78,17 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
     # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
 
+    # Instant Direnv (load environment in background)
+    direnv-instant.url = "github:Mic92/direnv-instant";
+    direnv-instant.inputs.nixpkgs.follows = "nixpkgs";
+
     # Realtime audio
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
 
+    # ComfyUI
+    comfyui-nix.url = "github:utensils/comfyui-nix";
+
     # HyTale
     hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
 
@@ -138,7 +145,7 @@
         inputs.nur.overlays.default
         inputs.niri.overlays.niri
         # inputs.emacs-overlay.overlay
-        # inputs.comfyui-nix.overlays.default
+        inputs.comfyui-nix.overlays.default
 
         # All my own overlays (derivations + modifications)
         (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
@@ -221,7 +228,9 @@
         hostname = "darwinix";
         username = "christoph";
         headless = false;
-        extraModules = [];
+        extraModules = [
+          inputs.sops-nix.darwinModules.sops
+        ];
       };
     };
 
@@ -248,7 +257,7 @@
           [
             inputs.disko.nixosModules.disko
             # inputs.nixified-ai.nixosModules.comfyui
-            # inputs.comfyui-nix.nixosModules.default
+            inputs.comfyui-nix.nixosModules.default
           ]
           ++ commonModules;
       };

home/christoph/darwinix/default.nix

@@ -8,9 +8,7 @@
   inputs,
   ...
 }: {
-  config = let
+  config = {
-    inherit (config.homemodules) color;
-  in {
     paths = rec {
       nixflake = "${config.home.homeDirectory}/NixFlake";
       dotfiles = "${nixflake}/config";
@@ -27,26 +25,8 @@
         font = "MonoLisa Alt Script";
       };
 
-      fish.enable = true;
+      packages.enable = true;
-
+      terminal.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 = true;
-      };
-
-      yazi.enable = true;
     };
 
     home = {
@@ -62,341 +42,13 @@
         TERMINAL = "kitty";
       };
 
-      packages = with pkgs; [
+      # packages = with pkgs; []; # Configured in homemodules/packages
-        (ripgrep.override {withPCRE2 = true;})
-        gdu
-        duf
-        sd
-        fclones
-        tealdeer
-        killall
-        atool
-        exiftool
-        ouch
-        ffmpegthumbnailer
-        mediainfo
-        file
-        unrar
-        p7zip
-        unzip
-        progress
-        tokei
-        nix-search-tv
-        nix-tree
-        just
-
-        ffmpeg-full
-        imagemagick
-
-        poppler-utils
-        pdf2svg
-        pandoc
-
-        dig
-        tcpdump
-        gping
-        curlie
-        wget
-        doggo
-        rsync
-        rclone
-        httpie
-
-        inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
-
-        cachix
-
-        # GUI
-        ripdrag
-        jellyfin-tui
-      ];
 
       stateVersion = "25.11";
     };
 
-    # TODO: Deduplicate with other configs
+    programs = {};
-    programs = {
-      home-manager.enable = true;
 
-      bat = {
+    services = {};
-        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";
-        };
-      };
-
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
-      eza = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      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;
-      };
-
-      navi = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      ssh = {
-        enable = true;
-        enableDefaultConfig = false;
-
-        matchBlocks = {
-          "*" = {
-            forwardAgent = false;
-            addKeysToAgent = "yes";
-            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 = 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"
-        '';
-      };
-
-      yt-dlp.enable = true;
-
-      zoxide = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-    };
-
-    services = {
-    };
   };
 }

home/christoph/default.nix

@@ -34,8 +34,7 @@ in
 
     homemodules = {
       beets.enable = !headless;
-
+      cava.enable = !headless;
-      btop.enable = true;
 
       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 = false;
-      rofi = {
+      terminal.enable = true;
-        enable = false;
-      };
-
       waybar.enable = !headless;
-      yazi.enable = true;
       zathura.enable = !headless;
     };
 
@@ -270,374 +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; []; # Configured in homemodules/packages
-      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
-            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
-          ])
-        ];
     };
 
     # 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 = {
@@ -665,11 +281,6 @@ in
         };
       };
 
-      navi = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
       nix-index = {
         enable = true;
         enableFishIntegration = config.homemodules.fish.enable;
@@ -699,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 = 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"
-        '';
-      };
-
-      yt-dlp.enable = true;
-
-      zoxide = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
     };
 
     services = {

home/christoph/nixinator/default.nix

@@ -101,11 +101,16 @@
         jellyfin-mpv-shim
         # tidal-hifi
         # tidal-dl-ng # TODO: Borked
+        # spotdl
         tiddl
         picard
         handbrake
         teamspeak6-client
 
+        # virt-manager # use system program option
+        virt-viewer
+        gnome-boxes # doesn't list VMs imported using virsh
+
         steam-devices-udev-rules
       ];
 
@@ -153,6 +158,8 @@
           "com.usebottles.bottles"
           "io.github.lawstorant.boxflat"
 
+          "org.onlyoffice.desktopeditors"
+
           # "com.unity.UnityHub"
         ];
 

home/christoph/nixtop/default.nix

@@ -2,30 +2,32 @@
 {pkgs, ...}: {
   config = {
     homemodules = {
-      hyprland = {
+      # TODO: Niri config (needs to modularize niri module)
-        keyboard = {
-          layout = "us";
-          variant = "altgr-intl";
-          option = "nodeadkeys";
-        };
 
-        monitors = {
+      # hyprland = {
-          "eDP-1" = {
+      #   keyboard = {
-            width = 1920;
+      #     layout = "us";
-            height = 1080;
+      #     variant = "altgr-intl";
-            rate = 60;
+      #     option = "nodeadkeys";
-            x = 0;
+      #   };
-            y = 0;
+      #
-            scale = 1;
+      #   monitors = {
-          };
+      #     "eDP-1" = {
-        };
+      #       width = 1920;
+      #       height = 1080;
+      #       rate = 60;
+      #       x = 0;
+      #       y = 0;
+      #       scale = 1;
+      #     };
+      #   };
+      #
+      #   workspaces = {
+      #     "eDP-1" = [1 2 3 4 5 6 7 8 9];
+      #   };
+      # };
 
-        workspaces = {
+      waybar.monitors = ["eDP-1"];
-          "eDP-1" = [1 2 3 4 5 6 7 8 9];
-        };
-      };
-
-      waybar.monitor = "eDP-1";
     };
 
     home = {

home/homemodules/bat/default.nix

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

home/homemodules/bat/options.nix

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

home/homemodules/cava/default.nix

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

home/homemodules/cava/options.nix

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

home/homemodules/darwin.nix

@@ -1,13 +1,21 @@
 {inputs, ...}: {
   imports = [
     # My own HM modules
+    ./bat
+    ./btop
     ./color
+    ./fastfetch
     ./fish
     ./git
+    ./jellyfin-tui
     ./kitty
     ./lazygit
     ./neovim
+    ./packages
     ./paths
+    ./ssh
+    ./terminal
+    ./tmux
     ./yazi
 
     # HM modules imported from the flake inputs

home/homemodules/default.nix

@@ -3,26 +3,34 @@
     # Obsolete modules are kept in "1_deprecated" for reference.
 
     # My own HM modules
+    ./bat
     ./beets
     ./btop
+    ./cava
     ./chromium
     ./color
     ./docs
+    ./fastfetch
     ./fcitx
     ./firefox
     ./fish
     ./git
+    ./jellyfin-tui
     ./kitty
     ./lazygit
     ./mpd
     ./neovim
     ./niri
     ./nnn
+    ./packages
     ./paths
     ./qutebrowser
     ./rmpc
     ./rofi
     ./waybar
+    ./ssh
+    ./terminal
+    ./tmux
     ./yazi
     ./zathura
 
@@ -31,6 +39,7 @@
     inputs.nixvim.homeModules.nixvim
     inputs.textfox.homeManagerModules.default
     inputs.walker.homeManagerModules.default
+    inputs.direnv-instant.homeModules.direnv-instant
     # inputs.niri.homeModules.niri # Imported by system module
     # inputs.noctalia.homeModules.default
     # inputs.caelestia.homeManagerModules.default

home/homemodules/docs/default.nix

@@ -32,6 +32,9 @@ in {
         "Notes/Obsidian/Chriphost/latex_snippets.json".source = ../../../config/obsidian/latex_snippets.json; # TODO: Symlink
         "Notes/Obsidian/Chriphost/.obsidian/snippets/latex_preview.css".source = ../../../config/obsidian/css_snippets/latex_preview.css;
         "Notes/Obsidian/Chriphost/.obsidian/snippets/center_image.css".source = ../../../config/obsidian/css_snippets/center_image.css;
+        "Notes/Obsidian/Chriphost/.obsidian/snippets/fullwidth_image.css".source = ../../../config/obsidian/css_snippets/fullwidth_image.css;
+        "Notes/Obsidian/Chriphost/.obsidian/snippets/justify_text.css".source = ../../../config/obsidian/css_snippets/justify_text.css;
+        "Notes/Obsidian/Chriphost/.obsidian/snippets/bordered_image.css".source = ../../../config/obsidian/css_snippets/bordered_image.css;
       };
     };
   };

home/homemodules/fastfetch/default.nix

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

home/homemodules/fastfetch/options.nix

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

home/homemodules/firefox/bookmarks.nix

@@ -103,9 +103,9 @@ in [
       (mkBm "Heise" "https://www.heise.de/")
       (mkBm "HN" "https://news.ycombinator.com/news")
       (mkBm "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/")
-      (mkBm "F10" "https://f10.local.chriphost.de/race/Everyone")
+      # (mkBm "F10" "https://f10.local.chriphost.de/race/Everyone")
-      (mkBm "F11" "https://f11.local.chriphost.de/racepicks")
+      (mkBm "F12" "https://f12.local.chriphost.gay/racepicks")
-      (mkBm "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid")
+      (mkBm "F12PB" "https://f12pb.local.chriphost.de/_/")
       (mkBm "ISBNDB" "https://isbndb.com/")
       (mkBm "Music" "https://bandcamp.com/chriphost")
       (mkBm "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/")

home/homemodules/firefox/default.nix

@@ -86,6 +86,8 @@ in {
     programs.firefox = {
       enable = true;
 
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
+
       # firefox-unwrapped is the pure firefox browser, wrapFirefox adds configuration ontop
       package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
         # About policies: https://github.com/mozilla/policy-templates#enterprisepoliciesenabled

home/homemodules/fish/default.nix

@@ -42,116 +42,141 @@ in {
       fish_pager_color_description ${color.hex.overlay0}
     '';
 
-    programs.fish = lib.mkMerge [
+    programs.fish = let
-      # Darwin exclusive config
+      # Only add " | bat" if bat is installed
-      (lib.mkIf pkgs.stdenv.isDarwin {
+      batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
-        shellInit = ''
-          set fish_greeting
-          yes | fish_config theme save "system-theme"
 
-          set --global --export HOMEBREW_PREFIX "/opt/homebrew"
+      # Same as above but with args for bat
-          set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
+      batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
-          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;
-        '';
 
-        shellAbbrs = let
+      # These can be used for my config.homemodules and for HM config.programs,
-          # These can be used for my config.homemodules and for HM config.programs,
+      # as both of these add the package to home.packages
-          # as both of these add the package to home.packages
+      hasHomePackage = package: (mylib.modules.contains config.home.packages package);
-          hasHomePackage = package: (mylib.modules.contains config.home.packages package);
 
-          # Only add fish abbr if package is installed
+      # Only add fish abbr if package is installed
-          abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
+      abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-        in
+    in
-          lib.mkMerge [
+      lib.mkMerge [
+        # Darwin exclusive config
+        (lib.mkIf pkgs.stdenv.isDarwin {
+          shellInit = ''
+            set fish_greeting
+            yes | fish_config theme save "system-theme"
+
+            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;
+          '';
+
+          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
+        # Linux exclusive config
-      (lib.mkIf pkgs.stdenv.isLinux {
+        (lib.mkIf pkgs.stdenv.isLinux {
-        generateCompletions = nixosConfig.programs.fish.generateCompletions;
+          generateCompletions = nixosConfig.programs.fish.generateCompletions;
 
-        shellInit = ''
+          # TODO: There's a bug with the direnv mechanism:
-          set fish_greeting
+          #       - When leaving an env, it unloads (good)
-          yes | fish_config theme save "system-theme"
+          #       - When entering another env, it loads (good)
-        '';
+          #       - When leaving this one, it doesn't unload (bad)
+          #       - When entering leaving it again, it works...
+          #       This only happens sometimes, is there a race condition?
+          shellInit = ''
+            set fish_greeting
+            yes | fish_config theme save "system-theme"
+            fish_vi_key_bindings
 
-        functions = lib.mergeAttrsList [
+            # Because we can't source that in a project flake's shellHook (is POSIX), source it here
-          (lib.optionalAttrs config.homemodules.nnn.enable {
+            function __project_shell_reload --on-variable INIT_PROJECT_SHELL
-            nnncd = {
+                # Leaving the environment
-              wraps = "nnn";
+                if not set -q INIT_PROJECT_SHELL; or test -z "$INIT_PROJECT_SHELL"
-              description = "support nnn quit and change directory";
+                    if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
-              body = ''
+                        source "$__last_unload_project_shell"
-                # Block nesting of nnn in subshells
+                    end
-                if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+                    set -e __last_init_project_shell
-                    echo "nnn is already running"
+                    set -e __last_unload_project_shell
                     return
                 end
 
-                # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+                # Entering or switching environments
-                # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+                if test "$INIT_PROJECT_SHELL" != "$__last_init_project_shell"
-                # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+                    # Cleanup the previous environment
-                # without changing the paths.
+                    if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
-                if test -n "$XDG_CONFIG_HOME"
+                        source "$__last_unload_project_shell"
-                    set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+                    end
-                else
+
-                    set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+                    # Store into variables to persist until next environment switch in the same shell
+                    set -g __last_init_project_shell "$INIT_PROJECT_SHELL"
+                    if set -q UNLOAD_PROJECT_SHELL; and test -f "$UNLOAD_PROJECT_SHELL"
+                        set -g __last_unload_project_shell "$UNLOAD_PROJECT_SHELL"
+                    else
+                        set -e __last_unload_project_shell
+                    end
+
+                    # Source the new environment
+                    if test -f "$INIT_PROJECT_SHELL"
+                        source "$INIT_PROJECT_SHELL"
+                    end
                 end
+            end
+          '';
 
-                # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+          functions = lib.mergeAttrsList [
-                # stty start undef
+            (lib.optionalAttrs config.homemodules.nnn.enable {
-                # stty stop undef
+              nnncd = {
-                # stty lwrap undef
+                wraps = "nnn";
-                # stty lnext undef
+                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 command function allows one to alias this function to `nnn` without
+                  # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
-                # making an infinitely recursive alias
+                  # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
-                command nnn $argv
+                  # 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
 
-                if test -e $NNN_TMPFILE
+                  # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
-                    source $NNN_TMPFILE
+                  # stty start undef
-                    rm $NNN_TMPFILE
+                  # stty stop undef
-                end
+                  # stty lwrap undef
-              '';
+                  # stty lnext undef
-            };
-          })
-        ];
 
-        shellAbbrs = let
+                  # The command function allows one to alias this function to `nnn` without
-          # Only add " | bat" if bat is installed
+                  # making an infinitely recursive alias
-          batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
+                  command nnn $argv
 
-          # Same as above but with args for bat
+                  if test -e $NNN_TMPFILE
-          batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
+                      source $NNN_TMPFILE
+                      rm $NNN_TMPFILE
+                  end
+                '';
+              };
+            })
+          ];
 
-          # These can be used for my config.homemodules and for HM config.programs,
+          shellAbbrs = lib.mkMerge [
-          # 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.
             {
-              # Fish
-              h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
-              abbrs = batifyWithArgs "abbr" "-l fish";
-
               # Tools
               blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
               blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
-              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
             }
@@ -168,31 +193,33 @@ in {
 
             # (abbrify pkgs.sd {sed = "sd";})
           ];
-      })
+        })
 
-      # Common config
+        # Common config
-      {
+        {
-        enable = true;
+          enable = true;
 
-        shellAbbrs = let
+          shellAbbrs = lib.mkMerge [
-          # 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 [
             {
-              # Shell basics
+              # Shell
               c = "clear";
               q = "exit";
               mkdir = "mkdir -p"; # also create parents (-p)
               watch = "watch -d -c -n 0.5";
-              sy = "sudo -u ${username} yazi";
+              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";
             }
 
@@ -244,9 +271,9 @@ in {
             (abbrify pkgs.lazygit {lg = "lazygit";})
           ];
 
-        plugins = [];
+          plugins = [];
-      }
+        }
-    ];
+      ];
 
     programs.starship = {
       enable = true;

home/homemodules/jellyfin-tui/default.nix

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

home/homemodules/jellyfin-tui/options.nix

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

home/homemodules/kitty/default.nix

@@ -31,8 +31,8 @@ in {
       settings = lib.mkMerge [
         # Linux config
         (lib.mkIf pkgs.stdenv.isLinux {
-          allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
+          allow_remote_control = true; # For nnn file preview or nvim scrollback
-          listen_on = "unix:@mykitty";
+          listen_on = lib.mkDefault "unix:@mykitty"; # This conflicts with direnv-instant
         })
 
         # Common config
@@ -42,6 +42,7 @@ in {
           window_padding_width = 10; # Looks stupid with editors if bg doesn't match
           # hide_window_decorations = "yes";
           enabled_layouts = "grid,vertical,horizontal";
+          cursor_trail = 3;
 
           tab_bar_min_tabs = 2; # Don't show a single tab
           tab_bar_edge = "bottom";

home/homemodules/neovim/default.nix

@@ -30,54 +30,59 @@ in {
 
           (lib.optionals (!headless) [
             # Language servers
+            autotools-language-server
+            basedpyright
             clang-tools
             clojure-lsp
             cmake-language-server
             haskell-language-server
             jdt-language-server
+            just-lsp
             ltex-ls # TODO: Only enable on-demand
             lua-language-server
             # nil
-            basedpyright
+            # perl5Packages.PLS
+            perlnavigator
             pyrefly
-            ty
+            # rPackages.languageserver
             rust-analyzer
             svelte-language-server
             tailwindcss-language-server
             tex-fmt
             texlab
             tinymist
+            ty
             typescript
             vscode-langservers-extracted # includes nodejs
-            autotools-language-server
-            just-lsp
 
             # Linters
             checkstyle # java
             clippy # rust
             clj-kondo # clojure
             eslint_d # javascript
-            python313Packages.ruff
+            # python313Packages.ruff
-            python313Packages.flake8
+            # python313Packages.flake8
-            python313Packages.pylint
+            # python313Packages.pylint
             lua54Packages.luacheck
             vale # text
             # statix # nix (doesn't recognize pipe operator)
 
             # Formatters
+            air-formatter
             cljfmt
-            python313Packages.black
             google-java-format
             html-tidy
             jq # json
-            # prettierd # Use prettier instead because of plugins
+            just-formatter
+            mbake
             # nodePackages_latest.prettier # Use local install as plugins change per project
+            # perl5Packages.PerlTidy
+            # prettierd # Use prettier instead because of plugins
+            # python313Packages.black
             rustfmt
             stylua
-            typstyle
-            mbake
-            just-formatter
             tombi
+            typstyle
           ])
 
           [
@@ -87,6 +92,48 @@ in {
             lua54Packages.jsregexp # For tree-sitter
             # nodejs_latest
 
+            # TODO: Create a perl module where I can add packages to, so I don't end up with multiple perl installations
+            # TODO: The same is required for python and R (below)
+            (perl.withPackages (p:
+              with p; [
+                PLS
+                PerlTidy
+                NetOpenSSH
+                DateTime
+                DBI
+                DBDMariaDB
+                CursesUI
+                TextCSV_XS
+              ]))
+
+            (python314.withPackages (p:
+              with p; [
+                # Linters
+                ruff
+                flake8
+                pylint
+
+                # Formatters
+                black
+
+                numpy
+                matplotlib
+                requests
+              ]))
+
+            (rWrapper.override {
+              packages = with rPackages; [
+                languageserver
+                ggplot2
+                ggalluvial
+                plotly
+                shiny
+                readr
+                tibble
+                svglite
+              ];
+            })
+
             nixd
             alejandra # nix
           ]
@@ -523,8 +570,10 @@ in {
                 make = ["bake"];
                 markdown = ["prettierd" "prettier"];
                 nix = ["alejandra"];
+                perl = ["perltidy"];
                 python = ["black"];
                 qml = ["qmlformat"];
+                r = ["air"];
                 rust = ["rustfmt"];
                 svelte = ["prettierd" "prettier"];
                 toml = ["tombi"];
@@ -552,6 +601,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;
@@ -845,9 +909,8 @@ in {
             dependencies = [_lazydev];
             config = let
               servers = mylib.generators.toLuaObject [
+                {name = "autotools-language-server";}
                 {name = "basedpyright";}
-                # {name = "pyrefly";} # TODO: Config
-                # {name = "ty";} # TODO: Config
                 {
                   name = "clangd";
                   extraOptions = {
@@ -899,7 +962,6 @@ in {
                     };
                   };
                 }
-                {name = "autotools-language-server";}
                 # {name = "nil_ls";}
                 {
                   name = "nixd";
@@ -941,6 +1003,8 @@ in {
                     };
                   };
                 }
+                {name = "perlpls";}
+                {name = "perlnavigator";}
                 {
                   name = "qmlls";
                   extraOptions.cmd = [
@@ -948,6 +1012,8 @@ in {
                     "-E" # Use QML_IMPORT_PATH env variable
                   ];
                 }
+                # {name = "pyrefly";} # TODO: Config
+                {name = "r_language_server";}
                 {name = "svelte";}
                 {name = "tailwindcss";}
                 {name = "texlab";}
@@ -959,6 +1025,7 @@ in {
                     semanticTokens = "disable";
                   };
                 }
+                # {name = "ty";} # TODO: Config
 
                 # {name = "jdtls";} # Don't set up when using nvim-jdtls
                 # {name = "rust_analyzer";} # Don't set up when using rustaceanvim
@@ -2160,6 +2227,7 @@ in {
 
           # dap # Debug adapter protocol # TODO:
           # dap-ui # Debugger UI # TODO:
+          devdocs
           diffview # Git diff # TODO: Check the keybindings
 
           direnv # Automatically load local environments

home/homemodules/neovim/extraConfigLua.lua

@@ -66,3 +66,16 @@ local rmpc =
 vim.g.toggle_rmpc = function()
 	rmpc:toggle()
 end
+
+-- Toggle FailNix UI
+local failnix = Terminal:new({
+	cmd = "cd /home/christoph/Notes/TU/MastersThesis/FailNix && nix develop --command bash -c 'perl ./scripts/menu.pl'",
+	hidden = true,
+	close_on_exit = true,
+	auto_scroll = false,
+	direction = "float",
+})
+
+vim.g.toggle_failnix = function()
+	failnix:toggle()
+end

home/homemodules/neovim/mappings.nix

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

home/homemodules/niri/default.nix

@@ -19,30 +19,43 @@ in {
       }
     ];
 
-    gtk = {
+    gtk = let
-      enable = true;
+      gtkConfig = {
-      iconTheme.package = color.iconPackage;
+        enable = true;
-      iconTheme.name = color.iconTheme;
 
-      colorScheme = "dark";
+        colorScheme = "dark";
-      gtk3.colorScheme = "dark";
-      gtk4.colorScheme = "dark";
 
-      theme = {
+        iconTheme = {
-        # name = "adw-gtk3-dark";
+          package = color.iconPackage;
-        # package = pkgs.adw-gtk3;
+          name = color.iconTheme;
-        name = "catppuccin-mocha-mauve-standard";
+        };
-        package = pkgs.catppuccin-gtk.override {
+
-          variant = "mocha";
+        cursorTheme = {
-          accents = ["mauve"];
+          name = color.cursor;
-          size = "standard";
+          package = color.cursorPackage;
+        };
+
+        theme = {
+          # name = "adw-gtk3-dark";
+          # package = pkgs.adw-gtk3;
+          name = "catppuccin-mocha-mauve-standard";
+          package = pkgs.catppuccin-gtk.override {
+            variant = "mocha";
+            accents = ["mauve"];
+            size = "standard";
+          };
         };
       };
 
-      gtk3.extraConfig = {
+      gtkExtraConfig = {
         gtk-application-prefer-dark-theme = 1;
       };
-    };
+    in
+      gtkConfig
+      // {
+        gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
+        gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
+      };
 
     dconf = {
       enable = true;
@@ -130,8 +143,9 @@ in {
         xwayland-satellite
         # ncpamixer # Audio control
         wiremix # Audio control
-        swww
+        awww
         waypaper
+        wtype # For elephant
 
         # GTK apps (look good and work well with xdg portals)
         nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
@@ -195,6 +209,10 @@ in {
             default = ["desktopapplications"];
           };
           empty = ["desktopapplications"];
+
+          selection_wrap = true;
+          hide_quick_activation = true;
+          actions_as_menu = true;
         };
 
         themes."cattpuccin-mocha" = let
@@ -563,15 +581,45 @@ in {
               # opacity = 0.8;
             }
 
-            # Rules for specific windows
+            # Floating + unmaximized windows
             {
-              matches = [{app-id = "Zotero";}];
+              matches = [
-              open-on-workspace = "2";
+                {app-id = "com.github.finefindus.eyedropper";}
+                {app-id = "re.sonny.Junction";}
+              ];
+
+              open-maximized = false;
+              open-floating = true;
+
+              # default-floating-position = {
+              #   x = 0;
+              #   y = 0;
+              #   relative-to = "center";
+              # };
             }
+
+            # Specific floating windows
+            {
+              matches = [
+                {app-id = "re.sonny.Junction";}
+              ];
+              default-column-width.fixed = 500;
+              default-window-height.fixed = 250;
+            }
+            {
+              matches = [
+                {app-id = "com.github.finefindus.eyedropper";}
+              ];
+              default-column-width.fixed = 250;
+              default-window-height.fixed = 500;
+            }
+
+            # Rules for specific windows
             {
               matches = [{app-id = "neovide";}];
               open-on-workspace = "2";
               open-maximized = true;
+              open-focused = true;
             }
             {
               matches = [{app-id = "jetbrains-clion";}];
@@ -584,8 +632,21 @@ in {
               open-floating = true;
             }
             {
-              matches = [{app-id = "obsidian";}];
+              matches = [
+                {
+                  app-id = "electron";
+                  title = ".*Chriphost - Obsidian.*";
+                }
+              ];
               open-on-workspace = "3";
+              # open-maximized = true;
+              open-focused = true;
+            }
+            {
+              matches = [{app-id = "Zotero";}];
+              open-on-workspace = "3";
+              # open-maximized = true;
+              open-focused = true;
             }
             {
               matches = [{app-id = "firefox";}];
@@ -614,6 +675,12 @@ in {
               open-floating = true;
               open-maximized = true;
             }
+            {
+              matches = [{app-id = "factorio";}];
+              open-on-workspace = "6";
+              # open-floating = true;
+              open-maximized = true;
+            }
             {
               matches = [{app-id = "signal";}];
               open-on-workspace = "7";
@@ -644,8 +711,112 @@ in {
           };
 
           # TODO: Move values to config option and set in home/christoph/niri.nix
-          binds = with config.lib.niri.actions; {
+          binds = with config.lib.niri.actions; let
+            sessionMenu = mylib.rofi.mkMenu {
+              prompt = "Session";
+              layers = [
+                {
+                  "󰤂  Poweroff" = "poweroff";
+                  "󰜉  Reboot" = "reboot";
+                  "󰌾  Lock" = "loginctl lock-session";
+                  # "  Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
+                  # "  Reload Hyprland" = "hyprctl reload";
+                  # "  Exit Hyprland" = "hyprctl dispatch exit";
+                  "  Exit Niri" = "niri msg action quit";
+                }
+              ];
+              prompts = ["Select Session Action"];
+              rofiCmd = "walker -d";
+            };
+            wallpaperMenu = mylib.rofi.mkMenu {
+              prompt = "Wallpaper";
+              layers = [
+                "eza -1 ${config.paths.nixflake}/wallpapers"
+              ];
+              prompts = ["Select Wallpaper"];
+              # Use waypaper instead of swww directly, so the chosen wallpaper will be restored after reboot
+              command = "waypaper --wallpaper ${config.paths.nixflake}/wallpapers/$OPTION0";
+              rofiCmd = "walker -d";
+            };
+            # No lectures anymore :) - Kept as example
+            lecturesMenu = mylib.rofi.mkMenu {
+              prompt = "Lecture";
+              layers = [
+                "eza -1 -D ~/Notes/TU"
+                "eza -1 -D ~/Notes/TU/$OPTION0"
+                "eza -1 ~/Notes/TU/$OPTION0/$OPTION1 | grep '.pdf'"
+              ];
+              prompts = [
+                "Select Lecture"
+                "Select Subfolder"
+                "Select Deck"
+              ];
+              command = "xdg-open ~/Notes/TU/$OPTION0/$OPTION1/$OPTION2";
+              rofiCmd = "walker -d";
+            };
+            # niriMenu = mylib.rofi.mkMenu {
+            #   prompt = "Niri";
+            #   layers = [
+            #     {
+            #       "󰹑  Take Region Screenshot" = "niri msg action screenshot -p false";
+            #       "󰹑  Take Window Screenshot" = "niri msg action screenshot-window -p false -d true";
+            #       "󰹑  Take Full-Screen Screenshot" = "niri msg action screenshot-screen -p false -d true";
+            #     }
+            #   ];
+            #   prompts = ["Execute Niri Action"];
+            #   rofiCmd = "walker -d";
+            # };
+            globalMenu = mylib.rofi.mkMenu {
+              prompt = "Global";
+              layers = [
+                {
+                  "  Control Session" = "${sessionMenu}/bin/rofi-menu-Session";
+                  "󰸉  Change Wallpaper" = "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
+                  "󰋗  View Keybindings" = "niri msg action show-hotkey-overlay";
+                  "  Open Lecture Material" = "${lecturesMenu}/bin/rofi-menu-Lecture";
+                  # "  Niri Actions" = "${niriMenu}/bin/rofi-menu-Niri";
+                  # TODO: What else? SSH menu?
+                }
+              ];
+              prompts = ["Select Action"];
+              rofiCmd = "walker -d";
+            };
+          in {
+            # DMenu
+            "Mod+Shift+A" = {
+              action = spawn "walker" "-m" "providerlist";
+              hotkey-overlay = {title = "Toggle the launcher.";};
+            };
+            "Mod+A" = {
+              action = spawn "walker" "-m" "desktopapplications";
+              hotkey-overlay = {title = "Toggle the application launcher.";};
+            };
+            "Mod+C" = {
+              action = spawn "walker" "-m" "clipboard";
+              hotkey-overlay = {title = "Show clipboard history.";};
+            };
+            "Mod+Escape" = {
+              action = spawn "${sessionMenu}/bin/rofi-menu-Session";
+              hotkey-overlay = {title = "Toggle the session menu.";};
+            };
+            "Mod+W" = {
+              action = spawn "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
+              hotkey-overlay = {title = "Open wallpaper menu.";};
+            };
+            "Mod+D" = {
+              action = spawn "${globalMenu}/bin/rofi-menu-Global";
+              hotkey-overlay = {title = "Open global menu.";};
+            };
+
             # Applications
+            "Mod+Ctrl+W" = {
+              action = spawn "waypaper";
+              hotkey-overlay = {title = "Open waypaper.";};
+            };
+            "Mod+Shift+W" = {
+              action = spawn "waypaper" "--random";
+              hotkey-overlay = {title = "Select random wallpaper.";};
+            };
             "Mod+T" = {
               action = spawn "kitty";
               hotkey-overlay = {title = "Spawn Kitty.";};
@@ -678,52 +849,24 @@ in {
               action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
               hotkey-overlay = {title = "Edit the NixFlake.";};
             };
-            "Mod+W" = {
-              action = spawn "waypaper";
-              hotkey-overlay = {title = "Open wallpaper chooser.";};
-            };
-            "Mod+Shift+W" = {
-              action = spawn "waypaper" "--random";
-              hotkey-overlay = {title = "Select random wallpaper.";};
-            };
-
-            "Mod+A" = {
-              action = spawn "walker" "-m" "desktopapplications";
-              hotkey-overlay = {title = "Toggle the application launcher.";};
-            };
-            "Mod+Shift+A" = {
-              action = spawn "walker" "-m" "providerlist";
-              hotkey-overlay = {title = "Toggle the launcher.";};
-            };
-            "Mod+Escape" = let
-              powerMenu = mylib.rofi.mkSimpleMenu rec {
-                prompt = "Session";
-                attrs = {
-                  "󰤂  Poweroff" = "poweroff";
-                  "󰜉  Reboot" = "reboot";
-                  "󰌾  Lock" = "loginctl lock-session";
-                  # "  Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
-                  # "  Reload Hyprland" = "hyprctl reload";
-                  # "  Exit Hyprland" = "hyprctl dispatch exit";
-                };
-                command = "walker -d -p ${prompt}";
-              };
-            in {
-              action = spawn "${powerMenu}/bin/rofi-menu-Session";
-              hotkey-overlay = {title = "Toggle the session menu.";};
-            };
-            "Mod+C" = {
-              action = spawn "walker" "-m" "clipboard";
-              hotkey-overlay = {title = "Show clipboard history.";};
-            };
 
             # Screenshots
             "Mod+S" = {
-              action.screenshot-window = {write-to-disk = true;};
+              action.screenshot-window = {
+                write-to-disk = true;
+                show-pointer = false;
+              };
               hotkey-overlay = {title = "Take a screenshot of the current window.";};
             };
+            "Mod+Ctrl+S" = {
+              action.screenshot-screen = {
+                write-to-disk = true;
+                show-pointer = false;
+              };
+              hotkey-overlay = {title = "Take a screenshot of the current screen.";};
+            };
             "Mod+Shift+S" = {
-              action.screenshot = {show-pointer = true;};
+              action.screenshot = {show-pointer = false;};
               hotkey-overlay = {title = "Take a screenshot of a region.";};
             };
 

home/homemodules/packages/default.nix

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

home/homemodules/packages/options.nix

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

home/homemodules/ssh/default.nix

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

home/homemodules/ssh/options.nix

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

home/homemodules/terminal/default.nix

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

home/homemodules/terminal/options.nix

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

home/homemodules/tmux/default.nix

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

home/homemodules/tmux/options.nix

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

home/homemodules/waybar/default.nix

@@ -24,7 +24,7 @@ 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" = {
@@ -77,11 +77,11 @@ in {
                 tooltip = true;
                 tooltip-icon-size = 24;
               }
-              {
+              # {
-                type = "audio-out";
+              #   type = "audio-out";
-                tooltip = true;
+              #   tooltip = true;
-                tooltip-icon-size = 24;
+              #   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 = {
+            interval = 1;
-              "warning" = 65;
+            # states = {
-              "critical" = 85;
+            #   "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 = {
+            interval = 1;
-              "warning" = 65;
+            # states = {
-              "critical" = 85;
+            #   "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};}
+        #custom-launcher           {background-color: #${color.hex.accent};}
-        #workspaces button        {background-color: #${color.hex.lavender};}
+        #workspaces button         {background-color: #${color.hex.blue};}
-        #workspaces button.active {background-color: #${color.hex.pink};}
+        #workspaces button.empty   {background-color: #${color.hex.lavender};}
-        #window                   {background-color: #${color.hex.maroon};}
+        #workspaces button.active  {background-color: #${color.hex.green};}
-        #systemd-failed-units     {background-color: #${color.hex.red};}
+        #workspaces button.urgent  {background-color: #${color.hex.red};}
-        #mpris                    {background-color: #${color.hex.accent};}
+        #window                    {background-color: #${color.hex.maroon};}
-        #privacy                  {background-color: #${color.hex.red};}
+
-        #pulseaudio               {background-color: #${color.hex.maroon};}
+        #mpris                     {background-color: #${color.hex.accent};}
-        #network                  {background-color: #${color.hex.peach};}
+
-        #disk                     {background-color: #${color.hex.yellow};}
+        #privacy                   {background-color: #${color.hex.red};}
-        #cpu                      {background-color: #${color.hex.green};}
+        #pulseaudio                {background-color: #${color.hex.maroon};}
-        #memory                   {background-color: #${color.hex.teal};}
+        #network                   {background-color: #${color.hex.peach};}
-        #clock                    {background-color: #${color.hex.sky};}
+        #disk                      {background-color: #${color.hex.yellow};}
-        #tray                     {background-color: #${color.hex.accent};}
+        #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;
         }

home/homemodules/yazi/default.nix

@@ -85,6 +85,11 @@ in {
               run = ''xdg-open "$@"'';
               desc = "Open selection";
             }
+            {
+              # TODO: For some reason, junction does not exit after choosing an application...
+              run = ''junction "$@"'';
+              desc = "Open selection in chosen application";
+            }
           ];
           extract = [
             {

lib/containers.nix

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

lib/default.nix

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

lib/networking.nix

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

lib/nixos.nix

@@ -4,6 +4,52 @@
   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];
+      auto-optimise-store = true;
+
+      substituters = [
+        "https://cache.nixos.org"
+        "https://nix-community.cachix.org"
+        "https://comfyui.cachix.org"
+        # "https://ai.cachix.org"
+        # "https://app.cachix.org/cache/nixos-rocm"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec="
+        # "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
+        # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
+      ];
+    };
+
+    gc = {
+      automatic = false;
+      options = "--delete-older-than 5d";
+    };
+
+    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,
@@ -29,7 +75,6 @@
 
           # Import the toplevel system configuration module.
           ../system
-          ../system/cachix.nix
 
           # Host specific configuration
           ../system/${hostname}
@@ -103,14 +148,11 @@
           # 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:
+          ../system/systemmodules/darwin.nix
         ]
 
         extraModules

lib/rofi.nix

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

system/cachix.nix

@@ -1,16 +0,0 @@
-# WARN: this file will get overwritten by $ cachix use <name>
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  folder = ./cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports =
-    lib.mapAttrsToList toImport
-    (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
-}

system/cachix/nix-community.nix

@@ -1,14 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nix-community.cachix.org"
-      # "https://app.cachix.org/cache/nixos-rocm"
-      # "https://ai.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
-      # "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
-    ];
-  };
-}

system/darwinix/default.nix

@@ -10,29 +10,21 @@
   hostname,
   ...
 }: {
-  nix = {
+  systemmodules = {
-    enable = true;
+    sops-nix.bootSecrets.${username} = [
+      "user-password"
+    ];
 
-    package = pkgs.nixVersions.stable;
+    sops-nix.secrets.${username} = [
-    extraOptions = ''
+      "ssh-private-key"
-      experimental-features = nix-command flakes pipe-operators
+      "nix-github-token"
-    '';
+      "docker-password"
-
+      "jellyfin-password"
-    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}"
     ];
   };
 
+  nix = mylib.nixos.mkCommonNixSettings username;
+
   networking = {
     hostName = "${hostname}";
     localHostName = "${hostname}";
@@ -84,21 +76,25 @@
         Clicking = true; # Tap to click
         Dragging = true; # Double tap to drag
         TrackpadRightClick = true;
+        TrackpadPinch = true;
       };
     };
 
     keyboard = {
       enableKeyMapping = true;
-      swapLeftCtrlAndFn = true;
+      swapLeftCtrlAndFn = false;
-      swapLeftCommandAndLeftAlt = true;
+      swapLeftCommandAndLeftAlt = false;
     };
   };
 
   users.users.${username} = {
-    isHidden = false;
+    name = "${username}";
     description = "Christoph";
-    home = "/Users/${username}";
+    uid = 501;
+    gid = 20;
     createHome = false;
+    home = "/Users/${username}";
+    isHidden = false;
 
     # NOTE: Not set if the user already exists on darwin, so use chsh for the root user
     shell = pkgs.fish;
@@ -128,14 +124,41 @@
   };
 
   services = {
-    # aerospace = {};
+    # For another time maybe
+    # sketchybar = {};
+    # skhd = {};
+    # yabai = {};
   };
 
   # NOTE: Not installed automatically
   homebrew = {
     enable = true;
     enableFishIntegration = true;
-    # brews = [];
+
+    onActivation = {
+      autoUpdate = true;
+      cleanup = "zap"; # Uninstall unlisted casks and associated files on rebuild
+      upgrade = true;
+    };
+
+    # taps = [
+    #   "homebrew-zathura/zathura"
+    # ];
+
+    brews = [];
+
+    casks = [
+      "alt-tab"
+      "discord"
+      "iina"
+      "nextcloud"
+      "obsidian"
+      "protonvpn"
+      "signal"
+      # "zathura"
+      # "zathura-pdf-mupdf"
+      "zotero"
+    ];
   };
 
   # Set Git commit hash for darwin-version.

system/default.nix

@@ -91,6 +91,7 @@ with mylib.networking; {
       "ssh-private-key"
       "nix-github-token"
       "docker-password"
+      "jellyfin-password"
     ];
   };
 
@@ -104,31 +105,7 @@ with mylib.networking; {
   };
 
   # Enable flakes
-  nix = {
+  nix = mylib.nixos.mkCommonNixSettings username;
-    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}"
-    ];
-  };
 
   # Bootloader/Kernel stuff
   boot = {
@@ -167,7 +144,7 @@ with mylib.networking; {
 
   documentation = {
     # NOTE: Disable this while configuring stuff, it's slow
-    enable = true;
+    enable = false;
     man.enable = config.documentation.enable;
     man.cache.enable = true; # Slow but needed for neovim man picker
     info.enable = config.documentation.enable;
@@ -258,6 +235,7 @@ with mylib.networking; {
     description = "Christoph";
     group = "users";
     uid = 1000;
+    home = "/home/${username}";
     extraGroups = [
       "networkmanager"
       "wheel"

system/nixinator/default.nix

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

system/nixinator/disks.nix

@@ -82,7 +82,8 @@
                     };
                     "swap" = {
                       mountpoint = "/swap";
-                      swap.swapfile.size = "16G";
+                      # Configured in hardware-configuration.nix
+                      # swap.swapfile.size = "64G";
                     };
                   };
                 };

system/nixinator/hardware-configuration.nix

@@ -131,8 +131,9 @@
 
   swapDevices = [
     {
-      device = "/var/swap";
+      device = "/swap/swapfile";
-      size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM
+      size = 1024 * 64; # Without hibernation 4.0 GB to 0.5 x RAM
+      randomEncryption.enable = false; # The disk is already encrypted. Useless and might lead to system freeze.
     }
   ];
 

system/servenix/default.nix

@@ -32,6 +32,7 @@
     ../services/kiwix.nix
     ../services/kopia.nix
     ../services/nextcloud.nix
+    ../services/ntfy.nix
     ../services/nginx-proxy-manager.nix
     ../services/paperless.nix
     # ../services/plex.nix # Their monetization strategy is absolutely atrocious
@@ -65,52 +66,13 @@
       useNetworkManager = false;
 
       networks = {
-        # "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
+        "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
-        #   interface = "ens18";
+          interface = "ens18";
-        #   ips = ["192.168.86.25/24" "fd00::19/64"];
+          ips = ["192.168.86.25/24"];
-        #   routers = ["192.168.86.5" "fd00::5"];
+          routers = ["192.168.86.5"]; # Don't add IPv6 gateway, rely on router advertisement instead
-        #   nameservers = ["8.8.8.8" "2001:4860:4860::8888"]; # NOTE: Use reliable DNS for servers instead of 192.168.86.26
+          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;
+          routable = true;
-        # };
+          extraAddresses = ["fd00::19/64"]; # IPv6 ULA — declared without creating a route
-
-        # 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";
-          };
         };
       };
 
@@ -149,6 +111,8 @@
       "kopia-server-password"
       "kopia-user-password"
       "paperless-nextcloud-sync-password"
+      "ntfy-auth-users"
+      "ntfy-auth-tokens"
     ];
   };
 

system/services/0_TEMPLATE.nix

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

system/services/adguard.nix

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

system/services/authelia.nix

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

system/services/bazarr.nix

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

system/services/box.nix

@@ -1,24 +1,18 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
   ...
 }: let
-  boxVersion = "v0.30.1";
+  boxVersion = "v0.31.0";
 in {
   virtualisation.oci-containers.containers = {
     box = {
       image = "stashapp/stash:${boxVersion}";
       autoStart = true;
 
-      login = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 

system/services/comfyui.nix

@@ -1,24 +1,21 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
   ...
 }: let
-  comfyuiVersion = "cu128-slim-20260316";
+  # comfyuiVersion = "cu128-slim-20260316";
+  # comfyuiVersion = "cu128-megapak-20260413";
+  # comfyuiVersion = "cu130-megapak-pt211-20260330";
+  comfyuiVersion = "cu130-megapak-pt211-20260413";
 in {
   virtualisation.oci-containers.containers = {
     comfyui = {
       image = "yanwk/comfyui-boot:${comfyuiVersion}";
       autoStart = false;
 
-      login = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 
@@ -29,19 +26,45 @@ in {
       volumes = let
         rootDir = "/home/christoph/Games/ComfyUI";
       in [
-        "${rootDir}/storage:/root"
+        # cu128-slim / cu128-megapak
+        # "${rootDir}/storage:/root"
+        # "${rootDir}/storage-models/models:/root/ComfyUI/models"
+        # "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
+        # "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
+        # "${rootDir}/storage-user/input:/root/ComfyUI/input"
+        # "${rootDir}/storage-user/output:/root/ComfyUI/output"
+        # "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
+
+        # cu130-megapak
+        "${rootDir}/storage-cache/dot-cache:/root/.cache"
+        "${rootDir}/storage-cache/dot-config:/root/.config"
+        "${rootDir}/storage-nodes/dot-local:/root/.local"
+        "${rootDir}/storage-nodes/comfy-extras:/root/ComfyUI/comfy_extras"
+        "${rootDir}/storage-nodes/custom_nodes:/root/ComfyUI/custom_nodes"
         "${rootDir}/storage-models/models:/root/ComfyUI/models"
         "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
         "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
         "${rootDir}/storage-user/input:/root/ComfyUI/input"
         "${rootDir}/storage-user/output:/root/ComfyUI/output"
-        "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
+        "${rootDir}/storage-user/user-profile:/root/ComfyUI/user"
+        "${rootDir}/storage-user/user-scripts:/root/user-scripts"
       ];
 
       environment = {
         PUID = "1000";
         PGID = "1000";
         TZ = "Europe/Berlin";
+
+        # https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
+        CLI_ARGS = lib.concatStringsSep " " [
+          # "--cache-none" # Leads to single nodes being executed multiple times for each output connection :/
+          "--lowvram"
+          "--disable-smart-memory"
+          "--disable-pinned-memory"
+          "--disable-xformers"
+          "--use-sage-attention" # Crashes
+          # "--reserve-vram 1" # (1 or 2) => Assume less vram is available to mitigate OOM due to wrong vram estimation
+        ];
       };
 
       extraOptions = [

system/services/fileflows-node.nix

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

system/services/fileflows.nix

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

system/services/gitea.nix

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

system/services/immich.nix

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

system/services/jellyfin.nix

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

system/services/kopia.nix

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

system/services/nextcloud.nix

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

system/services/nginx-proxy-manager.nix

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

system/services/ntfy.nix

@@ -0,0 +1,79 @@
+{
+  mylib,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  ntfyVersion = "v2.21";
+in {
+  # If we need to pass secrets to containers we can't use plain env variables.
+  sops.templates."ntfy_secrets.env".content = ''
+    NTFY_AUTH_USERS=${config.sops.placeholder.ntfy-auth-users}
+    NTFY_AUTH_TOKENS=${config.sops.placeholder.ntfy-auth-tokens}
+  '';
+
+  virtualisation.oci-containers.containers = {
+    #     NTFY_AUTH_USERS='admin:$2b$10$13iMkFcSNXcb/DKlUSS03OM25saLd8/hDlKkowFtXYctu2fQBoLJK:admin,christoph:$2b$10$8jgrgBltBXj/Qw0BxBWf1eIfH53VV6wTdlJZEqWBIH3htwEP9PKgq:user'
+    #     NTFY_AUTH_TOKENS="christoph:tk_rx8fd6hojuz4ekcb72j7juugkbmga:FAIL*-Notif"
+
+    #     NTFY_BASE_URL="https://ntfy.vps.chriphost.de"
+    #     NTFY_BEHIND_PROXY="true"
+    #     NTFY_AUTH_FILE="/var/lib/ntfy/auth.db"
+    #     NTFY_AUTH_DEFAULT_ACCESS="deny-all"
+    #     NTFY_ENABLE_LOGIN="true"
+    #     NTFY_REQUIRE_LOGIN="true"
+    #     NTFY_ATTACHMENT_CACHE_DIR="/var/cache/ntfy/attachments"
+    #     NTFY_CACHE_FILE="/var/cache/ntfy/cache.db"
+    #     NTFY_UPSTREAM_BASE_URL="https://ntfy.sh"
+    #     NTFY_AUTH_ACCESS="christoph:*:read-write"
+    ntfy = {
+      image = "binwiederhier/ntfy:${ntfyVersion}";
+      autoStart = true;
+
+      login = mylib.containers.mkDockerLogin config;
+
+      dependsOn = [];
+
+      ports = [
+        "8042:80"
+      ];
+
+      volumes = [
+        "ntfy_cache:/var/cache/ntfy"
+        "ntfy_attachments:/var/cache/ntfy/attachments"
+        "ntfy_lib:/var/lib/ntfy"
+        "ntfy_etc:/etc/ntfy"
+      ];
+
+      cmd = ["serve"];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        NTFY_BASE_URL = "https://ntfy.vps.chriphost.de";
+        NTFY_BEHIND_PROXY = "true";
+        NTFY_AUTH_FILE = "/var/lib/ntfy/auth.db";
+        NTFY_AUTH_DEFAULT_ACCESS = "deny-all";
+        NTFY_ENABLE_LOGIN = "true";
+        NTFY_REQUIRE_LOGIN = "true";
+        NTFY_ATTACHMENT_CACHE_DIR = "/var/cache/ntfy/attachments";
+        NTFY_CACHE_FILE = "/var/cache/ntfy/cache.db";
+        NTFY_UPSTREAM_BASE_URL = "https://ntfy.sh";
+        NTFY_AUTH_ACCESS = "christoph:*:read-write";
+      };
+
+      environmentFiles = [
+        config.sops.templates."ntfy_secrets.env".path
+      ];
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

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 = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 
@@ -59,14 +53,7 @@ in {
       image = "redis:7";
       autoStart = true;
 
-      login = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 
@@ -87,14 +74,7 @@ in {
       image = "postgres:15";
       autoStart = true;
 
-      login = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 

system/services/plex.nix

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

system/services/portainer-agent.nix

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

system/services/portainer.nix

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

system/services/prowlarr.nix

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

system/services/pulse.nix

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

system/services/radarr.nix

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

system/services/sabnzbd-movies.nix

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

system/services/sabnzbd-shows.nix

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

system/services/sonarr.nix

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

system/services/teamspeak.nix

@@ -1,24 +1,18 @@
 {
+  mylib,
   config,
   lib,
   pkgs,
   ...
 }: let
-  teamspeakVersion = "v6.0.0-beta7";
+  teamspeakVersion = "v6.0.0-beta8";
 in {
   virtualisation.oci-containers.containers = {
     teamspeak = {
       image = "teamspeaksystems/teamspeak6-server:${teamspeakVersion}";
       autoStart = true;
 
-      login = {
+      login = mylib.containers.mkDockerLogin config;
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
 
       dependsOn = [];
 
@@ -30,7 +24,8 @@ in {
       ];
 
       volumes = [
-        "teamspeak_data:/var/tsserver"
+        # "teamspeak_data:/var/tsserver"
+        "teamspeak_data2:/var/tsserver"
       ];
 
       environment = {

system/services/tinymediamanager.nix

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

system/services/whats-up-docker.nix

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

system/systemmodules/darwin.nix

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

system/systemmodules/docker/default.nix

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

system/systemmodules/impermanence/default.nix

@@ -69,7 +69,10 @@ in {
           # https://github.com/nix-community/impermanence/issues/253
           (mkRDir "/usr/systemd-placeholder" m755)
 
-          (mkDir "mandb" "/var/cache/man" m755)
+          # TODO: Why does this use the mandb user?
+          # TODO: Why does this apparently conflict with comfyui-nix?
+          # (mkDir "mandb" "/var/cache/man" m755)
+
           # (mkRDir "/var/cache/restic-backups-synology" m755)
 
           (mkRDir "/var/db/sudo" m711)
@@ -129,6 +132,7 @@ in {
             # (mkUDir ".nv" m755) # Unity
             # (mkUDir ".ollama" m755)
             # (mkUDir ".plastic4" m755) # Unity
+            (mkUDir ".tableplus" m755)
             (mkUDir ".tiddl" m755)
             (mkUDir ".var/app" m755)
             (mkUDir ".vim/undo" m755)
@@ -143,6 +147,7 @@ in {
 
             # Config
             # (mkUDir ".config/.android" m755) # Unity
+            # (mkUDir ".config/beekeeper-studio" m755)
             (mkUDir ".config/beets" m755)
             (mkUDir ".config/blender" m755)
             (mkUDir ".config/chromium" m755) # TODO: Remove this someday
@@ -152,13 +157,13 @@ in {
             (mkUDir ".config/ghidra" m755)
             (mkUDir ".config/impermanence" m755)
             (mkUDir ".config/jellyfin-mpv-shim" m755)
-            (mkUDir ".config/jellyfin-tui" m755) # TODO: Generate this config file, have to use sops because it includes the password in cleartext
+            # (mkUDir ".config/jellyfin-tui" m755) # Configured using nix
             (mkUDir ".config/JetBrains" m755)
             (mkUDir ".config/kdeconnect" m755)
             (mkUDir ".config/keepassxc" m755)
             (mkUDir ".config/Msty" m755)
             (mkUDir ".config/Nextcloud" m755)
-            (mkUDir ".config/niri/dms" m755)
+            # (mkUDir ".config/niri/dms" m755)
             (mkUDir ".config/obsidian" m755)
             (mkUDir ".config/obs-studio" m755)
             (mkUDir ".config/Signal" m755)
@@ -168,6 +173,7 @@ in {
             (mkUDir ".config/tidal_dl_ng" m755)
             # (mkUDir ".config/unity3d" m755) # Unity
             # (mkUDir ".config/unityhub" m755) # Unity
+            (mkUDir ".config/Vector 35" m755)
             (mkUDir ".config/vlc" m755)
             (mkUDir ".config/Zeal" m755)
             (mkUDir ".config/zed" m755)

system/systemmodules/sops-nix/default.nix

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

system/systemmodules/sops-nix/secrets.yaml

@@ -5,6 +5,7 @@ user-password: ENC[AES256_GCM,data:okgvaTTesCDwriI8PxhNdHZF8XgzB4yxapuFl2/CK8x4W
 ssh-private-key: ENC[AES256_GCM,data:JrRarfeS3y6b9gxg4Za5GIc5Ci3aGR+OyZxQybj4dcv2mzxXmT/bm7KOwM1zkz1PFl1xW5X82T5jte+XQOKx0+6m4ovjUgUmQUMP4E/yosp8XSdi0+YlUKBEHEJx6HqCZy+v6qx5kfp9JC6fZqCbL1J6FIqWqAoKTFXoiou1YnhmBa2fM17Q++i6TflDWiVrUS7X9xjuZFq1hz1aQXS303uvJEUOEpXdqPyJvUKJWzVsFrAwpa9FG+reO70SSc+1hBbqdw1QjrzNWh3eNnztwZURauJtVFBYUZ5ozHmWBr4aVFjYvqz+t6G1SAunmBRbVqbH4bjBv9jXXjHAB4U0wanvkJN2C+EY1zxwjyx2fWckMdhoLr9gtC1FJKMbV49UFHJ3iXWNczKj1t7LrctehEKXJa0Eb3UogYuaRxbVYbC++kD8LvL4AY8ertgc9/pxQQZmogdINJmIxKN4HTlGbX8kSDLbohZLheOfzZ5ycTlrbOjfJ1EBMLo+mJcMUW0qhFySl1aamPqTeII7lvgTOE3xV/d/9VAQTFKsftWPNkfhAJIym51bYrrMPV8AVeFQnLhSid3d3zK4w20zIQKSYnq9A8zcNhM0keddiv4XC+M=,iv:7HP7VCFpMRZXRD6GD/zFzDSBO02V/DyxKLmuDCLXTLU=,tag:Ugx81JwCP8HmhtflYoevLg==,type:str]
 nix-github-token: ENC[AES256_GCM,data:AXV0ODLhfa4M6+7clulfIKm0qCOeo3lQ+66iYgoDeR12RxZOV19UtA==,iv:1XECVKyzH3NumKwRSPKNlUwJMLFwptcG8DQ09U4LrGk=,tag:QdtvJNV8BttWjhH4v0RtRQ==,type:str]
 docker-password: ENC[AES256_GCM,data:mK5YWEQPKWBtVCgRBZvwWTdVAi8MEGbLnLeP7hfDkcc=,iv:Az8+eAK6R6xssmmbhuEsDbLU+ks8lS+qzc4L33WfefA=,tag:NSXvRhbIuRZZqRR28Tu0PQ==,type:str]
+jellyfin-password: ENC[AES256_GCM,data:ugfwgpkIiLY0O+m/UGnBB5AFPBkCcai+RQOkxiCSohE=,iv:VP+Jyv2lUIBz1dFow038uN0KT+tQKK9uGr7/T5crlgk=,tag:rPGPpaqZApfHkecLBSs4Yw==,type:str]
 #
 #ENC[AES256_GCM,data:y5dlZFhK38dR+Q==,iv:1JYizUeyWeMR4KUblkj7kVSHPCL5l8mFpaQdo774BcM=,tag:kUTnBZb46KYQyi8bgIYSOQ==,type:comment]
 #
@@ -18,6 +19,8 @@ kopia-server-username: ENC[AES256_GCM,data:4onewFkWpi9g,iv:aA4WSS8T6KUcGbAIHDd8B
 kopia-server-password: ENC[AES256_GCM,data:6nMnhRA=,iv:Qz9qP+m0obzL+eHFmW1qVmc/0TR4Iw4X1GL4zACOSMk=,tag:v3v+33+g4y6se5q+b4e8mA==,type:str]
 kopia-user-password: ENC[AES256_GCM,data:jPWeru4e2w9qzA==,iv:WpZS3Qmx8v12v3q1Lq1YrPnWw7BY0FhxurXYuaOdfwA=,tag:+8bQAnHRh55rUMdyoK6N8w==,type:str]
 paperless-nextcloud-sync-password: ENC[AES256_GCM,data:pfLg3OVBqLsM4R7mSgLQEachj9gMkexPjBMSyzU=,iv:XBe1cdwlTjPfQW70NIEjD8CikK58iGErI9ZTlLWtCA4=,tag:qO35GdjljgS3/z5/1fCOFg==,type:str]
+ntfy-auth-users: ENC[AES256_GCM,data:IHnJJgUL9RqkEAoJ2Q9Oo0RkfgLXG7vih5NFPrPNBoIzMafdLXxHqNOAd1oRaOUd6AKmWdQ3uKAZINj7oGZEKMsMxUEv1WW6IXUuPnDeJe5EthINWCuaW2Z64PJl+uqgnWr4wDi7QT0zwjb/oL3gYfjH1xtfMadTzkWbmnxQ9jlP/nXe9JR1/oCrHv3dio5uU017cA==,iv:JmWnu25ZB/qqI2RsgHQ0bcat69V7p5MJ6cf5eFcSsns=,tag:6Z2LseCav/qyLh2nn+7uuw==,type:str]
+ntfy-auth-tokens: ENC[AES256_GCM,data:C23r9djvEukUgDDloFGm52spwcW1DB5Jcwt9kxghLjL3vNiQ9HzGrvlSl5oEppoNa23BF0+t,iv:O9LepUKGbyXTHMvwn1avdJEhcMgtr2Sb1imIJ8ALMYY=,tag:o3g6f7YZL2VfgfeymzJK1g==,type:str]
 #
 #ENC[AES256_GCM,data:Gdh/hjCaOuAE,iv:XjPXn3SskpUPUkDIEDl5701/g9QhuS83fACMaoPMiIM=,tag:Q7s8xZG/GsOtQrasekBnkQ==,type:comment]
 #
@@ -33,7 +36,7 @@ sops:
             SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h
             FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-19T01:29:00Z"
+    lastmodified: "2026-04-17T12:17:23Z"
-    mac: ENC[AES256_GCM,data:IzLYRuOlkUpry37sw7OB5MglntVflMjCcNiWpi7rvT2suOivLX9IT36qZFfYIbVIFXDmfsi1hsTvsPyekD7vVWQ1vkajAlGQYYTVpnO2cFrK3+TfWCyYjiD01rQBiRikybrR11zWRq6atieurDIxMUMEI7ypiqFOwpYaqSePAFc=,iv:9bc6rc4gjuiJWNjg1g0KfySqxnPjpzmlzDi/R+Iv2g4=,tag:tEwthVZAmdXbwRtoNykGrQ==,type:str]
+    mac: ENC[AES256_GCM,data:YEHM2ebPhV6ycj8OxNy7mOlpy6VrvV6Gz9sHEWc9alnrwZ0qLzp5m4AUMuWBSfFTMtVgeAFdJ8Nf4X5b+AzQXahlHWJVAwiMiE8KqhRLGWF21OyDN2aIdwd4ue2vYyPDGYP43mC+19v9SW5isF901G28e5Q9SxmGJjNOkiVuiCI=,iv:WFvCN/7YGQnCSqjXBkkfiuPoNQ37bpxHx9jreZDc3EM=,tag:AUjFpbJ6//eScnn6P2QMgA==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.12.2

system/thinknix/default.nix

@@ -46,52 +46,13 @@
       useNetworkManager = false;
 
       networks = {
-        # "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
+        "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
-        #   interface = "ens18";
+          interface = "ens18";
-        #   ips = ["192.168.86.26/24" "fd00::1a/64"];
+          ips = ["192.168.86.26/24"];
-        #   routers = ["192.168.86.5" "fd00::5"];
+          routers = ["192.168.86.5"]; # Don't add "fd00::5", rely on router advertisement instead
-        #   nameservers = ["8.8.8.8" "2001:4860:4860::8888"]; # NOTE: Use reliable DNS for servers instead of 127.0.0.1
+          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;
+          routable = true;
-        # };
+          extraAddresses = ["fd00::1a/64"]; # IPv6 ULA — declared without creating a route
-
-        # 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";
-          };
         };
       };