Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

README.md

@@ -1,6 +1,6 @@
 # ❄️ NixOS Dotfiles
 
-![Screenshot of my desktop](splash.png)
+![Screenshot of my desktop](splash.webp)
 
 ## Information
 

configuration.nix

@@ -1,4 +1,4 @@
-{ ... }@all: with all; {
+{ pkgs, ... }@all: with all; {
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./system-modules/adb.nix
@@ -9,6 +9,7 @@
     ./system-modules/cache.nix
     ./system-modules/calendar.nix
     ./system-modules/dm.nix
+    ./system-modules/davfs.nix
     ./system-modules/docker.nix
     ./system-modules/fcitx5.nix
     ./system-modules/fonts.nix
@@ -18,12 +19,12 @@
     ./system-modules/gpg.nix
     ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
-    ./system-modules/hsmw.nix
     ./system-modules/kanata.nix
     ./system-modules/terminal.nix
     ./system-modules/kodi.nix
     ./system-modules/networking.nix
     ./system-modules/nixd.nix
+    ./system-modules/nix.nix
     ./system-modules/nvidia.nix 
     ./system-modules/obs.nix
     ./system-modules/ollama.nix
@@ -32,7 +33,6 @@
     ./system-modules/sops.nix
     ./system-modules/sound.nix
     ./system-modules/sshd.nix
-    ./system-modules/base-packages.nix
     ./system-modules/input.nix
     ./system-modules/syncthing.nix
     ./system-modules/tuda.nix
@@ -43,12 +43,24 @@
     ./system-modules/users.nix
     ./system-modules/virtualisation.nix
     ./system-modules/ydotool.nix
-  ] ++ (if (hyper.host == "NxACE") then [ 
+
+    ./system-modules/simple-postgres.nix
+  ] ++ (if hyper.isServer then [ 
+    ./system-modules/stay-up.nix
+
     ./system-modules/nx2site.nix
     ./system-modules/hugo.nix
     ./system-modules/postgres.nix
     ./system-modules/nx2site/proxy.nix
+    # ./system-modules/nx2site/smtp.nix
+    # ./system-modules/nx2site/imap.nix
+    # ./system-modules/nx2site/vmail.nix
+    ./system-modules/nx2site/maddy.nix
+
     ./system-modules/nx2site/audiobookshelf.nix
+    # ./system-modules/nx2site/baikal.nix
+    ./system-modules/nx2site/nextcloud.nix
+    ./system-modules/nx2site/nxcaldav.nix
     ./system-modules/nx2site/copyparty.nix
     ./system-modules/nx2site/gitea.nix
     ./system-modules/nx2site/open-web-calendar.nix
@@ -57,13 +69,13 @@
     ./system-modules/nx2site/paperless.nix
     ./system-modules/calendar/publish.nix
     ./system-modules/calendar/lec.nix
-    ./system-modules/calendar/lr.nix
-    ./system-modules/calendar/dicos.nix
-  ] else [
-  ]);
-  systemd.extraConfig = "DefaultLimitNOFILE=2048";
-  system.stateVersion = hyper.pkgs-version;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+    # ./system-modules/calendar/lr.nix
+  ] else [ ]);
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+
+  system.stateVersion = hyper.main-pkgs-version;
+
+  programs.nix-ld.enable = true; 
   programs.bash.shellInit = ''
     if [[ "$USER" == "${hyper.user}" ]]; then
       source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

flake-modules/allowed.nix

@@ -1,48 +1,31 @@
+pkgs: rec {
+  predicate = pkg: (
+    builtins.elem (pkgs.lib.getName pkg) unfree.packages || builtins.all (
+      license: license.free || builtins.elem license.shortName unfree.licenses 
+    ) (if builtins.isList pkg.meta.license then pkg.meta.license else [ pkg.meta.license ])
+  );
+  unfree = {
+    packages = [
+      "antigravity"
+      "cursor"
+      "discord"
+      "obsidian"
+      "spotify"
+      "steam"
+      "steam-unwrapped"
+      "vscode-extension-mhutchie-git-graph"
+      "zoom"
+      "zoom-us"
 
-{
-  unfree = [
-    "cursor"
-    "discord"
-    "spotify"
-    "obsidian"
-    "steam"
-    "steam-unwrapped"
-    "zoom-us"
-    "zoom"
-
-    # since the predicate ist to be set in the flake and not in a module
-    # it is impossible to make the list dynamic and respect nvidia.enable
-    "nvidia-x11"
-    "nvidia-settings"
-    "nvidia-persistenced"
-    "cudatoolkit"
-    "cuda-merged"
-    "cuda_cuobjdump"
-    "cuda_gdb"
-    "cuda_nvcc"
-    "cuda_nvdisasm"
-    "cuda_nvprune"
-    "cuda_cccl"
-    "cuda_cudart"
-    "cuda_cupti"
-    "cuda_cuxxfilt"
-    "cuda_nvml_dev"
-    "cuda_nvrtc"
-    "cuda_nvtx"
-    "cuda_profiler_api"
-    "cuda_sanitizer_api"
-    "libcublas"
-    "libcufft"
-    "libcurand"
-    "libcusolver"
-    "libnvjitlink"
-    "libcusparse"
-    "libnpp"
-
-    "vscode-extension-mhutchie-git-graph"
-  ];
-
-  inecure = [
-    # "electron-25.9.0"
-  ];
+      "nvidia-x11"
+      "nvidia-settings"
+    ];
+    licenses = [
+      "CUDA EULA"
+      "cuDNN EULA"
+      "cuTENSOR EULA"
+      "NVidia OptiX EULA"
+    ];
+  };
+  # insecure = [ ];
 }

flake-modules/colors.json

@@ -1,13 +1,54 @@
 {
-    "base": {
-        "foreground": "#eddbef",
-        "background": "#100711"
+    "NxXPS": {
+        "base": {
+            "foreground": "#fccee9",
+            "background": "#18010e"
+        },
+        "to_alter": {
+            "accent": "#f43da7",
+            "secondary": "#3269ff",
+            "tertiary": "#d744ed",
+            "special": "#3cf48a",
+            "weird": "#f4c63c"
+        }
     },
-    "to_alter": {
-        "accent": "#ba71c0",
-        "secondary": "#3266ff",
-        "tertiary": "#4bb6e6",
-        "special": "#76c071",
-        "weird": "#c08571"
+    "NxACE": {
+        "base": {
+            "foreground": "#dddddd",
+            "background": "#111111"
+        },
+        "to_alter": {
+            "accent": "#ff6666",
+            "secondary": "#ff8866",
+            "tertiary": "#ff6688",
+            "special": "#8888ff",
+            "weird": "#88ff66"
+        }
+    },
+    "NxNORTH": {
+        "base": {
+            "foreground": "#dbe7ef",
+            "background": "#070d11"
+        },
+        "to_alter": {
+            "accent": "#72a2bf",
+            "secondary": "#fc3535",
+            "tertiary": "#83ae8a",
+            "special": "#bf8f71",
+            "weird": "#a871bf"
+        }
+    },
+    "NxDCS": {
+        "base": {
+            "foreground": "#ddcccc",
+            "background": "#080707"
+        },
+        "to_alter": {
+            "accent": "#d23f36",
+            "secondary": "#355273",
+            "tertiary": "#1b789b",
+            "special": "#66dd66",
+            "weird": "#dddd66"
+        }
     }
 }

flake-modules/hyper.nix

@@ -0,0 +1,46 @@
+let hyper-base = rec {
+  host    = "BaseHost";
+  system  = "x86_64-linux";
+  user    = "nx2";
+  domain  = "nx2.site";
+  home    = "/home/${user}";
+  webroot = "/var/lib/hugo/nx2site/public";
+  main-pkgs-version = "25.11";
+  isServer = false;
+  isMobile = false;
+  isPersonal = false;
+  isNOD = false;
+  isWorkstation = false;
+  nvidia = {
+    enable = false;
+    prime = false;
+  };
+}; in host: if host == "NxNORTH" then hyper-base // { inherit host;
+  nvidia = {
+    enable = true;
+    prime = false;
+  };
+  isPersonal = true;
+  isWorkstation = true;
+} else if host == "NxXPS" then hyper-base // { inherit host;
+  nvidia = {
+    enable = true;
+    prime = true;
+  };
+  isMobile = true;
+  isPersonal = true;
+  isWorkstation = true;
+} else if host == "NxACE" then hyper-base // { inherit host;
+  isServer = true;
+} else if host == "NxDCS" then hyper-base // { inherit host;
+  isWorkstation = true;
+  isMobile = true;
+} else if host == "NxS23U" then hyper-base // { inherit host;
+  isMobile = true;
+  isNOD = true;
+  isPersonal = true;
+  main-pkgs-version = "24.05";
+  system = "aarch64-linux";
+  user = "nix-on-droid";
+  home = "/data/data/com.termux.nix/files/home";
+} else assert false "unkown host"; {} 

flake-modules/nvidia.nix

@@ -1,4 +0,0 @@
-{
-  enable = false;
-  prime = false;
-}

flake-modules/nxlib/ricelib.nix

@@ -0,0 +1,43 @@
+lib: let
+  # takes in "ff0044" (no hash!) and returns { r = "ff", g = "00", b = "44" }
+  slice-hex = hex: with builtins; { r = substring 0 2 hex; g = substring 2 2 hex; b = substring 4 2 hex; };
+
+  # takes in "44" and returns 64
+  drune-to-255 = drune: with builtins; (rune-to-num (substring 0 1 drune)) * 16 + (rune-to-num (substring 1 1 drune));
+  num-to-drune = num: "${num-to-rune (num / 16)}${num-to-rune (num - ((num / 16) * 16))}";
+  
+  # takes in "D" and returns 13
+  # inspiration from https://github.com/bertof/nix-rice
+  rune-to-num = rune: let
+    dict = { "0" = 0; "1" = 1; "2" = 2; "3" = 3; "4" = 4; "5" = 5; "6" = 6; "7" = 7; "8" = 8; "9" = 9; "A" = 10; "B" = 11; "C" = 12; "D" = 13; "E" = 14; "F" = 15; };
+  in assert(builtins.hasAttr (lib.strings.toUpper rune) dict); builtins.getAttr (lib.strings.toUpper rune) dict;
+
+  # takes in 15 and returns "F"
+  num-to-rune = num: let
+    num-string = builtins.toString num;
+    dict = { "0" = "0"; "1" = "1"; "2" = "2"; "3" = "3"; "4" = "4"; "5" = "5"; "6" = "6"; "7" = "7"; "8" = "8"; "9" = "9"; "10" = "A"; "11" = "B"; "12" = "C"; "13" = "D"; "14" = "E";  "15" = "F"; };
+  in assert(builtins.hasAttr num-string dict); builtins.getAttr num-string dict;
+
+  # Keeps num between 0 and 255
+  # Make sure to pass in an int not a float
+  cap-255 = num: (if (num>255) then 255 else if (num<0) then 0 else num);
+  nohash = hex: with builtins; assert((stringLength hex) == 7); substring 1 6 hex;
+in {
+  ## USEFUL FUNCTIONS
+  # takes in a string like "#ff0044" and returns "ff0044" symbol
+  inherit nohash;
+
+  # This takes in something like "#ff0044" and returns "255,0,64"
+  hex-to-rgb-comma-string = hex: with (slice-hex (nohash hex)); with builtins; assert(isString hex); "${toString (drune-to-255 r)},${toString (drune-to-255 g)},${toString (drune-to-255 b)}";
+
+  # This is useful if you have a float (like a transparency value) and want a drune representation of it
+  # So 0.0 -> "00" and 1.0 -> "FF" 
+  float-to-drune = f: with builtins; assert(isFloat f); "${num-to-rune (floor((255*f) / 16))}${num-to-rune (floor(255*f) - (floor((255*f) / 16) * 16))}";
+
+  # Takes in hex and a float. 0.5 is +50% brightness and (-0.5) is -50% brightness.
+  # So "#ff0044": 0.3 -> "#ff0055"
+  alter-luminace-hex = hex: amount:  let 
+    color-num = with (slice-hex (nohash hex)); { r = drune-to-255 r; g = drune-to-255 g; b = drune-to-255 b; };
+    alter = num: (num-to-drune (cap-255 (builtins.floor ((125 * amount) + (num * (1+amount))) )));
+  in with color-num; "#${alter r}${alter g}${alter b}";
+}

flake-modules/pkgs.nix

@@ -0,0 +1,29 @@
+inputs: simple-pkgs: hyper: let
+  args = {
+    system = hyper.system;
+    config = {
+      allowUnfreePredicate = (import ./allowed.nix simple-pkgs).predicate;
+      cudaSupport = hyper.nvidia.enable;
+      cudaForwardCompat = hyper.nvidia.enable;
+    };
+  };
+  overlays = [(final: prev: {
+    unstable = import inputs.nixpkgs-unstable args;
+    latest   = import inputs.nixpkgs-latest args;
+    pkgs-version = hyper.main-pkgs-version;
+  })] ++ (if hyper.isServer then [
+    inputs.copyparty.overlays.default
+  ] else []);
+in if !hyper.isNOD then 
+  (import inputs.nixpkgs (args // { inherit overlays; }))
+else (
+  (import inputs.nixpkgs (args // { inherit overlays; })) // # normal as base 
+  (import inputs.nixpkgs24 (args // { # overwrite with old versions
+    overlays = [(final: prev: {
+      pkgs-version = "24.05";
+    })];
+  }))
+)
+
+
+

flake-modules/rice.nix

@@ -1,6 +1,6 @@
-pkgs: rec {
+pkgs: hyper: rec {
 
-  lib = import ../nxlib/ricelib.nix pkgs.lib;
+  lib = import ./nxlib/ricelib.nix pkgs.lib;
 
   transparency = 0.8;
   rounding = 3;
@@ -36,17 +36,12 @@ pkgs: rec {
       red =     "#dd4444"; # "#dd1111" "#00aa00";
       yellow =  "#dddd44"; # "#dddd11" "#ffff00";
     };
-    facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter;
-    fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json)).base;
+    facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json))."${hyper.host}".to_alter;
+    fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json))."${hyper.host}".base;
     fcolor = facolor // fbcolor;
     xcolor = with ccolor; with fcolor; {
       # background = "#000000";
       # foreground = "#dddddd";
-      # accent = blue;
-      # secondary = cyan;
-      # tertiary = magenta;
-      # special = yellow;
-      # weird = green;
       subtle = { darker = "#111111"; dark = "#444444"; base = "#777777"; bright = "#999999"; brighter = "#cccccc"; };
       positive = alter "#00dd00";
       negative = alter "#dd0000";
@@ -55,13 +50,12 @@ pkgs: rec {
     };
   in ccolor // fcolor // xcolor; 
   font = {
-    code = {
+    code = rec {
       name = "JetBrainsMono Nerd Font";
       package = pkgs.nerd-fonts.jetbrains-mono;
+      regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
     };
     base = {
-      # name = "NewComputerModern08";
-      # package = pkgs.newcomputermodern;
       name = "Atkinson Hyperlegible";
       package = pkgs.atkinson-hyperlegible-next;
     };

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760101617,
-        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "lastModified": 1778857089,
+        "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1761517857,
-        "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=",
+        "lastModified": 1779740183,
+        "narHash": "sha256-WgZFCa8mutaHzVVdS9QedtDWpVKsOGtqou8LNqHwvn4=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57",
+        "rev": "e32718303cd7560f60d3e0ddd473a8a69d7dfa81",
         "type": "github"
       },
       "original": {
@@ -70,15 +70,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -102,11 +102,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -153,7 +153,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -220,16 +220,37 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1779506708,
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager24": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs24"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -250,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "lastModified": 1776511930,
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
         "type": "github"
       },
       "original": {
@@ -279,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "lastModified": 1776426399,
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
         "type": "github"
       },
       "original": {
@@ -297,22 +318,23 @@
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
         "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1761249114,
-        "narHash": "sha256-KDy8Vtlwe+7Z053HtD4fCRqlHBt0Kils0Zea4D77R7o=",
+        "lastModified": 1779729308,
+        "narHash": "sha256-tMt7oeAahwHGDgSIf5XKZoUXenOvlxjI0KBPku97tzM=",
         "ref": "refs/heads/main",
-        "rev": "aa5a239ac92a6bd6947cce2ca3911606df392cb6",
-        "revCount": 6522,
+        "rev": "bb3353f864be97e9236cfafca68ce71d7cf590dc",
+        "revCount": 7364,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -323,33 +345,49 @@
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
-    "hyprland-plugins": {
+    "hyprland-guiutils": {
       "inputs": {
-        "hyprland": [
-          "hyprland"
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
         ],
         "nixpkgs": [
-          "hyprland-plugins",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "hyprland-plugins",
           "hyprland",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1761653710,
-        "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=",
+        "lastModified": 1776426575,
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
-        "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85",
+        "repo": "hyprland-guiutils",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
+        "repo": "hyprland-guiutils",
         "type": "github"
       }
     },
@@ -365,11 +403,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
         "type": "github"
       },
       "original": {
@@ -378,74 +416,6 @@
         "type": "github"
       }
     },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749154592,
-        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759080228,
-        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -462,11 +432,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758927902,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "lastModified": 1777320127,
+        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
         "type": "github"
       },
       "original": {
@@ -475,24 +445,55 @@
         "type": "github"
       }
     },
-    "hyprspace": {
+    "hyprtoolkit": {
       "inputs": {
-        "hyprland": [
-          "hyprland"
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
         ],
-        "systems": "systems_2"
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1759033501,
-        "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=",
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
-        "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd",
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
         "type": "github"
       }
     },
@@ -508,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759619523,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "lastModified": 1779475241,
+        "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "3cd3972b2ee658a14d2610d8494e09259e530124",
         "type": "github"
       },
       "original": {
@@ -533,11 +534,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "lastModified": 1777159683,
+        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
         "type": "github"
       },
       "original": {
@@ -546,6 +547,35 @@
         "type": "github"
       }
     },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778410714,
+        "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -570,17 +600,68 @@
         "type": "github"
       }
     },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager24"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs24"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1720396533,
+        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_3",
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1761563673,
-        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
+        "lastModified": 1777732699,
+        "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
+        "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
         "type": "github"
       },
       "original": {
@@ -605,13 +686,45 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1720244366,
+        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      }
+    },
     "nixpkgs-latest": {
       "locked": {
-        "lastModified": 1761810199,
-        "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=",
+        "lastModified": 1779791687,
+        "narHash": "sha256-ynEmhfOI9cWkI8AUiFimNWutJ+RNibt1Ge4azZVbTQ8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3",
+        "rev": "8d10ccfc5381d4129e7730b5bfbe67709f06777e",
         "type": "github"
       },
       "original": {
@@ -639,11 +752,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761672384,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -652,13 +765,29 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs24": {
       "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1779357205,
+        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
         "type": "github"
       },
       "original": {
@@ -686,11 +815,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "lastModified": 1776169885,
+        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
         "type": "github"
       },
       "original": {
@@ -702,26 +831,26 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1761468971,
-        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
+        "lastModified": 1779467186,
+        "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
+        "rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "type": "indirect"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1756288264,
-        "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=",
+        "lastModified": 1776329215,
+        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9",
+        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
         "type": "github"
       },
       "original": {
@@ -731,6 +860,60 @@
         "type": "github"
       }
     },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -741,11 +924,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
         "type": "github"
       },
       "original": {
@@ -785,14 +968,15 @@
       "inputs": {
         "copyparty": "copyparty",
         "home-manager": "home-manager",
+        "home-manager24": "home-manager24",
         "hyprland": "hyprland",
-        "hyprland-plugins": "hyprland-plugins",
-        "hyprspace": "hyprspace",
         "lanzaboote": "lanzaboote",
+        "nix-on-droid": "nix-on-droid",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-latest": "nixpkgs-latest",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs24": "nixpkgs24",
         "sops-nix": "sops-nix",
         "yazi": "yazi"
       }
@@ -826,11 +1010,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756348497,
-        "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=",
+        "lastModified": 1776741231,
+        "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f",
+        "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
         "type": "github"
       },
       "original": {
@@ -839,6 +1023,22 @@
         "type": "github"
       }
     },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -846,11 +1046,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -875,21 +1075,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -932,11 +1117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760713634,
-        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
+        "lastModified": 1778265244,
+        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
+        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
         "type": "github"
       },
       "original": {
@@ -952,11 +1137,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1761655046,
-        "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=",
+        "lastModified": 1779676204,
+        "narHash": "sha256-/DLVKPqrU3WuY99jrHjYuIR0yGl98mGS6izK5rC1gZM=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb",
+        "rev": "cf8b54179ea0de392629d93081afca9e5587225e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,98 +2,90 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs =          { url = "nixpkgs/nixos-25.05";                                                                   };
-    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                };
-    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                       };
+    nixpkgs.url = "nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master";
+    nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05";
 
-    home-manager =     { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs";   };
+    home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; };
+    home-manager24 = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; };
 
-    nixos-wsl =        { url = "github:nix-community/NixOS-WSL/main";                                                   };
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/release-24.05";
+      inputs = { nixpkgs.follows = "nixpkgs24"; home-manager.follows = "home-manager24"; };
+    };
 
-    sops-nix =         { url = "github:Mic92/sops-nix";                           inputs.nixpkgs.follows = "nixpkgs";   };
-    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.4.2";                                                };
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
 
-    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                   };
-    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                  inputs.hyprland.follows = "hyprland"; };
-    hyprspace =        { url = "github:KZDKM/Hyprspace";                          inputs.hyprland.follows = "hyprland"; };
+    sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
 
-    yazi =             { url = "github:sxyazi/yazi";                                                                    };
-    copyparty =        { url = "github:9001/copyparty";                                                                 };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    yazi.url = "github:sxyazi/yazi";
+    copyparty.url = "github:9001/copyparty";
   };
 
   outputs = { ... }@inputs: with inputs; let
-
     system = "x86_64-linux";
     simple-pkgs = import nixpkgs { inherit system; };
-    config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
-
-    hyper-base = rec {
-      inherit system;
-      user    = "nx2";
-      domain  = "nx2.site";
-      home    = "/home/${user}";
-      webroot = "/var/lib/hugo/nx2site/public";
-      pkgs-version = "25.05";
-    };
-
-    my-pkgs = host: import nixpkgs {
-      inherit system config;
-      overlays = [(final: prev: {
-        unstable = import nixpkgs-unstable { inherit system config; };
-        latest   = import nixpkgs-latest   { inherit system config; };
-        version  = "25.05";
-      })] ++ (if host == "NxACE" then [
-        copyparty.overlays.default
-      ] else []);
-    };
-
-    nvidia-base = import ./flake-modules/nvidia.nix;
-    secrets     = import ./git-crypt/secrets.nix;
-    rice        = import ./flake-modules/rice.nix simple-pkgs;
+    get-pkgs  = import ./flake-modules/pkgs.nix inputs simple-pkgs;
+    get-hyper = import ./flake-modules/hyper.nix;
+    secrets   = import ./git-crypt/secrets.nix;
+    get-rice  = import ./flake-modules/rice.nix simple-pkgs;
   in {
     nixosConfigurations = let
-      make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
+      make-nixos-system = host: let
+        hyper = get-hyper host;
+        rice = get-rice hyper;
+      in nixpkgs.lib.nixosSystem { 
+        pkgs = get-pkgs hyper;
         modules = [ ./configuration.nix ];
-        specialArgs = let
-          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
-        in { inherit inputs hyper rice secrets; };
+        specialArgs = { inherit inputs hyper rice secrets; };
       };
-      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
-        modules = [ ./nixos-wsl.nix ];
-        specialArgs = let
-          hyper = hyper-base // { inherit host; };
-        in { inherit inputs hyper rice; };
+      make-nixos-wsl-system = host: let hyper = get-hyper host; in nixpkgs.lib.nixosSystem { 
+        pkgs = get-pkgs hyper;
+        modules = [ ./wsl.nix ];
+        specialArgs = { inherit inputs hyper rice; };
       };
     in {
-      NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; 
-      NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; 
-      NxACE = make-nixos-system "NxACE" { enable = false; };
-      NxDCS = make-nixos-wsl-system "NxDCS";
+      NxNORTH = make-nixos-system     "NxNORTH";
+      NxXPS   = make-nixos-system     "NxXPS";
+      NxACE   = make-nixos-system     "NxACE";
+      NxDCS   = make-nixos-wsl-system "NxDCS";
     };
 
-    homeConfigurations = let 
-      make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
-        modules = [ ./home.nix ];
-        extraSpecialArgs = let
-          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
-        in { inherit inputs hyper rice secrets; };
+    nixOnDroidConfigurations = let
+      makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
+        hyper = get-hyper host; 
+        pkgs = get-pkgs hyper;
+        modules = [ ./nod.nix ];
+        home-manager-path = home-manager24.outPath;
+        extraSpecialArgs = { inherit inputs hyper rice; };
       };
-      make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
+    in { NxS23U = makeNODConfiguration "NxS23U"; };
+
+    homeConfigurations = let 
+      make-home-configuration = host: let
+        hyper = get-hyper host;
+        rice = get-rice hyper;
+      in home-manager.lib.homeManagerConfiguration {
+        pkgs = get-pkgs hyper;
+        modules = [ ./home.nix ];
+        extraSpecialArgs = { inherit inputs hyper rice secrets; };
+      };
+      make-shell-configuration = host: let
+        hyper = get-hyper host;
+        rice = get-rice hyper;
+      in home-manager.lib.homeManagerConfiguration {
+        pkgs = get-pkgs hyper;
         modules = [ ./shell-only.nix ];
-        extraSpecialArgs = let
-          hyper = hyper-base // { inherit host; };
-        in { inherit inputs hyper rice secrets; };
+        extraSpecialArgs = { inherit inputs hyper rice secrets; };
       };
     in {
-      "${hyper-base.user}@NxXPS" = make-home-configuration "NxXPS" hyper-base.user { enable = true; prime = true; }; 
-      "${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; }; 
-      "${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; }; 
-
-      "${hyper-base.user}@NxDCS" = make-shell-configuration "NxDCS" hyper-base.user;
+      "nx2@NxXPS"   = make-home-configuration  "NxXPS";
+      "nx2@NxNORTH" = make-home-configuration  "NxNORTH";
+      "nx2@NxACE"   = make-home-configuration  "NxACE";
+      "nx2@NxDCS"   = make-shell-configuration "NxDCS";
     };
   };
 }

home-modules/bar/caldav-event.nix

@@ -1,16 +1,17 @@
-{ pkgs, ... }@all: with all; {
+{ pkgs, ... }@all: with all; let
+  username = "lennart";
+in {
   sops.secrets = {
-    "nx2site/radicale/password" = { };
+    "nx2site/nextcloud/lennart_pass" = { };
   };
   home.packages = [
     (pkgs.writers.writePython3Bin "caldav_event" {
       libraries = with pkgs.python3Packages; [ caldav ics pytz ];
       flakeIgnore = [ "E302" "E305" "E501" "E261" ];
     } /* python */ ''
-import os
 import json
 from caldav import DAVClient
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 from ics import Calendar
 from pytz import UTC
 
@@ -33,13 +34,15 @@ def datetime_parser(dct):
     return dct
 
 def load_cache(cache_file):
-    if os.path.exists(cache_file):
+    try:
         with open(cache_file, "r") as file:
             return json.load(file, object_hook=datetime_parser)
-    return None
+    except (json.JSONDecodeError, FileNotFoundError):
+        return None
 
 def save_cache(cache_file, data):
     with open(cache_file, "w") as file:
+        data['last_checked'] = datetime.now(timezone.utc)
         json.dump(data, file, default=datetime_converter, indent=4)
 
 
@@ -59,6 +62,8 @@ def get_ongoing_or_next_event(url, username, password):
 
         for calendar in calendars:
             for event in calendar.search(start=now):
+                if "VEVENT" not in event.data:
+                    continue
                 calendar_parsed = Calendar(event.data)
                 for ics_event in calendar_parsed.events:
                     event_dict = {}
@@ -73,7 +78,7 @@ def get_ongoing_or_next_event(url, username, password):
         return next_event_dict
 
     except Exception as e:
-        print(f"Error accessing {url}: {e}")
+        print(f"Error accessing {url}: {str(e)}".splitlines()[0])
         return None
 
 def is_expired(event_dict: dict):
@@ -81,17 +86,22 @@ def is_expired(event_dict: dict):
     event_end = event_dict['event_end'].timestamp()
     return not (now <= event_end)
 
+def is_too_old(event_dict: dict) -> bool:
+    last_checked = event_dict['last_checked']
+    now = datetime.now(timezone.utc)
+    return now - last_checked >= timedelta(minutes=10)
+
 if __name__ == "__main__":
-    password_file = "${config.sops.secrets."nx2site/radicale/password".path}"  # Path to password file
+    password_file = "${config.sops.secrets."nx2site/nextcloud/lennart_pass".path}"  # Path to password file
     cache_file = "/tmp/caldav_event_cache.json"  # Path to cache file
-    url = "https://dav.${hyper.domain}/"
-    username = "nx2"
+    url = "https://n.${hyper.domain}/remote.php/dav/calendars/${username}/"
+    username = "${username}"
     password = get_password(password_file)
     now = datetime.now(timezone.utc).timestamp()
 
     event_dict = load_cache(cache_file)
 
-    if (event_dict is None) or (is_expired(event_dict)):
+    if (event_dict is None) or is_expired(event_dict) or is_too_old(event_dict):
         event_dict = get_ongoing_or_next_event(url, username, password)
         save_cache(cache_file, event_dict)
 
@@ -120,7 +130,7 @@ if __name__ == "__main__":
     else:
         time_string = "in " + hour_string + "and " + minu_string
 
-    print(f"\'{event_dict['event_name']}\' {action_string} {time_string}")
+    print(f"\'{event_dict['event_name']}\' {action_string} {time_string}".splitlines()[0])
 '')
   ];
 }

home-modules/bash.nix

@@ -1,6 +1,10 @@
-{ ... }: 
+{ pkgs, ... }: 
 {
-  programs.bash = {
+  programs.bash = let
+    init = /* bash */ ''
+      source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    '';
+  in {
     enable = true;
     shellAliases = {
       ll = "ls -l"; 
@@ -15,5 +19,10 @@
       "checkjobs"
     ];
     enableCompletion = false;
+    
+  } //  pkgs.lib.mkIf (pkgs.version != "24.05") {
+    shellInit = init;
+  } //  pkgs.lib.mkIf (pkgs.version != "25.11") {
+    profileExtra = init; 
   };
 }

home-modules/bitwarden.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
-    bitwarden
+    bitwarden-desktop
   ];
 }

home-modules/calendar.nix

@@ -1,31 +1,44 @@
 { pkgs, ... }@all: with all; let
-  calendars = with hyper; [
+  v = "nxc";
+  user = "lennart";
+  domain = hyper.domain;
+  calendars = let
+    bs = "https://n.${domain}/remote.php/dav/calendars/lennart";
+  in [
     {
       name = "Preservation";
       primary = true;
-      url = "https://dav.${domain}/${user}/preservation/";
+      url = "${bs}/preservation/";
       color = "#dddddd";
     }
     {
       name = "Effort";
-      url = "https://dav.${domain}/${user}/effort/";
+      url = "${bs}/effort/";
       color = "#dd2222";
     }
     {
       name = "Experience";
-      url = "https://dav.${domain}/${user}/experience/";
+      url = "${bs}/experience/";
       color = "#2222dd";
     }
     {
-      name = "Exposure";
-      url = "https://dav.${domain}/${user}/exposure/";
+      name = "Leisure";
+      # name = "Exposure";
+      url = "${bs}/leisure/";
+      # url = "https://${v}.${domain}/${user}/exposure/";
       color = "#22aa22";
     }
-    {
-      name = "Engagement";
-      url = "https://dav.${domain}/${user}/engagement/";
-      color = "#8800CC";
-    }
+    # {
+    #   name = "Engagement";
+    #   url = "https://${v}.${domain}/${user}/engagement/";
+    #   color = "#8800CC";
+    # }
+    # {
+    # {
+    #   name = "Family";
+    #   url = "${bs}/family/";
+    #   color = "#dddd22";
+    # }
     {
       name = "Sleep as Android";
       url = secrets.calendar.sleep-as-android-url;
@@ -40,20 +53,6 @@
       read-only = true;
       type = "ics";
     }
-    {
-      name = "LR";
-      url = "https://${domain}/lr.ics";
-      color = "#005040";
-      read-only = true;
-      type = "ics";
-    }
-    {
-      name = "Worlds";
-      url = "https://zlypher.github.io/lol-events/cal/league-of-legends-world-championship.ical";
-      color = "#A4C3DE";
-      read-only = true;
-      type = "ics";
-    }
     {
       name = "Feiertage Hessen";
       url = "https://ics.tools/Feiertage/hessen.ics";
@@ -82,7 +81,7 @@ in {
       inherit primary;
       remote = {
         inherit url name;
-        userName = hyper.user; # my globally set username
+        userName = user;
       };
     };
   in lib.attrsets.mergeAttrsList (
@@ -102,7 +101,7 @@ in {
       "calendar.registry.${to_safe_name calendar.name}.name" = name;
       "calendar.registry.${to_safe_name calendar.name}.type" = type;
       "calendar.registry.${to_safe_name calendar.name}.uri" = url;
-      "calendar.registry.${to_safe_name calendar.name}.username" = hyper.user;
+      "calendar.registry.${to_safe_name calendar.name}.username" = user;
       "calendar.registry.${to_safe_name calendar.name}.readOnly" = read-only;
     }) calendars
   ) // {

home-modules/chatterino.nix

@@ -2,32 +2,34 @@
 let
   channels = [
     "Caedrel"
+    "Caedrel247"
     # "agurin"
     # "asmongold"
     # "Caedrel"
     # "EintrachtSpandau"
     # "GamesDoneQuick"
-    "Odoamne"
-    "iwdominate"
-    "imls"
-    "gdolphn"
+    # "Odoamne"
+    # "iwdominate"
+    # "imls"
+    # "gdolphn"
     "GRONKH"
-    "handofblood"
-    "HisWattson"
-    "Jankos"
+    # "handofblood"
+    # "HisWattson"
+    # "Jankos"
     # "KuruHS"
     "LEC"
     "lol_nemesis"
     # "NASA"
-    "NoWay4u_Sir"
+    # "nattynattlol"
+    # "NoWay4u_Sir"
     # "OfficialMikeShinoda"
-    "Rekkles"
+    # "Rekkles"
     "riotgames"
-    "thebausffs"
-    "ThePrimeagen"
-    "Tolkin"
-    "imperialhal__"
-    "velja_lol"
+    # "thebausffs"
+    # "ThePrimeagen"
+    # "Tolkin"
+    # "imperialhal__"
+    # "velja_lol"
     # "Xisuma"
     "zackrawrr"
   ];
@@ -50,8 +52,8 @@ in {
 
   home = {
     packages = with pkgs; [
-      chatterino2
-      streamlink
+      unstable.chatterino2
+      unstable.streamlink
       # mpv
     ];
     file = {
@@ -191,7 +193,7 @@ in {
             },
             "misc": {
                 "askOnTabVisibilityToggle": false,
-                "currentVersion": "2.5.3",
+                "currentVersion": "2.5.5",
                 "lockNotebookLayout": false
             },
             "similarity": {

home-modules/contact.nix

@@ -0,0 +1,28 @@
+{ pkgs, ... }@all: with all; lib.mkIf (hyper.isPersonal) {
+  # sops.secrets."nx2site/nextcloud/lennart_pass".path = "nx2site/nextcloud/lennart_pass";
+  # accounts.contact = {
+  #   basePath = "~/.local/share/contacts";
+    # accounts = let
+    #   nc = name: { "${name}" = let
+    #     un = "lennart";
+    #   in {
+    #     inherit name;
+    #     remote = {
+    #       url = "https://n.${hyper.domain}/remote.php/dav/addressbooks/users/${un}/${name}/";
+    #       type = "carddav";
+    #       username = un;
+    #       passwordCommand = "cat /run/user/1000/secrets/nx2site/nextcloud/lennart_pass";
+    #       thunderbird = {
+    #         enable = builtins.trace config.programs.thunderbird.enable config.programs.thunderbird.enable; 
+    #         prifiles = [ hyper.user ];
+    #       };
+    #     };
+    #     local = {
+    #       type = "filesystem";
+    #       path = "${name}";
+    #     };
+    #   };};
+    # in (pkgs.lib.mergeAttrsList (builtins.map nc [ "TUDa" "CWG" "HSMW" "DICOS" "Accounts" "Familie & Freunde" "Friedrich Schiller Grundschule" "Handball" "Phönix" "Util & Miscellaneous" ]));
+    # };
+  # };
+}

home-modules/email.nix

@@ -1,102 +1,12 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host != "NxACE")
-{
-  home.packages = with pkgs; [
-    thunderbird
-  ];
-
-  programs.thunderbird = let
-    inherit (lib.generators) toJSON;
-    extensions = toJSON {} {
-      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
-    };
-  in {
-    enable = true;
-    profiles = {
-      "${hyper.user}" = {
-        isDefault = true;
-        settings = with rice.color; {
-          "calendar.alarms.showmissed" = false;
-          "calendar.alarms.playsound" = false;
-          "calendar.alarms.show" = false;
-          "extensions.webextensions.uuids" = extensions;
-          "mail.startup.enabledMailCheckOnce" = true;
-          "mailnews.mark_message_read.delay" = true;
-          "mailnews.mark_message_read.delay.interval" = 3;
-          "mailnews.tags.$label1.color" = red.base;
-          "mailnews.tags.$label1.tag" = "Important";
-          "mailnews.tags.$label2.color" = yellow.base;
-          "mailnews.tags.$label2.tag" = "Work";
-          "mailnews.tags.$label3.color" = green.base;
-          "mailnews.tags.$label3.tag" = "Personal";
-          "mailnews.tags.$label4.color" = cyan.base;
-          "mailnews.tags.$label4.tag" = "To Do";
-          "mailnews.tags.$label5.color" = blue.base;
-          "mailnews.tags.$label5.tag" = "Later";
-          "mailnews.headers.showMessageId" = true;
-          "mailnews.headers.showOrganization" = true;
-          "mailnews.headers.showReferences" = true;
-          "mailnews.headers.showSender" = true;
-          "mailnews.headers.showUserAgent" = true;
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;         
-        };
-        userChrome = with rice.color; /* css */ ''
-          body,
-          #navigation-toolbox,
-          #calendarContent,
-          #calSidebar,
-          #tabpanelcontainer,
-          #spacesToolbar,
-          #tabs-toolbar,
-          #calMinimonth,
-          #primaryButtonSidePanel *,
-          .minimonth-week,
-          .multiday-header-corner, .day-column-heading, calendar-header-container, calendar-event-column, .multiday-hour-box,
-          #view-box,
-          #tabs-toolbar,
-          #status-bar,
-          .calview-toggle,
-          #calview-toggle-item,
-          #folderPaneHeaderBar,
-          #folderPane,
-          #threadPaneHeaderBar,
-          #threadTree,
-          #tabs-toolbar {
-            color: ${foreground} !important;
-            font-family: ${rice.font.base.name} !important;
-            background-color: transparent !important;
-            background-image: none !important;
-            border: none !important;
-            -moz-appearance: none !important;
-          }
-          .minimonth-nav-section {
-            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important;
-            border: ${builtins.toString rice.border-width}px solid ${border};
-          }
-          .button,
-          .button-primary,
-          .tab-content[selected] {
-            background-color: ${accent.base}; 
-            color: ${background};
-            background-image: none; 
-          }
-          html {
-            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important;
-          }
-        '';
-      }; 
-    }; 
-  };
-
-
+{ pkgs, ... }@all: with all; lib.mkIf (hyper.isPersonal) {
   accounts.email.accounts = let
     OAuth2Settings = id: {
       "mail.smtpserver.smtp_${id}.authMethod" = 10;
       "mail.server.server_${id}.authMethod" = 10;
     };
   in {
-    gmail-online = {
-      address = secrets.email.gmail-online.mail;
+    gmail-online-accounts = {
+      address = secrets.email.gmail-online-accounts.mail;
       realName = "Lennart J. Kurzweg";
       flavor = "gmail.com";
       primary = true;
@@ -117,8 +27,8 @@ lib.mkIf (hyper.host != "NxACE")
       };
     };
 
-    gmail-business = {
-      address = secrets.email.gmail-business.mail;
+    gmail-ljk = {
+      address = secrets.email.gmail-ljk.mail;
       realName = "Lennart J. Kurzweg";
       flavor = "gmail.com";
       signature = {
@@ -136,36 +46,22 @@ lib.mkIf (hyper.host != "NxACE")
         settings = OAuth2Settings; 
       };
     };
-
-    # hsmw = with secrets.email.hsmw; {
-    #   address = "${un}@hs-mittweida.de";
-    #   userName = "${un}@hs-mittweida.de";
+    # pnx-nix = {
+    #   address = secrets.email.pnx.mail;
     #   realName = "Lennart J. Kurzweg";
-    #   imap = {
-    #     port = 993;
-    #     host = "xc.hs-mittweida.de";
-    #   };
-    #   smtp = {
-    #     port = 587;
-    #     host = "xc.hs-mittweida.de";
-    #     tls.useStartTls = true;
-    #   };
+    #   flavor = "outlook.office365.com";
     #   signature = {
     #     text = ''
-    #       MatNr: ${mnr}
-    #       SemGr: ${semgr}
-    #       About Me: https://nx2.site/about-me
-    #       Contact: https://nx2.site/contact
-    #       GPG: https://nx2.site/gpg
+    #       Phönix Metallbau GmbH
+    #       Tel: 036374 2270
     #     '';
     #     showSignature = "append";
     #   };
-    #   thunderbird = {
+    #   thunderbird = mkIf config.thunderbird.enable {
     #     enable = true;
     #     profiles = [ "nx2" ];
-    #     settings = id: {
-    #       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
-    #     };
+    #     # The id given as argument is an automatically generated account identifier.
+    #     # settings = OAuth2Settings; 
     #   };
     # };
     tuda = with secrets.email.tuda; {
@@ -195,9 +91,37 @@ lib.mkIf (hyper.host != "NxACE")
       thunderbird = {
         enable = true;
         profiles = [ "nx2" ];
-        settings = id: {
-          "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
-        };
+        settings = id: { };
+      };
+    };
+    nx2site = {
+      address = "lennart@${hyper.domain}";
+      userName = "lennart@${hyper.domain}";
+      realName = "Lennart J. Kurzweg";
+      imap = {
+        port = 993;
+        host = "ssh.${hyper.domain}";
+        tls.enable = true;
+      };
+      smtp = {
+        port = 465;
+        host = "mail-eu.smtp2go.com";
+        tls.enable = true;
+        # port = 587;
+        # host = "mail.${hyper.domain}";
+        # tls.useStartTls = true;
+      };
+      signature = {
+        text = ''
+          About Me: https://nx2.site/about-me
+          Contact: https://nx2.site/contact
+          GPG: https://nx2.site/gpg
+        '';
+        showSignature = "append";
+      };
+      thunderbird = {
+        enable = true;
+        profiles = [ "nx2" ];
       };
     };
   };
@@ -205,3 +129,35 @@ lib.mkIf (hyper.host != "NxACE")
 
 
 
+
+# hsmw = with secrets.email.hsmw; {
+#   address = "${un}@hs-mittweida.de";
+#   userName = "${un}@hs-mittweida.de";
+#   realName = "Lennart J. Kurzweg";
+#   imap = {
+#     port = 993;
+#     host = "xc.hs-mittweida.de";
+#   };
+#   smtp = {
+#     port = 587;
+#     host = "xc.hs-mittweida.de";
+#     tls.useStartTls = true;
+#   };
+#   signature = {
+#     text = ''
+#       MatNr: ${mnr}
+#       SemGr: ${semgr}
+#       About Me: https://nx2.site/about-me
+#       Contact: https://nx2.site/contact
+#       GPG: https://nx2.site/gpg
+#     '';
+#     showSignature = "append";
+#   };
+#   thunderbird = {
+#     enable = true;
+#     profiles = [ "nx2" ];
+#     settings = id: {
+#       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
+#     };
+#   };
+# };

home-modules/figlet.nix

@@ -3,7 +3,7 @@
   home = {
     packages = with pkgs; [
       figlet
-      (pkgs.writeShellScriptBin "fgl" ''
+      (pkgs.writeShellScriptBin "nxfgl" ''
         figlet -f ${hyper.home}/.local/share/figlet/nx2.flf -w 9999
       '')
     ];

home-modules/firefox/userChrome.nix

@@ -63,9 +63,24 @@ in /* css */ ''
     --newtab-background-card                 : ${accent.dark} !important;
     --tabpanel-background-color              : transparent !important;
 
-    background                               : linear-gradient(180deg,rgba(${f secondary.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${f accent.dark}, ${builtins.toString rice.transparency}) 100%) !important;
+    background                               : transparent !important;
   }
-  .tabbrowser-tab[selected="true"] {
+  body { 
+    background-color: unset !important;
+    background-color: transparent !important;
+    background-image: linear-gradient(0deg,rgba(${f accent.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${f secondary.dark}, ${builtins.toString rice.transparency}) 100%) !important;
+    background-size: 100% 150% !important;
+    background-position: 0% 0% !important; 
+    will-change: background-position;
+    transition: background-position 300ms !important;
+    &:-moz-window-inactive {
+      background-position: 0% 50% !important;
+      background-color: transparent !important;
+    }
+  }
+
+  .tabbrowser-tab[selected="true"], .tab-text[selected=""],
+  .tab-close-button[selected=""] {
     color: ${background} !important;
   }
   hbox#browser {

home-modules/firefox/userContent.nix

@@ -20,7 +20,7 @@ in /* css */ ''
 
   /* new-tab */ 
   @-moz-document url-prefix(about:home), url-prefix(about:newtab) {
-    :root{
+    :root {
       --newtab-background-color-secondary: rgba(${f background},0.5) !important;
     }
     body, html {
@@ -31,6 +31,29 @@ in /* css */ ''
     }
   }
 
+  @-moz-document url-prefix("https://n.nx2.site/") {
+    :root, [data-theme-dark] {
+      --color-main-background: #00000055;
+      --color-main-background-rgb: 0,0,0;
+      --color-primary-element-light: #550000;
+    }
+    .app-navigation, .app-content {
+      background: rgba(0,0,0,0.8) !important;
+      backdrop-filter: blur(5px) !important;
+    }
+    .files-list__row-head, .files-list__tfoot {
+      background: rgba(0,0,0,0.5) !important;
+    }
+    .fc-day-today {
+      background: #ff000055 !important;
+    }
+    .files-list__thead {
+      background: transparent !important;
+    }
+  }
+
+  
+
   @-moz-document domain(reddit.com) {
     header {
       background-color: rgba(${f background},${builtins.toString rice.transparency}) !important;
@@ -39,6 +62,9 @@ in /* css */ ''
     body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree, #flex-left-nav-container {
       background-color: transparent !important;
     }
+    #search-dropdown-results-container {
+      background: rgba(${f background},0.8) !important;
+    }
     #main-content {
       background-color: rgba(${f background},0.5)!important;
     }
@@ -77,6 +103,14 @@ in /* css */ ''
 
     }
   }
+  @-moz-document domain(gemini.google.com) {
+    input-container, input-container::before  {
+      background: transparent !important;
+    }
+    bard-sidenav  {
+      background: rgba(${rice.lib.hex-to-rgb-comma-string background},0.5) !important;
+    }
+  }
 
   @media (prefers-color-scheme: dark) {
     :root .theme-system {
@@ -122,7 +156,17 @@ in /* css */ ''
       background-color: transparent !important;
     }
     header, footer {
-      background-color: rgba(0,0,0,1) !important; 
+      background-color: rgba(0,0,0,0.5) !important; 
+      backdrop-filter: blur(100px);
+      border-radius: ${builtins.toString rice.rounding}px;
+    }
+  }
+  @-moz-document domain(notebooklm.google.com) {
+    body, html, notebook, omnibar {
+      background-color: transparent !important;
+    }
+    header, footer, .studio-panel, .chat-panel, .source-panel {
+      background-color: rgba(0,0,0,0.5) !important; 
       backdrop-filter: blur(100px);
       border-radius: ${builtins.toString rice.rounding}px;
     }
@@ -213,6 +257,7 @@ in /* css */ ''
       border: ${toString rice.border-width}px solid ${border} !important;
     }
   }     
+
 ''
   # @-moz-document domain(chatgpt.com) {
   #   body, html , .bg-token-sidebar-surface-primary {

home-modules/fish.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
-    fish
     any-nix-shell
 
     (writeShellScriptBin "nxfetch" /* bash */ ''
@@ -26,11 +25,11 @@
       $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^}
       $(echo -e "$logo" | sed -n 5p): ''${TERM^}
       $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g')
-      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\&/')
       $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g')
-      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
       $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g')
-      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
       "
       echo -e "$msg"
     '')
@@ -40,6 +39,7 @@
 
   programs.fish = {
     enable = true;
+    package = pkgs.fish;
     shellAliases = let
       base-eza = "eza --icons --git --smart-group --group-directories-first";
     in {
@@ -96,16 +96,17 @@
     interactiveShellInit = /* fish */ ''
       set -g fish_greeting
       if not set -q IN_NIX_SHELL
-        if set -q SESSION_FROM_DE
+        if set -q SESSION_FROM_DE; or set -q SESSION_CLONED_FROM_YAZI
+          set -e SESSION_FROM_DE
+          set -e SESSION_CLONED_FROM_YAZI
           set tmp (mktemp -t "yazi-cwd.XXXXX")
-          yazi --cwd-file="$tmp"
+          yazi --cwd-file="$tmp" ~
           if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
               builtin cd -- "$cwd"
           end
           rm -f -- "$tmp"
         end
         nxfetch
-        set -e SESSION_FROM_DE
       end
     '';
     functions = {
@@ -115,10 +116,21 @@
       '';
       nx_backup = let
         destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
-      in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxDCS") ''
+      in pkgs.lib.mkIf (hyper.isPersonal) /* fish */ ''
         set RPATH (curl -s https://${hyper.domain}/latest-backup)
         rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
       '';
+      nx_yazi_into_fish = /* fish */ ''
+        set tmp (mktemp -t "yazi-cwd.XXXXX")
+        echo "$PWD" > "$tmp"
+        yazi --cwd-file="$tmp"
+        if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+            builtin cd -- "$cwd"
+        end
+        rm -f "$tmp"
+        set -g SESSION_CLONED_FROM_YAZI TRUE
+      '';
+      
       # gpg = '';
       #   set bold \e[1m
       #   set green \e[32m

home-modules/games.nix

@@ -1,20 +1,19 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host == "NxNORTH")
-{
+{ pkgs, ... }@all: with all; {
   home = {
-    packages = (with pkgs.unstable; [
-      protonup-ng
-      mangohud
-
-      prismlauncher
-
-      # heroic
-
+    packages = (with pkgs; [
+      unstable.protonup-ng
+      unstable.mangohud
+    ]) ++ (if hyper.host == "NxNORTH" then (with pkgs; [
+      unstable.prismlauncher
+      heroic
       # mindustry-wayland 
-    ]) ++ [ pkgs.heroic ];
-    sessionVariables = {
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
-    };
+    ]) else if hyper.host == "NxXPS" then (with pkgs; [
+      heroic
+    ]) else if hyper.host == "NxACE" then (with pkgs; [
+      heroic
+    ]) else []);
+
+    sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
   };
 }
 

home-modules/ghostty.nix

@@ -5,6 +5,7 @@
     package = pkgs.ghostty;
     settings = with rice.color; {
       background = background;
+      window-padding-color = "extend";
       background-opacity = builtins.toString rice.transparency;
       clipboard-paste-protection = false;
       clipboard-read = "allow";

home-modules/gimp.nix

@@ -1,9 +1,5 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   home.packages = with pkgs; [
-    # (gimp-with-plugins.override {
-    #   plugins = with gimpPlugins; [ bimp ];
-    # })
     gimp
   ];
 }

home-modules/git.nix

@@ -5,13 +5,27 @@
     (writeShellScriptBin "gst" "awk -vOFS='' 'NR==FNR {all[i++] = $0; difffiles[$1] = $0; next;} ! ($2 in difffiles) {print; next;} {gsub($2, difffiles[$2]); print;} END {if (NR != FNR) {exit;} for (i in all) {print all[i];}}' <(git diff --color --stat=$(($(tput cols) - 3)) HEAD | sed '$d; s/^ //') <(git -c color.status=always status -sb)")
   ];
 
-  programs.git = {
-    enable = true;
-    package = pkgs.gitFull;
-    userName = ''Lennart J. Kurzweg (Nx2)'';
-    userEmail = "git@${hyper.domain}";
+  programs = {
+    git = {
+      enable = true;
+      package = pkgs.gitFull;
+      settings = {
+        user = {
+          Name = ''Lennart J. Kurzweg (Nx2)'';
+          Email = "git@${hyper.domain}";
+        };
+        credential = {
+          "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg";
+          "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test";
+        };
+        url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host == "NxDCS") "https://git.da.dicos.de/";
+        url."ssh://git@github.com/".insteadOf = "https://github.com/";
+        pull.rebase = false; # true
+      };
+    };
     delta = {
       enable = true;
+      enableGitIntegration = true;
       options = {
         line-numbers = true;
         side-by-side = false;
@@ -19,36 +33,27 @@
         whitespace-error-style = "22 reverse";
       };
     };
-    extraConfig = {
-      credential = {
-        "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxDCS") "lkurzweg";
-        "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxDCS") "Test";
-      };
-      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxDCS") "https://git.da.dicos.de/";
-      url."ssh://git@github.com/".insteadOf = "https://github.com/";
-      pull.rebase = false; # true
-    };
-  };
-  programs.lazygit = {
-    enable = true;
-    package = pkgs.lazygit;
-    settings = {
-      windowSize = "normal";
-      gui.theme = with rice.color; {
-        lightTheme = false;
-        activeBorderColor = [ foreground "bold" ];
-        inactiveBorderColor = [ border ];
-        optionsTextColor = [ tertiary.base ];
-        selectedLineBgColor = [ secondary.base ];
-        selectedRangeByColor = [ weird.bright ];
-        showRandomTip = true;
-        animateExplosion = true;
-        cherryPickedCommitFgColor = [ accent.base ]; # Foreground color of copied commit
-        cherryPickedCommitBgColor = [ secondary.dark ]; # Background color of copied commit
-        markedBaseCommitFgColor = [ accent.base ]; # Foreground color of marked base commit (for rebase)
-        markedBaseCommitBgColor = [ secondary.dark ]; # Background color of marked base commit (for rebase)
-        unstagedChangesColor = [ negative.base ]; # Color for file with unstaged changes
-        defaultFgColor = [ "default" ]; # Default text color
+    lazygit = {
+      enable = true;
+      package = pkgs.lazygit;
+      settings = {
+        windowSize = "normal";
+        gui.theme = with rice.color; {
+          lightTheme = false;
+          activeBorderColor = [ foreground "bold" ];
+          inactiveBorderColor = [ border ];
+          optionsTextColor = [ tertiary.base ];
+          selectedLineBgColor = [ secondary.base ];
+          selectedRangeByColor = [ weird.bright ];
+          showRandomTip = true;
+          animateExplosion = true;
+          cherryPickedCommitFgColor = [ accent.base ]; # Foreground color of copied commit
+          cherryPickedCommitBgColor = [ secondary.dark ]; # Background color of copied commit
+          markedBaseCommitFgColor = [ accent.base ]; # Foreground color of marked base commit (for rebase)
+          markedBaseCommitBgColor = [ secondary.dark ]; # Background color of marked base commit (for rebase)
+          unstagedChangesColor = [ negative.base ]; # Color for file with unstaged changes
+          defaultFgColor = [ "default" ]; # Default text color
+        };
       };
     };
   };

home-modules/gpg.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }@all: with all; {
-  home.packages = with pkgs; [ pinentry-all ];
+  home.packages = with pkgs; [
+    # pinentry-all
+    # pinentry-curses
+    pinentry-gtk2
+    # pinentry-tty
+  ];
   programs.gpg = {
     enable = true;
     package = pkgs.gnupg;
@@ -39,10 +44,6 @@
     enableFishIntegration = true;
     defaultCacheTtlSsh = min2sec 60;
     defaultCacheTtl = min2sec 30;
-    pinentry = {
-      package = pkgs.pinentry;
-      program = "pinentry";
-    };
     extraConfig = ''
       allow-loopback-pinentry
     '';

home-modules/helix.nix

@@ -98,7 +98,6 @@
         cursor-shape = {
           normal = "block";
           insert = "bar";
-          select = "underline";
         };
         file-picker = {
           hidden = false; # Enables ignoring hidden files	
@@ -190,7 +189,7 @@
       keys = {
         normal = {
           "C-g" = [ ":new" ":insert-output lazygit" ":buffer-close!" ":redraw" ];
-          "C-i" = [ ":pipe fgl" "toggle_comments" ];
+          "C-m" = [ ":pipe nxfgl" "toggle_comments" ];
           "A-`" = [ "no_op" ];
           "`"   = [ "no_op" ];
           "ö" = { "s" = [ "switch_case" ]; "u" = [ "switch_to_uppercase" ]; "l" = [ "switch_to_lowercase" ]; };
@@ -212,14 +211,33 @@
         }
         {
           name = "typst";
+          language-servers = [ "tinymist" ]; 
+          # language-servers = [ "language-tool" "tinymist" ]; 
+        }
+        {
+          name = "typst-with-language-tool";
+          scope = "";
           language-servers = [ "language-tool" "tinymist" ]; 
+          injection-regex = "";
+          file-types = [""];
+          comment-tokens = "//";
+          indent = { tab-width = 2; unit = "  "; };
         }
         {
           name = "markdown";
-          language-servers = [ "language-tool" "marksman" ];
+          language-servers = [ "marksman" ];
           file-types = [ "md" "MD" ];
           scope = "text.<name>";
         }
+        {
+          name = "markdown-with-language-tool";
+          language-servers = [ "language-tool" "marksman" ];
+          scope = "text.<name>";
+          injection-regex = "";
+          file-types = [""];
+          # blcok-comment-tokens = { start = "<!--"; end = "-->"; };
+          indent = { tab-width = 2; unit = "  "; };
+        }
         {
           name = "python";
           language-servers = [ "pyright" "ruff" ];
@@ -298,37 +316,45 @@
       base16 = with rice.color; {
         "attributes" = foreground; 
         "comment" = {
-          fg = black.bright;
+          fg = subtle.base;
           modifiers = [ "italic" ];
         };
         "constant" = accent.bright; 
         "constant.character.escape" = special.bright;
         "constant.numeric" = foreground; 
-        "constructor" = weird.base;
+        "constructor" = secondary.bright;
         "debug" = yellow.base;
-        "diagnostic.modifiers" = [ "underline" ];
-        "diff.delta" = blue.bright; 
+        "diff.delta" = subtle.bright; 
         "diff.minus" = negative.bright; 
         "diff.plus" = positive.bright; 
-        "error" = red.base; 
+        "error" = negative.base; 
         "function" = secondary.bright; 
         "hint" = tertiary.bright;
         "info" = foreground; 
-        "keyword" = special.base;
-        "keyword.modifiers" = [ "italic" ];
+        "keyword" = {
+          fg = special.base;
+          modifiers = [ "bold" ];
+        };
         "label" = foreground;
         "namespace" = weird.bright;
         "operator" = foreground;
         "special" = special.base; 
         "string" = secondary.bright; 
-        "type" = red.base; 
-        "variable" = accent.base; 
-        "variableother.member" = foreground; 
-        "warning" = red.base; 
+        "type" = {
+          fg = tertiary.base; 
+        };
+        "variable" = { fg = accent.base; }; 
+        "variable.builtin" = { fg = accent.base; bg = subtle.darker; };
+        "variable.parameter" = { fg = accent.base; bg = accent.darker; };
+        "warning" = yellow.base; 
 
-        "markup.heading" = accent.base; 
+        "markup.heading" = {
+          fg = accent.base; 
+          bg = accent.darker;
+          modifiers = [ "bold" ];
+        };
         "markup.bold" = {
-          fg = tertiary.bright; 
+          fg = secondary.bright; 
           modifiers = [ "bold" ];
         };
         "italic" = {
@@ -338,7 +364,7 @@
         "markup.linktext" = accent.base; 
         "markup.linkurl" = {
           fg = tertiary.dark; 
-          modifiers = [ "underlined" ];
+          underline.style = "line";
         };
         "markup.list" = accent.bright; 
         "markup.quote" = weird.bright; 
@@ -355,7 +381,7 @@
         };
         "ui.bufferline" = { # the top line ("tab"-line)
           fg = accent.base;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.bufferline.active" = { # the active "tab"
           fg = background;
@@ -367,22 +393,22 @@
           modifiers = [ "reversed" ];
         };
         "ui.cursorline.primary" = { # the line on which the cursor is on
-          bg = black.base;
+          bg = secondary.darker;
         };
         "ui.cursor.match" = { # Matching bracket etc.
-          bg = green.dark;
+          bg = special.dark;
           modifiers = [ ];
         };
         "ui.gutter" = {
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.help" = {
-          fg = green.base;
-          bg = black.base;
+          fg = accent.base;
+          bg = accent.darker;
         };
         "ui.linenr" = {
-          fg = white.dark;
-          bg = black.base;
+          fg = accent.bright;
+          bg = accent.darker;
         };
         "ui.linenr.selected" = {
           fg = accent.bright;
@@ -390,32 +416,32 @@
         };
         "ui.menu" = {
           fg = accent.base;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.menu.scroll" = {
-          fg = yellow.dark;
+          fg = subtle.base;
           bg = background;
         };
         "ui.menu.selected" = {
-          fg = red.base;
-          bg = blue.dark;
+          fg = secondary.bright;
+          bg = secondary.darker;
         };
         "ui.popup" = {
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.selection" = {
-          bg = white.dark;
+          bg = accent.dark;
         };
         "ui.selection.primary" = {
-          bg = black.bright;
+          bg = accent.dark;
         };
         "ui.statusline" = {
-          fg = blue.bright;
-          bg = black.base;
+          fg = accent.bright;
+          bg = accent.darker;
         };
         "ui.statusline.inactive" = {
-          fg = red.bright;
-          bg = red.dark;
+          fg = secondary.bright;
+          bg = secondary.dark;
         };
         "ui.statusline.insert" = {
           fg = green.bright;
@@ -432,7 +458,7 @@
         "ui.text" = foreground;
         "ui.text.focus" = accent.base;
         "ui.virtual.indent-guide" = {
-          fg = black.bright;
+          fg = subtle.dark;
         };
         "ui.virtual.inlay-hint" = {
           fg = subtle.base;
@@ -443,12 +469,12 @@
         };
         "ui.virtual.jump-label" = {
           fg = special.base;
-          underline = {
-            style = "dotted";
-          }; 
+          bg = special.dark;
+          underline.style = "dotted";
+          modifiers = [ "bold" ];
         };
         "ui.window" = {
-          bg = black.base;
+          bg = accent.darker;
         };
       };
     };

home-modules/hyprland.nix

@@ -5,10 +5,27 @@
   terminal-exec = "ghostty --command=";
   monitors = {
     xps = {
-      main   = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; };
-      # main   = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; };
-      second = { name = "desc:Sony SONY TV 0x01010101";  resolution = "1920x1080"; position = "1920x0";    scale = "1.0"; };
-      third = { name = "DP-6";   resolution = "1920x1080"; position = "0x0";    scale = "1.0"; };
+      # def
+      # main   = { name = "eDP-1"; resolution = "preferred"; position = "0x0"; scale = "1.0"; };
+      # second = { name = "eDP-1"; resolution = "preferred"; position = "0x0"; scale = "1.0"; };
+      # third  = { name = "eDP-1"; resolution = "preferred"; position = "0x0"; scale = "1.0"; }; 
+
+      # Home
+      main   = { name = "eDP-1";                         resolution = "1920x1200"; position = "0x1080"; scale = "1.0"; };
+      second = { name = "desc:Sony SONY TV 0x01010101";  resolution = "1920x1080"; position = "0x0";    scale = "1.0"; };
+      third  = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; 
+      
+      # Presentation
+      # main   = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0";   };
+      # second = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; 
+      # third  = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; 
+      
+      # thunderbolt docking
+      # main   = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1200"; scale = "1.0"; };
+      # second = { name = "DP-5";  resolution = "1920x1200"; position = "1920x0";  scale = "1.0"; }; 
+      # third  = { name = "DP-4";  resolution = "1920x1200"; position = "0x0"; scale = "1.0"; }; 
+      # second = { name = "DP-6";  resolution = "1920x1200"; position = "0x0"; scale = "1.0"; }; 
+      # third = { name = "DP-7";  resolution = "1920x1200"; position = "1920x0";  scale = "1.0"; }; 
     };
     north = {
       main = { name = "desc:Iiyama North America PL3270Q na";                            resolution = "2560x1440"; position = "1920x0"; scale = "1.0"; };
@@ -19,31 +36,33 @@
   };
 in {
   home.packages = with pkgs; [
-    xdg-desktop-portal-hyprland
+    grim
+    hyprcursor
+    hypridle
     hyprland-protocols
     hyprlock
-    hypridle
-    hyprshot
     hyprpicker
-    hyprcursor
-    grim
+    hyprshade
+    hyprshot
     slurp
+    # xdg-desktop-portal-hyprland
   ];
   
 
   wayland.windowManager.hyprland = {
     enable = true;
-    # package = pkgs-unstable.hyprland;
-    package = pkgs.hyprland;
-    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # package = pkgs.hyprland;
+    package = inputs.hyprland.packages.${hyper.system}.hyprland;
+    # package = config.programs.hyprland.package;
     xwayland.enable = true;
     systemd.enable = true;
-    plugins = [
-      # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
-      # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
-      # inputs.hycov.packages.${pkgs.system}.hycov
-      pkgs.hyprlandPlugins.hyprspace
-      # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
+    plugins = let s = pkgs.stdenv.hostPlatform.system; in [
+      # inputs.hyprland-plugins.packages.${s}.hyprexpo
+      # inputs.hyprfocus.packages.${s}.hyprfocus
+      # inputs.hycov.packages.${s}.hycov
+      # inputs.hyprspace.packages.${s}.Hyprspace
+      # inputs.hyprtasking.packages.${s}.hyprtasking
+      # inputs.hyprland-easymotion.packages.${s}.hyprland-easymotion
     ];
 
     settings = {
@@ -52,7 +71,6 @@ in {
           "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
           "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}"
           "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}"
-          " ,preferred, auto, 1, mirror, eDP-1"
         ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [
           "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
           "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}"
@@ -161,10 +179,12 @@ in {
         dim_strength = "0.2";
         dim_around = "0.8";
 
+        # screen_shader = "/home/nx2/.config/hypr/shaders/e.glsl";
+
         blur = {
           enabled = true;
-          size = "10";
-          passes = "2";
+          size = "2";
+          passes = "4";
           xray = false;
           vibrancy = 0.5;
           ignore_opacity = true;
@@ -186,10 +206,10 @@ in {
       };
 
       gestures = {
-        workspace_swipe = true;
-        workspace_swipe_fingers = "4";
         workspace_swipe_distance = "300";
+        # workspace_swipe_touch = true;
         workspace_swipe_invert = true;
+        # workspace_swipe_touch_invert = true;
         workspace_swipe_min_speed_to_force = "30";
         workspace_swipe_cancel_ratio = "0.5";
         workspace_swipe_create_new = false;
@@ -199,6 +219,14 @@ in {
         workspace_swipe_use_r = false;
       };
 
+
+      gesture = [
+        "4, horizontal, workspace"
+        # "3, down, mod: ALT, close"
+        # "3, up, mod: SUPER, scale: 1.5, fullscreen"
+        # "3, left, scale: 1.5, float"
+      ];
+
       dwindle = {
         preserve_split = true; # you probably want this
       };
@@ -215,83 +243,85 @@ in {
       exec-once = [
         "waybar"
         "swww-daemon"
-        "hyprland-autoname-workspaces"
+        # "hyprland-autoname-workspaces"
         "/usr/lib/polkit-kde-authentication-agent-1 "
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "syncthing -no-browser"
         "fcitx5"
         # "ibus engine xkb:de::deu"
         "libinput-gestures"
+        "systemctl --user start hyprpanel"
         # "hyprswitch --daemon"
       ];
 
-      windowrulev2 = [
-        "bordercolor rgba(${rice.lib.nohash rice.color.special.bright}ff), pinned:1"
+      windowrule = [
+        "border_color rgba(${rice.lib.nohash rice.color.special.bright}ff) rgba(${rice.lib.nohash rice.color.special.brighter}ff), match:pin 1"
 
-        "bordersize 0, floating:0, onworkspace:w[tv1]"
-        "rounding 0, floating:0, onworkspace:w[tv1]"
-        "bordersize 0, floating:0, onworkspace:f[1]"
-        "rounding 0, floating:0, onworkspace:f[1]"
+        "border_size 0, match:float 0, match:workspace w[tv1]"
+        "rounding 0, match:float 0, match:workspace w[tv1]"
+        "border_size 0, match:float 0, match:workspace f[1]"
+        "rounding 0, match:float 0, match:workspace f[1]"
       ] ++ [
-        "center 1,class:^(gimp)$"
+        "center 1,match:class ^(gimp)$"
 
-        "float, class:^(ibus-ui.*)$"
-        "float, class:^(ibus-ui-gtk3)$"
-        "float, class:^(imv)$"
-        "float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
-        "float, class:^(presenter)$" # sent
-        "float, class:^(thunderbird)$"
-        "float, title:^(Compact folders)$"
-        "float, title:^(Ibus-ui.*)$"
-        "float, title:^(Ibus-ui-gtk3)$"
-        "float, title:^(Page Info — .*)$"
-        "float, title:^(Picture-in-Picture)$"
-        "float, title:^(wlogout)$"
+        "float on, match:class ^(ibus-ui.*)$"
+        "float on, match:class ^(ibus-ui-gtk3)$"
+        "float on, match:class ^(imv)$"
+        "float on, match:class ^(org.kde.polkit-kde-authentication-agent-1)$"
+        "float on, match:class ^(presenter)$" # sent
+        "float on, match:class ^(thunderbird)$"
+        "float on, match:title ^(Compact folders)$"
+        "float on, match:title ^(Ibus-ui.*)$"
+        "float on, match:title ^(Ibus-ui-gtk3)$"
+        "float on, match:title ^(Page Info — .*)$"
+        "float on, match:title ^(Picture-in-Picture)$"
+        "float on, match:title ^(wlogout)$"
 
-        "fullscreen, class:^(imv)$" 
-        "fullscreen, class:^(sent)$"
-        "fullscreen, class:^(wlogout)$"
+        "fullscreen on, match:class ^(imv)$" 
+        "fullscreen on, match:class ^(sent)$"
+        "fullscreen on, match:class ^(wlogout)$"
 
-        "noanim, class:^(imv)$"
-        "noanim, class:^(presenter)$" # sent
+        "no_anim on, match:class ^(imv)$"
+        "no_anim on, match:class ^(presenter)$" # sent
 
-        "opacity ${transparency}, class:^(Code)$"
-        "opacity ${transparency}, class:^(code-oss)$"
-        "opacity ${transparency}, class:^(discord)$"
-        # "opacity ${transparency}, class:^(vesktop)$"
-        # "opacity ${transparency}, class:^(Element)$"
-        "opacity ${transparency}, class:^(lutris)$"
-        "opacity ${transparency}, class:^(neovide)$"
-        # "opacity ${transparency}, class:^(obsidian)$"
-        "opacity ${transparency}, class:^(VSCodium)$"
-        "opacity ${transparency}, title:^(wlogout)$"
-        "opaque, title:^(GNU Image Manipulation Program)$"
-        "opaque, fullscreen:1"
+        "opacity ${transparency}, match:class ^(Code)$"
+        "opacity ${transparency}, match:class ^(code-oss)$"
+        "opacity ${transparency}, match:class ^(discord)$"
+        # "opacity ${transparency}, match:class ^(vesktop)$"
+        # "opacity ${transparency}, match:class ^(Element)$"
+        "opacity ${transparency}, match:class ^(lutris)$"
+        "opacity ${transparency}, match:class ^(neovide)$"
+        # "opacity ${transparency}, match:class ^(obsidian)$"
+        "opacity ${transparency}, match:class ^(VSCodium)$"
+        "opacity ${transparency}, match:title ^(wlogout)$"
+        "opaque on, match:title ^(GNU Image Manipulation Program)$"
+        "opaque on, match:fullscreen 1"
         
-        "pin, title:^(Picture-in-Picture)$"
+        "pin on, match:title ^(Picture-in-Picture)$"
 
-        "tile, class:^(sent)$"
+        "tile on, match:class ^(sent)$"
 
-        "workspace 100, class:^(gamescope)$"
+        "workspace 100, match:class ^(gamescope)$"
 
-        "float, title:^(terminal-file-picker)$"
-        "dimaround, title:^(terminal-file-picker)$"
-        "center, title:^(terminal-file-picker)$"
-        "size 80% 80%, title:^(terminal-file-picker)$"
-        "size: 30% 30%, initialTitle:^(Select Calendar)$"
-      ];
+        "float on, match:title ^(terminal-file-picker)$"
+        "dim_around on, match:title ^(terminal-file-picker)$"
+        "center on, match:title ^(terminal-file-picker)$"
+        "size 80% 80%, match:title ^(terminal-file-picker)$"
+
+        "float on, match:initial_title ^(Select Calendar)$"
+        "size 30% 30%, match:initial_title ^(Select Calendar)$"
+       ];
 
 
       layerrule = [
-        "blur,waybar"
-        "blur,bar-0" # hyprpanel
-        "blur,bar-1"
-        "blur,bar-2"
-        "blur,bar-3"
-        "blur,bar-4"
-        "dimaround,rofi"
-        "blur,rofi"
-        "xray,rofi"
+        "blur on, match:namespace waybar"
+        "blur on, match:namespace bar-0" # hyprpanel
+        "blur on, match:namespace bar-1"
+        "blur on, match:namespace bar-2"
+        "blur on, match:namespace bar-3"
+        "blur on, match:namespace bar-4"
+        "blur on, match:namespace rofi"
+        "dim_around on, match:namespace rofi"
       ];
 
 
@@ -356,8 +386,10 @@ in {
         ## ROW 2:
 
         # "SUPER,       TAB, hycov:toggleoverview"
-        "SUPER,       TAB, overview:toggle"
+        # "SUPER,       TAB, overview:toggle"
         # "SUPER,       TAB, hyprexpo:expo, toggle"
+        # "SUPER,       TAB, hyprtasking:killhovered"
+        # ",            Escape, hyprtasking:if_active, hyprtasking:toggle cursor"
         "ALT,         TAB, focuscurrentorlast"
         # "SUPER,       TAB, exec, hyprswitch --daemon"
         "SUPER,       Q, killactive"
@@ -365,10 +397,11 @@ in {
         "SUPER,       W, submap, browserSM "
         # "SUPER,       E, exec, element-desktop"
         "SUPER,       R, exec, rofi -show drun"
+        "SUPER SHIFT, R, exec, rofi -show drun"
         # "SUPER,       T, exec, alacritty"
         # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
         "SUPER,       T, exec, SESSION_FROM_DE=TRUE ${terminal}"
-        "SUPER SHIFT, T, exec, ${terminal-exec}'ssh nxace'"
+        ''SUPER SHIFT, T, exec, ${terminal-exec}'echo -e "\\e]11;#${rice.color.secondary.darker}\\e\\\\" && ssh nxace'  '' # yes this is a double hash.
         "SUPER,       Z, exec, zathura"
         "SUPER,       U, exec, [tile] thunderbird "
         "SUPER,       I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'"
@@ -390,7 +423,7 @@ in {
         "SUPER,       D, exec, vesktop"
         # "SUPER,       D, exec, discord"
         "SUPER,       F, fullscreen"
-        # "SUPER,       G,"
+        # "SUPER,       G, action:hyprctl dispatch focuswindow address:{}"
         "SUPER,       H, movefocus, l"
         "SUPER,       J, movefocus, d"
         "SUPER,       K, movefocus, u"
@@ -411,8 +444,10 @@ in {
         "SUPER SHIFT, C, exec, hyprpicker -n -a"
         "SUPER,       V, togglefloating, "
         # "SUPER,       B, exec, bitwarden"
-        "SUPER,       N, togglesplit"
+        "SUPER,       N, layoutmsg, togglesplit"
         # "SUPER,       M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh "
+        ''SUPER,       M, exec, sh -c "hyprshade on $(find ${hyper.home}/.config/hypr/shaders -type f | sed -E 's-.*shaders/(.+)\.glsl-\1-g' | rofi -dmenu)"''
+        "SUPER Shift, M, exec, hyprshade off"
         # "SUPER,       comma, exec, /home/nx2/scripts/change-language.sh"
         "SUPER,       ., exec, echo key x:Prior | dotool"
         "SUPER,       -, exec, echo key x:Next | dotool"
@@ -480,6 +515,10 @@ in {
         # "SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute"
         "SUPER, Next, resizeactive, 10% 10%" 
         "SUPER, Prior, resizeactive, -10% -10%" 
+        "SUPER ALT, j, resizeactive,   0%  7%" 
+        "SUPER ALT, k, resizeactive,   0% -7%" 
+        "SUPER ALT, l, resizeactive,  7%   0%" 
+        "SUPER ALT, h, resizeactive, -7%   0%" 
       ];
       plugin = {
         overview = {
@@ -513,6 +552,59 @@ in {
           reverseSwipe = true;  # reverses the direction of swipe gesture, for macOS peeps?
           exitKey = true;
         };
+        hypertasking = {
+          layout = "grid";
+          gap_size = 20;
+          bg_color = "0xff${rice.color.background}";
+          border_size = 4;
+          exit_on_hovered = false;
+          warp_on_move_window = 1;
+          close_overview_on_reload = true;
+
+          drag_button = "0x110"; # left mouse button
+          select_button = "0x111"; # right mouse button
+          # for other mouse buttons see <linux/input-event-codes.h>
+
+          gestures = {
+            enabled = true;
+            move_fingers = 3;
+            move_distance = 300;
+            open_fingers = 4;
+            open_distance = 300;
+            open_positive = true;
+          };
+          grid = {
+            rows = 3;
+            cols = 3;
+            loop = false;
+            layers = 2;
+            loop_layers = true;
+            gaps_use_aspect_ratio = false;
+          };
+          linear ={
+            top = false;
+            height = 400;
+            scroll_speed = 1.0;
+            blur = false;
+          };
+        };
+        easymotion = {
+          textsize = 15;
+          textcolor = "rgba(ffffffff)";
+          bgcolor = "rgba(000000ff)";
+          blur = 0;
+          blurA = 1.0;
+          xray = 0;
+          textfont = "Sans";
+          textpadding = 0;
+          bordersize = 0;
+          bordercolor = "rgba(ffffffff)";
+          rounding = 0;
+          fullscreen_action = "none";
+          motionkeys = "abcdefghijklmnopqrstuvwxyz1234567890";
+          motionlabels = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+          only_special = "true";
+        };
       };
     };
 
@@ -603,7 +695,9 @@ in {
       submap = screenshot
       ${action_simple { key = "W"; cmd = ''exec,hyprshot -m window''; }}
       ${action_simple { key = "M"; cmd = ''exec,hyprshot -m output''; }}
+      ${action_simple { key = "S"; cmd = ''exec,hyprshot -m output''; }}
       ${action_simple { key = "R"; cmd = ''exec,hyprshot -m region''; }}
+      ${action_simple { key = "A"; cmd = ''exec,hyprshot -m region''; }}
       bind = , Escape, execr, submap_indicator unset
       bind = , Escape, submap, reset
       submap = reset

home-modules/latex.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host != "NxACE")
-{
+{ pkgs, ... }@all: with all; {
   home.packages = with pkgs; [
     texlab # LSP
     (texlive.combine { inherit (texlive) scheme-full xifthen ifmtarg framed paralist titlesec xcolor; }) 

home-modules/logitech.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }@all: with all; {
+  home.packages = with pkgs; [
+    solaar
+  ];
+}

home-modules/mpv.nix

@@ -32,9 +32,11 @@
       thumbfast # thumbnails on timeline hover
       # uosc # custom ui
       sponsorblock
+      # visualizer
     ];
     bindings = {
       "O"           = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"'';
+      "F5"          = ''set contrast 0;set brightness 0;set gamma 0;set saturation 0;set hue 0;set sub-pos 100;set sub-scale 1;set panscan 0;set zoom 0;show-text default'';
       # "tab"         = ''script-binding uosc/toggle-ui'';
       # "space"       = ''cycle pause; script-binding uosc/flash-pause-indicator'';
       # "right"       = ''seek  5'';

home-modules/nx2site-backup.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   home.packages = [
     (pkgs.writeShellApplication {
       name = "nx_backup";

home-modules/opencode.nix

@@ -1,29 +1,60 @@
 { pkgs, ... }@all: with all; {
-  home = {
-    packages = with pkgs; [
-      opencode
-    ];
-    file.".config/opencode/opencode.json".text = let
-      model = "qwen2.5-coder:7b";
-    in builtins.toJSON {
-      "$schema" = "https://opencode.ai/config.json";
-      model = "ollama/${model}";
-      theme = "matrix";
-      provider = {
-        ollama = {
-          name = "Ollama (local)";
-          npm = "@ai-sdk/openai-compatible";
-          options = {
-            baseURL = "http://localhost:11434/v1";
-          };
-          models = {
-            "${model}" = {
-              tools = true;
-            };
-          };
-        };
-      };
+	programs.opencode = {
+		enable = true;
+		package = pkgs.opencode;
+	  themes.theme = with rice.color; let
+	    dl = color: { dark = color; light = color; };
+	  in {
+	    accent = dl accent.base;
+      background = dl background;
+      backgroundElement = dl subtle.dark;
+      backgroundPanel = dl subtle.darker;
+      border = dl subtle.base;
+      borderActive = dl border;
+      borderSubtle = dl subtle.dark;
+      diffAdded = dl positive.base;
+      diffAddedBg = dl positive.darker;
+      diffAddedLineNumberBg = dl positive.dark;
+      diffContext = dl foreground;
+      diffContextBg = dl subtle.dark;
+      diffHighlightAdded = dl positive.bright;
+      diffHighlightRemoved = dl negative.bright;
+      diffHunkHeader = dl foreground;
+      diffLineNumber = dl subtle.base;
+      diffRemoved = dl negative.base;
+      diffRemovedBg = dl negative.darker;
+      diffRemovedLineNumberBg = dl negative.dark;
+      error = dl negative.dark;
+      info = dl special.base;
+      markdownBlockQuote = dl accent.base;
+      markdownCode = dl secondary.base;
+      markdownCodeBlock = dl secondary.base;
+      markdownEmph = dl accent.base;
+      markdownHeading = dl accent.base;
+      markdownHorizontalRule = dl border;
+      markdownImage = dl accent.base;
+      markdownImageText = dl accent.bright;
+      markdownLink = dl accent.base;
+      markdownLinkText = dl accent.bright;
+      markdownListEnumeration = dl foreground;
+      markdownListItem = dl foreground;
+      markdownStrong = dl accent.base;
+      markdownText = dl foreground;
+      primary = dl accent.base;
+      secondary = dl secondary.base;
+      success = dl positive.base;
+      syntaxComment = dl subtle.base;
+      syntaxFunction = dl accent.base;
+      syntaxKeyword = dl special.base;
+      syntaxNumber = dl tertiary.base;
+      syntaxOperator = dl accent.base;
+      syntaxPunctuation = dl foreground;
+      syntaxString = dl accent.base;
+      syntaxType = dl tertiary.base;
+      syntaxVariable = dl accent.base;
+      text = dl foreground;
+      textMuted = dl subtle.bright;
+      warning = dl weird.base;
     };
   };
 }
-

home-modules/pkgs-list/desktop.nix

@@ -14,5 +14,6 @@
     wl-clipboard
     xclip
     wlr-randr
+    cava
   ];
 }

home-modules/pkgs-list/programs.nix

@@ -1,20 +1,22 @@
 { pkgs, hyper, ... }: {
-  home.packages = with pkgs; [
+  home.packages = (with pkgs; [
     chromium 
     gnome-clocks
     gnome-calculator
     gnome-characters
     gnome-2048
-    element-desktop
     qbittorrent
     wl-clipboard
     xfce.thunar
-  ] ++ (if (hyper.host != "NxACE") then [
+  ]) ++ (if hyper.isWorkstation then (with pkgs; [
     signal-desktop
     unstable.code-cursor-fhs
+    latest.antigravity
+    element-desktop
     obsidian
-    zoom-us
+    fontforge-gtk
     inkscape
     audacity
-  ] else []);
+    libreoffice
+  ]) else []);
 }

home-modules/pkgs-list/shell.nix

@@ -1,10 +1,11 @@
 { pkgs, ... }@all: with all; {
   home.packages = with pkgs; [
+    asciinema
     bat
     cmake
     cmatrix
     dig
-    du-dust
+    dust
     dysk
     exiftool
     eza
@@ -18,12 +19,15 @@
     htop
     imagemagick
     jq
+    libxml2
     lolcat
     lynx
     mediainfo
     neofetch
+    nmap
     pastel
     pdfgrep
+    pdftk
     pipes
     pv
     reflex
@@ -33,7 +37,11 @@
     sssnake
     systemctl-tui
     tldr
+    unstable.gemini-cli
+    unstable.gemini-cli
+    unstable.yt-dlp
+    unstable.yt-dlp
     w3m
-    yt-dlp
+    which
   ];
 }

home-modules/programming.nix

@@ -1,7 +1,7 @@
 { ... }: {
 	imports = [
 	  ./programming/c.nix
-	  ./programming/gleam.nix
+	  # ./programming/gleam.nix
 	  ./programming/glsl.nix
 	  ./programming/go.nix
 	  ./programming/java.nix

home-modules/programming/gleam.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host != "NxACE")
-{
+{ pkgs, ... }@all: with all; {
   home.packages = with pkgs; [
     erlang
     rebar3

home-modules/programming/go.nix

@@ -2,6 +2,6 @@
   programs.go = {
     enable = true;
     package = pkgs.go;
-    goPath = "${config.xdg.dataHome}/go";
+    env.goPath = "${config.xdg.dataHome}/go";
   };
 }

home-modules/programming/python.nix

@@ -1,17 +1,18 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   home = let 
     python-with-packages = pkgs.python3.withPackages (pp: with pp; [
       ipython
       requests
-      debugpy
+      # debugpy
       black
+      uv
+      uv-build
     ]);
   in {
     packages = [
       python-with-packages
     ] ++ (with pkgs; [
-      python311Packages.python-lsp-server
+      python313Packages.python-lsp-server
       ruff
       pyright
     ]);

home-modules/programming/rust.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }@all: with all; {
   home = {
     packages = with pkgs; [
+      gdb
       cargo
       clippy
       rustc

home-modules/rofi.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }@all: with all; {
   home = {
-    packages = with pkgs; [ rofi-wayland ];
+    packages = with pkgs; [ rofi ];
     file = let # the home-manager module sucks
       trdr = "${rice.lib.float-to-drune rice.transparency}";
       ts = builtins.toString;
@@ -22,7 +22,7 @@
           border-width: 0px;
         }
         window {
-          background-color: transparent;
+          background-color: ${background}${trdr};
           border: ${ts rice.border-width}px;
           border-radius: ${ts rice.rounding}px;
           border-color: ${ts rice.color.border};
@@ -30,7 +30,7 @@
         listview { scrollbar: false; }
         element { border-radius: ${ts rice.rounding}px; }
         element.normal.normal    { background-color: ${accent.darker}; text-color: ${accent.base}; }
-        element.selected.normal  { background-color: ${accent.base}; text-color: ${accent.bright}; }
+        element.selected.normal  { background-color: ${accent.base}; text-color: ${accent.darker}; }
         element.alternate.normal { background-color: ${secondary.darker}; text-color: ${secondary.base}; }
         inputbar { children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; }
         prompt { }

home-modules/spotify.nix

@@ -2,6 +2,7 @@
 {
   home.packages = with pkgs; [
     unstable.spotify
+    unstable.spicetify-cli
   ];
   services.librespot = {
     enable = true;
@@ -46,7 +47,7 @@
         playback_progress_bar = { fg = accent.brighter; bg = accent.dark; modifiers = ["Bold"];  };
         playback_status       = { fg = accent.bright;                                            };
         playback_track        = { fg = accent.bright;                     modifiers = ["Bold"];  };
-        secondary_row         = { fg = secondary.base;                                           };
+        secondary_row         = { fg = accent.brighter;                                       };
         selection             = {                       bg = accent.dark;                        };
         table_header          = { fg = tertiary.bright;                                          };
         # playback_progress_bar_unfilled (Specific to progress_bar_type as Line) = "";

home-modules/ssh.nix

@@ -3,29 +3,44 @@
   programs.ssh = {
     enable = true;
     package = pkgs.openssh;
-    addKeysToAgent = "yes";
+    enableDefaultConfig = false;
     matchBlocks = let
-      nxace = name: {
+      default = {
+        addKeysToAgent = "yes";
+        forwardAgent = false;
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      nxace = name: default // {
         host = name;
         hostname = "ssh.${hyper.domain}";
-        user = hyper.user;
+        user = "nx2";
         port = 50022;
-        identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}";
+        identityFile = [ "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}" ];
       };
     in {
-      "*".identityFile = [
+      "*" = default;
+      "ssh.nx2.site" = default // { identityFile = [
         "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}"
-        "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}"
-        "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"
-      ];
-      "github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ];
-      "nxace" = nxace "nxace";
-      "nxacel" = (nxace "nxacel") // { hostname = "10.0.1.1"; };
-      "nxrpli" = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };
-      "nxgit" = (nxace "nxgit") // {
-        user = "git";
-        identityFile = "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}";
-        # addKeysToAgent = "1h";
+        "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"
+      ]; };
+      "tg.dm.informatik.tu-darmstadt.de" = default // { identityFile = [ "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"           ]; };
+      "git.da.dicos.de"                  = default // { identityFile = [ "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}"   ]; };
+      "github.com"                       = default // { identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ]; };
+      "nxace"                            = (nxace "nxace" );
+      "nxacel"                           = (nxace "nxacel") // { hostname = "10.0.1.1"; };
+      "nxrpli"                           = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };
+      "nx2s-email-relay" = default // {
+        identityFile = "${hyper.home}/vault/ssh/nx2s-email-relay";
+        hostname = "35.243.218.208";
+        port = 22;
+        user = secrets.ssh.nx2s-email-relay-user;
       };
     };
   };

home-modules/thunderbird.nix

@@ -0,0 +1,84 @@
+{ pkgs, ... }@all: with all; lib.mkIf (hyper.isPersonal) {
+  programs.thunderbird = let
+    inherit (lib.generators) toJSON;
+    extensions = toJSON {} {
+      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
+    };
+  in {
+    enable = true;
+    profiles = {
+      "${hyper.user}" = {
+        isDefault = true;
+        settings = with rice.color; {
+          "calendar.alarms.showmissed" = false;
+          "calendar.alarms.playsound" = false;
+          "calendar.alarms.show" = false;
+          "extensions.webextensions.uuids" = extensions;
+          "mail.startup.enabledMailCheckOnce" = true;
+          "mailnews.mark_message_read.delay" = true;
+          "mailnews.mark_message_read.delay.interval" = 3;
+          "mailnews.tags.$label1.color" = red.base;
+          "mailnews.tags.$label1.tag" = "Important";
+          "mailnews.tags.$label2.color" = yellow.base;
+          "mailnews.tags.$label2.tag" = "Work";
+          "mailnews.tags.$label3.color" = green.base;
+          "mailnews.tags.$label3.tag" = "Personal";
+          "mailnews.tags.$label4.color" = cyan.base;
+          "mailnews.tags.$label4.tag" = "To Do";
+          "mailnews.tags.$label5.color" = blue.base;
+          "mailnews.tags.$label5.tag" = "Later";
+          "mailnews.headers.showMessageId" = true;
+          "mailnews.headers.showOrganization" = true;
+          "mailnews.headers.showReferences" = true;
+          "mailnews.headers.showSender" = true;
+          "mailnews.headers.showUserAgent" = true;
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;         
+        };
+        userChrome = with rice.color; /* css */ ''
+          body,
+          #navigation-toolbox,
+          #calendarContent,
+          #calSidebar,
+          #tabpanelcontainer,
+          #spacesToolbar,
+          #tabs-toolbar,
+          #calMinimonth,
+          #primaryButtonSidePanel *,
+          .minimonth-week,
+          .multiday-header-corner, .day-column-heading, calendar-header-container, calendar-event-column, .multiday-hour-box,
+          #view-box,
+          #tabs-toolbar,
+          #status-bar,
+          .calview-toggle,
+          #calview-toggle-item,
+          #folderPaneHeaderBar,
+          #folderPane,
+          #threadPaneHeaderBar,
+          #threadTree,
+          #tabs-toolbar {
+            color: ${foreground} !important;
+            font-family: ${rice.font.base.name} !important;
+            background-color: transparent !important;
+            background-image: none !important;
+            border: none !important;
+            -moz-appearance: none !important;
+          }
+          .minimonth-nav-section {
+            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important;
+            border: ${builtins.toString rice.border-width}px solid ${border};
+          }
+          .button,
+          .button-primary,
+          .tab-content[selected] {
+            background-color: ${accent.base}; 
+            color: ${background};
+            background-image: none; 
+          }
+          html {
+            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important;
+          }
+        '';
+      }; 
+    }; 
+  };
+}

home-modules/wallpaper-to-colors.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }@all: with all;
 {
-  home.packages = with pkgs; [
-    (writers.writePython3Bin "change_colors_json" {
-      libraries = with python3Packages; [ numpy pillow scikit-learn ];
+  home.packages = [
+    (pkgs.writers.writePython3Bin "change_colors_json" {
+      libraries = with pkgs.python3Packages; [ numpy pillow scikit-learn ];
       flakeIgnore = [ "E302" "E305" "E226" "E501" ];
     } /*python */ ''
       from colorsys import hls_to_rgb, rgb_to_hls
@@ -141,7 +141,10 @@
           foreground = alter_l(accent, 0.9)
           background = alter_l(accent, 0.05)
 
-          d = {
+          with open("${hyper.home}/nix-dots/flake-modules/colors.json", "r") as f:
+              full_d = json.load(f)
+
+          full_d['${hyper.host}'] = {
               "base": {
                   "foreground": list_to_hex(foreground),
                   "background": list_to_hex(background)
@@ -155,8 +158,8 @@
               }
           }
 
-          with open("/home/nx2/nix-dots/flake-modules/colors.json", "w") as f:
-              f.write(json.dumps(d, indent=4))
+          with open("${hyper.home}/nix-dots/flake-modules/colors.json", "w") as f:
+              f.write(json.dumps(full_d, indent=4))
     '')
   ];
 }

home-modules/yazi.nix

@@ -1,39 +1,17 @@
 { pkgs, ... }@all: with all; let
+  not-nod = (pkgs.pkgs-version != "24.05");
   tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
 in {
   home.packages = [
     pkgs.unar
     tfc
   ];
-  
   programs.yazi = {
     enable = true;
     # package = pkgs.yazi;
     package = inputs.yazi.packages.${hyper.system}.default;
     enableFishIntegration = true;
-    shellWrapperName = "ya";
-    initLua = /* lua */ ''
-      require("zoxide"):setup {
-      	update_db = true,
-      }
-      Status:children_add(function()
-      	local h = cx.active.current.hovered
-      	if not h or ya.target_family() ~= "unix" then
-      		return ""
-      	end
-
-      	return ui.Line {
-      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
-      		":",
-      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
-      		" ",
-      	}
-      end, 500, Status.RIGHT)
-    '';
-    plugins = with pkgs; {
-      inherit glow git;
-    };
-    # initLua = /* lua */  '' '';
+    # initLua = /* lua */  '' ''; # down
     keymap = {
       mgr.keymap = [
       	{ on = "<Esc>"; run = "escape";             desc = "Exit visual mode, clear selected, or cancel search"; }
@@ -52,24 +30,24 @@ in {
       	{ on = "<C-f>";           run = "arrow 100%";       desc = "Move cursor down one page";                 }
       	{ on = "<PageUp>";        run = "arrow -100%";      desc = "Move cursor up one page";                   }
       	{ on = "<PageDown>";      run = "arrow 100%";       desc = "Move cursor down one page";                 }
-      	{ on = [ "g" "g" ];       run = "arrow top";        desc = "Move cursor to the top";                    }
-      	{ on = [ "g" "e" ];       run = "arrow bot";        desc = "Move cursor to the end";                    }
-      	{ on = [ "g" "h" ];       run = "cd ~";             desc = "Go to the home directory";                  }
-      	{ on = [ "g" "n" ];       run = "cd ~/nix-dots";    desc = "Go to the Nix-Dotfiles directory";          }
-      	(pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ];       run = "cd /var/lib/hugo/nx2site";    desc = "Go to the Hugo Nx2.Site directory"; })
-      	{ on = [ "g" "n" ];       run = "cd /nix/store";    desc = "Go to the Nix-Store";                       }
-      	{ on = [ "g" "c" ];       run = "cd ~/.config";     desc = "Go to the config directory";                }
-      	{ on = [ "g" "l" ];       run = "cd ~/.locale";     desc = "Go to the .locale directory";               }
       	{ on = [ "g" "C" ];       run = "cd ~/.cache";      desc = "Go to the .cache directory";                }
-      	{ on = [ "g" "m" ];       run = "cd ~/media";       desc = "Go to the media (udiskie mount) directory"; }
-      	{ on = [ "g" "v" ];       run = "cd ~/Videos";      desc = "Go to the Videos directory";                }
-      	{ on = [ "g" "t" ];       run = "cd /tmp";          desc = "Go to the /tmp directory";                  }
-      	{ on = [ "g" "d" ];       run = "cd ~/Downloads";   desc = "Go to the downloads directory";             }
+      	{ on = [ "g" "c" ];       run = "cd ~/.config";     desc = "Go to the config directory";                }
       	{ on = [ "g" "D" ];       run = "cd ~/Documents";   desc = "Go to the Documents directory";             }
-      	{ on = [ "g" "r" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
+      	{ on = [ "g" "d" ];       run = "cd ~/Downloads";   desc = "Go to the downloads directory";             }
+      	{ on = [ "g" "e" ];       run = "arrow bot";        desc = "Move cursor to the end";                    }
+      	{ on = [ "g" "g" ];       run = "arrow top";        desc = "Move cursor to the top";                    }
+      	{ on = [ "g" "h" ];       run = "cd ~";             desc = "Go to the home directory";                  }
+      	{ on = [ "g" "l" ];       run = "cd ~/.locale";     desc = "Go to the .locale directory";               }
+      	{ on = [ "g" "m" ];       run = "cd ~/media";       desc = "Go to the media (udiskie mount) directory"; }
+      	{ on = [ "g" "n" ];       run = "cd ~/nix-dots";    desc = "Go to the Nix-Dotfiles directory";          }
+      	{ on = [ "g" "N" ];       run = "cd /nix/store";    desc = "Go to the Nix-Store";                       }
       	{ on = [ "g" "p" ];       run = "cd ~/projects";    desc = "Go to the projects directory";              }
+      	{ on = [ "g" "r" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
       	{ on = [ "g" "/" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
+      	{ on = [ "g" "t" ];       run = "cd /tmp";          desc = "Go to the /tmp directory";                  }
+      	{ on = [ "g" "v" ];       run = "cd ~/Videos";      desc = "Go to the Videos directory";                }
       	{ on = [ "g" "<Space>" ]; run = "cd --interactive"; desc = "Go to a directory interactively";           }
+      	(pkgs.lib.mkIf (hyper.isServer) { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; })
       	# Navigation
       	{ on = "h";       run = "leave";   desc = "Go back to the parent directory";   }
       	{ on = "l";       run = "enter";   desc = "Enter the child directory";         }
@@ -90,10 +68,10 @@ in {
       	# Operation
       	{ on = "o";         run = "open";                        desc = "Open selected files";                            }
       	{ on = "O";         run = "open --interactive";          desc = "Open selected files interactively";              }
-      	{ on = "<Enter>";   run = "open";                        desc = "Open selected files";                            }
+      	{ on = "<Enter>";   run = "plugin smart-enter";          desc = "Open selected files";                            }
+      	# { on = "<Enter>";   run = "open";                        desc = "Open selected files";                            }
       	{ on = "<S-Enter>"; run = "open --interactive";          desc = "Open selected files interactively";              }
-      	{ on = "y";         run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list''
-                                                      "yank" ];  desc = "Yank selected files (copy)";                     }
+      	{ on = "y";         run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'' "yank" ];  desc = "Yank selected files (copy)";                     }
       	{ on = "y";         run = "yank";                        desc = "Yank selected files (copy)";                     }
       	{ on = "x";         run = "yank --cut";                  desc = "Yank selected files (cut)";                      }
       	{ on = "p";         run = "paste";                       desc = "Paste yanked ";                                  }
@@ -110,8 +88,8 @@ in {
       	{ on = ";";         run = "shell --interactive";         desc = "Run a shell command";                            }
       	{ on = ":";         run = "shell --block --interactive"; desc = "Run a shell command (block until finishes)";     }
       	{ on = ".";         run = "hidden toggle";               desc = "Toggle the visibility of hidden files";          }
-      	{ on = "s";         run = "search fd";                   desc = "Search files by name using fd";                  }
-      	{ on = "S";         run = "search rg";                   desc = "Search files by content using ripgrep";          }
+      	{ on = "s";         run = "search --via=fd";             desc = "Search files by name using fd";                  }
+      	{ on = "S";         run = "search --via=rg";             desc = "Search files by content using ripgrep";          }
       	{ on = "<C-s>";     run = "escape --search";             desc = "Cancel the ongoing search";                      }
       	{ on = "z";         run = "plugin zoxide";               desc = "Jump to a directory using zoxide";               }
       	{ on = "Z";         run = "plugin fzf";                  desc = "Jump to a directory or reveal a file using fzf"; }
@@ -180,8 +158,13 @@ in {
       	{ on = "{";     run = "tab_swap -1";              desc = "Swap current tab with previous tab";    }
       	{ on = "{";     run = "tab_swap -1";              desc = "Swap current tab wittab";               }
       	{ on = "}";     run = "tab_swap 1";               desc = "Swap current tab with next tab";        }
+      	{ on = "<Tab>"; run = "spot";                     desc = "Show Spot View";                        }
         # Tasks
       	{ on = "w";     run = "tasks:show";    desc = "Show Task View";     }
+      	# Magic
+      	{ on = "<C-h>"; run = "shell 'hx .' --block";    desc = "Open current directoy in Helix";         }
+      	{ on = "<C-g>"; run = "shell 'lazygit' --block"; desc = "Open current directoy in Lazygit";       }
+      	{ on = "<C-y>"; run = ''shell 'ghostty --command="fish -C nx_yazi_into_fish"' --orphan ''; desc = "Open current directoy in a new ghostty window";       }
       ];
       tasks.keymap = [
       	# Task
@@ -190,8 +173,8 @@ in {
       	{ on = "<Esc>"; run = "close";    desc = "Close Task View";     }
       	{ on = "c";     run = "cancel";   desc = "Cancel Task";         }
       	{ on = "i";     run = "inspect";  desc = "Inspect Task";        }
-      	{ on = "j";     run = "arrow -1"; desc = "Up in list";          }
-      	{ on = "k";     run = "arrow 1";  desc = "Down in list";        }
+      	{ on = "k";     run = "arrow -1"; desc = "Up in list";          }
+      	{ on = "j";     run = "arrow 1";  desc = "Down in list";        }
       	{ on = "u";     run = "arrow -5"; desc = "Up in list (fast)";   }
       	{ on = "d";     run = "arrow 5";  desc = "Down in list (fast)"; }
       ];
@@ -201,6 +184,19 @@ in {
       	{ on = "?";    run = "help"; desc = "Open help"; }
       	{ on = "<F1>"; run = "help"; desc = "Open help"; }
       ];
+      spot.keymap = [
+        # Spot
+      	{ on = "<Tab>"; run = "close";    desc = "Close Spot View";     }
+      	{ on = "q";     run = "close";    desc = "Close Spot View";     }
+      	{ on = "<Esc>"; run = "close";    desc = "Close Spot View";     }
+      	{ on = "k";     run = "arrow -1"; desc = "Up in list";          }
+      	{ on = "j";     run = "arrow 1";  desc = "Down in list";        }
+      	{ on = "u";     run = "arrow -5"; desc = "Up in list (fast)";   }
+      	{ on = "d";     run = "arrow 5";  desc = "Down in list (fast)"; }
+      	{ on = [ "g" "g" ]; run = "arrow top"; desc = "Move cursor to the top"; }
+      	{ on = [ "g" "e" ]; run = "arrow bot"; desc = "Move cursor to the end"; }
+      	{ on = "c";     run = "copy cell";     desc = "Copy Selected Cell"; }
+      ]; 
     };
     settings = {
       mgr = {
@@ -215,74 +211,74 @@ in {
       };
       opener = {
         "edit" = [
-	        { run = ''hx "$@"''; desc = "helix"; block = true; }
-	        { run = ''codium "$@"''; desc = "code"; orphan = true; }
+	        { run = ''hx "$@"''; desc = "Helix"; block = true; }
+	        { run = ''codium "$@"''; desc = "VS Code"; orphan = true; }
+	        { run = ''cat "$@" | wl-copy''; desc = "Copy Contents"; }
         ];
         "play" = [
-          { run = ''mpv "$@"''; desc = "mpv"; orphan = true; }
-          { run = ''mpv --vf=negate "$@"''; desc = "mpv inverted"; orphan = true; }
-          { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo"; }
+          { run = ''mpv "$@"''; desc = "MPV"; orphan = true; }
+          { run = ''mpv --vf=negate "$@"''; desc = "MPV inverted"; orphan = true; }
+          { run = ''mediainfo "$1"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; }
         ];
         "archive" = [
-          { run = ''unar "$1"''; desc = "Extract here"; }
-          { run = ''tar -x "$1"''; desc = "tar -x"; }
-          { run = ''unzip "$1"''; desc = "unzip"; }
+          { run = ''unar "$@"''; desc = "Extract here"; }
+          { run = ''tar -x "$@"''; desc = "tar -x"; }
+          { run = ''unzip "$@"''; desc = "unzip"; }
         ];
         "image" = [
-          { run = ''imv "$@"''; desc = "imv"; orphan = true; }
-          { run = ''gimp "$@"''; desc = "gimp"; orphan = true; }
-          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; }
-          { run = ''exiftool "$@"; echo "Press enter to exit"; read''; desc = "View Exif Data"; }
-          { run = ''for f in "$@"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
+          { run = ''imv "$@"''; desc = "IMV"; orphan = true; }
+          { run = ''gimp "$@"''; desc = "Gimp"; orphan = true; }
+          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$1"''; desc = "swww wallpaper"; }
+          { run = ''exiftool "$1"; echo "Press enter to return to yazi"; read''; desc = "View Exif Data"; }
+          { run = ''for f in "$1"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
         ];
         "svg" = [
-          { run = ''inkscape "$@"''; desc = "inkscape"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''inkscape "$@"''; desc = "Inkscape"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
         ];
         "font" = [
-          { run = ''fontpreview "$@"''; desc = "fontpreview"; orphan = true; }
-          { run = ''fontforge "$@"''; desc = "fortforge"; orphan = true; }
+          { run = ''fontpreview "$@"''; desc = "Fontpreview"; orphan = true; }
+          { run = ''fontforge "$@"''; desc = "Fortforge"; orphan = true; }
         ];
         "document" = [
-          { run = ''zathura "$@"''; desc = "zathura"; orphan = true; }
-          { run = ''xournal "$@"''; desc = "xournal"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''zathura "$@"''; desc = "Zathura"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
           { run = ''nxgs flip "$@"''; desc = "nxgs flip"; }
           { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; }
           { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; }
         ];
         "browser" = [
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
-          { run = ''zen "$@"''; desc = "zen"; orphan = true; }
-          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
+          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "Chromium"; orphan = true; }
           { run = ''w3m "$@"''; desc = "w3m"; }
-          { run = ''lynx "$@"''; desc = "lynx"; }
+          { run = ''lynx "$@"''; desc = "Lynx"; }
         ];
         "office" = [
-          { run = ''libreoffice "$@"''; desc = "libreoffice"; orphan = true; }
-          { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; orphan = true; }
+          { run = ''libreoffice "$@"''; desc = "LibreOffice"; orphan = true; }
+          { run = ''libreoffice --view "$@"''; desc = "LibreOffice read-only"; orphan = true; }
         ];
         "shell" = [
-          { run = ''bash -c "$@"''; desc = "bash -c"; }
-          { run = ''fish -c "$@"''; desc = "fish -c"; }
-          { run = ''sh -c "$@"'';   desc = "sh -c"; }
+          { run = ''bash -c "$1"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; }
+          { run = ''fish -c "$1"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; }
+          { run = ''sh -c "$1"; echo "Press enter to return to yazi"; read'';   desc = "sh -c"; }
         ];
         "python" = [
-          { run = ''python "$@"''; desc = "python"; }
+          { run = ''python "$@"; echo "Press enter to return to yazi"; read''; desc = "Python"; block = true; }
         ];
         "directory" = [
-          { run = ''lazygit "$@"''; desc = "python"; }
+          { run = ''lazygit "$1"''; desc = "LazyGit"; }
         ];
       };
       open.rules = [
         { mime = "text/html";                                       use = [ "edit" "browser" ]; }
         { mime = "text/htm";                                        use = [ "edit" "browser" ]; }
-        { mime = "text/x-python";                                   use = "python"; }
+        { mime = "text/x-script.python";                            use = [ "edit" "python" ]; }
+        { mime = "text/script.python";                              use = [ "edit" "python" ]; }
         { mime = "text/*";                                          use = "edit"; }
         { mime = "text";                                            use = "edit"; }
 
-        { mine = "inode/x-empty";                                   use = "edit"; }
-        { mine = "inode/directory";                                 use = "edit"; }
+        { mime = "inode/x-empty";                                   use = "directory"; }
+        { mime = "inode/directory";                                 use = "directory"; }
 
         { mime = "image/*";                                         use = "image"; }
         { mime = "image/svg";                                       use = [ "image" "edit" ]; }
@@ -333,29 +329,73 @@ in {
       tabs = {
         active    = { fg = secondary.dark; bg = secondary.base; };
         inactive  = { fg = secondary.base; bg = secondary.dark; };
-        # sep_inner = 
-        # sep_outer = 
+        # sep_inner = { open = "[", close = "]" };
+        # sep_outer = { open = "[", close = "]" };
+      };
+      mode = {
+        main_main   = { fg = yellow.bright;  bg = yellow.dark; };
+        select_main = { fg = cyan.bright;    bg = cyan.dark; };
+        unset_main  = { fg = blue.bright;    bg = blue.dark; };
+        main_alternative   = { fg = yellow.brighter;  bg = yellow.dark; };
+        select_alternative = { fg = cyan.brighter;    bg = cyan.dark; };
+        unset_alternative  = { fg = blue.brighter;    bg = blue.dark; };
+      };
+      confirm = {
+        border = { fg = border; };
+        title = { fg = accent.bright; };
+        body = { fg = "#ff0000"; };
+        list = { fg = "#ff0000"; };
+        btn_yes = { fg = positive.base; bg = positive.dark; };
+        btn_no = { fg = negative.base; bg = negative.dark; };
+        btn_labels = [ "   BET   " " HELLNAW " ];
+      };
+      spot = {
+        border = { fg = border; };
+        title = { fg = accent.bright; };
+        tbl_col = { fg = accent.base; };
+        tbl_cell = { fg = secondary.base; };
+      };
+      notify = {
+        title_info = { fg = accent.base; };
+        title_warn = { fg = weird.base; };
+        title_error = { fg = special.base; };
+      };
+      pick = {
+        border = { fg = border; };
+        active = { fg = accent.bright; };
+        inactive = { fg = subtle.bright; };
       };
       status = {
-        separator_open  = " "; #"";
-        separator_close = " "; #"";
-        separator_style = { fg = accent.base;    bg = black.base; };
-        mode_normal     = { fg = yellow.bright;  bg = yellow.dark; };
-        mode_select     = { fg = cyan.bright;    bg = cyan.dark; };
-        mode_unset      = { fg = blue.bright;    bg = blue.dark; };
+        # sep_right  = { open = ""; close = ""; };
+        # sep_left   = { open = ""; close = ""; };
+        sepr_style = { fg = accent.base;    bg = black.base; };
         progress_label  = { fg = secondary.base; bold = true; };
         progress_normal = { fg = accent.base;    bg = black.base; };
         progress_error  = { fg = negative.base;  bg = black.base; };
-        permissions_t   = { fg = special.base;   };
-        permissions_r   = { fg = accent.base;    };
-        permissions_w   = { fg = secondary.base; };
-        permissions_x   = { fg = tertiary.base;  };
-        permissions_s   = { fg = special.base;   };
+        perm_type   = { fg = special.base;   };
+        perm_read   = { fg = accent.base;    };
+        perm_write   = { fg = secondary.base; };
+        perm_exec   = { fg = tertiary.base;  };
+        perm_sep   = { fg = special.base;   };
+      };
+      indicator = { # your "cursor"
+        parent = { fg = secondary.darker; bg = secondary.base; };
+        current = { fg = accent.darker; bg = accent.base; };
+        preview = { fg = secondary.base; bg = secondary.darker; };
+        # padding = { open = " "; close = " "; };
+      };
+      cmp = {
+        border = { fg = border; };
+        active = { fg = accent.base; };
+        inactive = { fg = subtle.base; };
+        # icon_file = 
+        # icon_folder = 
+        # icon_command
       };
       input = {
         border   = { fg = border; };
-        title    = {};
-        value    = {};
+        title    = { fg = accent.bright; };
+        value    = { fg = foreground; };
         selected = { reversed = true; };
       };
       select = {
@@ -365,8 +405,8 @@ in {
       };
       tasks = {
         border  = { fg = border2; };
-        title   = {};
-        hovered = { underline = true; };
+        title   = { fg = accent.base; bold = true; };
+        hovered = { fg = accent.bright; };
       };
       which = {
         mask            = { bg = black.base; };
@@ -377,11 +417,11 @@ in {
         separator_style = { fg = foreground; };
       };
       help = {
-        on      = { fg = "#fe8019"; };
-        exec    = { fg = "#83a598"; };
-        desc    = { fg = "#928374"; };
-        hovered = { bg = "#504945"; bold = true; };
-        footer  = { fg = "#3c3836"; bg = "#a89984"; };
+        on      = { fg = accent.base; };
+        run     = { fg = secondary.base; };
+        desc    = { fg = tertiary.base; italic = true; };
+        hovered = { bg = accent.bright; bold = true; };
+        footer  = { fg = accent.base; bg = subtle.dark; };
       };
       filetype = {
         rules = [
@@ -389,21 +429,52 @@ in {
         	{ mime = "inode/x-empty";   fg = white.dark; }
         	{ mime = "inode/directory"; fg = accent.base; }
 
-          { name = "*"; is = "link";   fg = tertiary.base; }
-        	{ name = "*"; is = "orphan"; fg = negative.base; }
-          { name = "*"; is = "block";  fg = special.base; }
-          { name = "*"; is = "char";   fg = special.bright; }
-          { name = "*"; is = "exec";   fg = secondary.base; }
-          { name = "*"; is = "fifo";   fg = weird.base; }
-          { name = "*"; is = "sock";   fg = weird.bright; }
-          { name = "*"; is = "sticky"; fg = special.base; }
+          { url = "*"; is = "link";   fg = tertiary.base; }
+        	{ url = "*"; is = "orphan"; fg = negative.base; }
+          { url = "*"; is = "block";  fg = special.base; }
+          { url = "*"; is = "char";   fg = special.bright; }
+          { url = "*"; is = "exec";   fg = secondary.base; }
+          { url = "*"; is = "fifo";   fg = weird.base; }
+          { url = "*"; is = "sock";   fg = weird.bright; }
+          { url = "*"; is = "sticky"; fg = special.base; }
 
         	# Fallback
-        	{ name = "*"; fg = foreground; }
+        	{ url = "*"; fg = foreground; }
         ];
       };
     };
-  };
+  } // (if not-nod then {
+    shellWrapperName = "ya";
+    initLua = /* lua */ ''
+      require("zoxide"):setup {
+      	update_db = true,
+      }
+      Status:children_add(function()
+      	local h = cx.active.current.hovered
+      	if not h or ya.target_family() ~= "unix" then
+      		return ""
+      	end
+
+      	return ui.Line {
+      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+      		":",
+      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+      		" ",
+      	}
+      end, 500, Status.RIGHT)
+
+      Header:children_add(function()
+        if ya.target_family() ~= "unix" then
+          return ""
+        end
+        return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
+      end, 500, Header.LEFT)
+    '';
+    plugins = { inherit (pkgs.yaziPlugins)
+      glow git smart-enter;
+    };
+  } else {});
+  
   xdg = {
     configFile."xdg-desktop-portal-termfilechooser/config" = {
       force = true;
@@ -413,7 +484,7 @@ in {
         default_dir=$HOME
         env=TERMCMD=ghostty --title="terminal-file-picker -e"
         open_mode=suggested
-        save_mode=last
+        save_mode=suggested
       '';
     };
     portal = {
@@ -421,11 +492,9 @@ in {
       xdgOpenUsePortal = true;
       config.common."org.freedesktop.impl.portal.FileChooser" = "termfilechooser";
       extraPortals = [ tfc ] ++ (with pkgs; [
-        xdg-desktop-portal-hyprland
         xdg-desktop-portal
         xdg-desktop-portal-gnome
         xdg-desktop-portal-gtk
-        xdg-desktop-portal-hyprland
         xdg-desktop-portal-wlr
       ]);
     };

home.nix

@@ -8,6 +8,7 @@
     ./home-modules/chatterino.nix
     ./home-modules/clipboard.nix
     ./home-modules/color-pallete.nix
+    ./home-modules/contact.nix
     ./home-modules/direnv.nix
     ./home-modules/discord.nix
     ./home-modules/email.nix
@@ -25,7 +26,8 @@
     ./home-modules/hyprland-autoname-workspaces.nix
     ./home-modules/hyprland.nix
     ./home-modules/kitty.nix
-    ./home-modules/latex.nix
+    # ./home-modules/latex.nix
+    ./home-modules/logitech.nix
     ./home-modules/mako.nix
     # ./home-modules/matrix.nix
     ./home-modules/mpv.nix
@@ -34,14 +36,14 @@
     ./home-modules/nvidia.nix
     ./home-modules/nxgs.nix
     ./home-modules/obs.nix
-    ./home-modules/office.nix
+    # ./home-modules/office.nix
     ./home-modules/ollama.nix
     ./home-modules/opencode.nix
     ./home-modules/pandoc.nix
     ./home-modules/pkgs-list/desktop.nix
     ./home-modules/pkgs-list/programs.nix
     ./home-modules/pkgs-list/shell.nix
-    ./home-modules/pnx.nix
+    # ./home-modules/pnx.nix
     ./home-modules/programming.nix
     ./home-modules/qt.nix
     ./home-modules/rclone.nix
@@ -52,6 +54,7 @@
     ./home-modules/spotify.nix
     ./home-modules/ssh.nix
     ./home-modules/starship.nix
+    ./home-modules/thunderbird.nix
     ./home-modules/tts.nix
     ./home-modules/typst.nix
     ./home-modules/vale.nix
@@ -63,7 +66,7 @@
     ./home-modules/yazi.nix
     ./home-modules/zathura.nix
     ./home-modules/zoxide.nix
-  ] ++ (if (hyper.host == "NxACE") then [ 
+  ] ++ (if hyper.isServer then [ 
     ./home-modules/nx2site.nix
     ./home-modules/nx2site-backup.nix
     ./home-modules/calendar-campuszeit-fix.nix
@@ -71,6 +74,6 @@
   home.username = hyper.user;
   home.homeDirectory = hyper.home;
   # home.homeDirectory = "/home/${hyper.user}";
-  home.stateVersion = hyper.pkgs-version;
+  home.stateVersion = hyper.main-pkgs-version;
   programs.home-manager.enable = true;
 }

nix-on-droid.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }@all: with all;
-{
-  # Simply install just the packages
-  environment.packages = with pkgs; [
-    helix
-    git
-    lazygit
-    yazi
-  ];
-
-  # Backup etc files instead of failing to activate generation if a file already exists in /etc
-  environment.etcBackupExtension = ".bak";
-
-  # Read the changelog before changing this value
-  system.stateVersion = pkgs.version;
-
-  # Set up nix for flakes
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  # Set your time zone
-  time.timeZone = "Europe/Berlin";
-}

nod.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }@all: with all; {
+  environment = {
+    packages = import ./system-modules/base-packages.nix pkgs;
+    etcBackupExtension = ".bak";
+    motd = "";
+  };
+  terminal = {
+    font = rice.font.code.regular-path;
+  };
+  android-integration = {
+    termux-setup-storage.enable = true;
+  };
+  system.stateVersion = pkgs.version;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+  user ={
+    shell = "${pkgs.fish}/bin/fish";
+    # userName = pkgs.lib.mkForce hyper.user; if its read-only, whats the point of this option???
+  };
+
+
+  # Set your time zone
+  time.timeZone = "Europe/Berlin";
+
+  home-manager = {
+    config = import ./shell-only.nix;
+    useGlobalPkgs = true;
+    backupFileExtension = "backup";
+    extraSpecialArgs = { inherit (all) inputs hyper rice; };
+  };
+}

nxlib/ricelib.nix

@@ -1,96 +0,0 @@
-lib:
-let
-  # takes in "ff0044" (no hash!) and returns { r = "ff", g = "00", b = "44" }
-  slice-hex = hex: with builtins; { r = substring 0 2 hex; g = substring 2 2 hex; b = substring 4 2 hex; };
-
-  # takes in "44" and returns 64
-  drune-to-255 = drune: with builtins; (rune-to-num (substring 0 1 drune)) * 16 + (rune-to-num (substring 1 1 drune));
-  num-to-drune = num: "${num-to-rune (num / 16)}${num-to-rune (num - ((num / 16) * 16))}";
-  
-  # takes in "D" and returns 13
-  rune-to-num = rune: # inspiration from https://github.com/bertof/nix-rice
-    let
-      dict = {
-        "0" = 0;
-        "1" = 1;
-        "2" = 2;
-        "3" = 3;
-        "4" = 4;
-        "5" = 5;
-        "6" = 6;
-        "7" = 7;
-        "8" = 8;
-        "9" = 9;
-        "A" = 10;
-        "B" = 11;
-        "C" = 12;
-        "D" = 13;
-        "E" = 14;
-        "F" = 15;
-      };
-    in
-    assert(builtins.hasAttr (lib.strings.toUpper rune) dict);
-    builtins.getAttr (lib.strings.toUpper rune) dict;
-
-  # takes in 15 and returns "F"
-  num-to-rune = num:
-    let
-      num-string = builtins.toString num;
-      dict = {
-        "0" = "0";
-        "1" = "1";
-        "2" = "2";
-        "3" = "3";
-        "4" = "4";
-        "5" = "5";
-        "6" = "6";
-        "7" = "7";
-        "8" = "8";
-        "9" = "9";
-        "10" = "A";
-        "11" = "B";
-        "12" = "C";
-        "13" = "D";
-        "14" = "E"; 
-        "15" = "F";
-      };
-    in
-    assert(builtins.hasAttr num-string dict);
-    builtins.getAttr num-string dict;
-
-    # Keeps num between 0 and 255
-    # Make sure to pass in an int not a float
-    cap-255 = num: (if (num>255) then 255 else if (num<0) then 0 else num);
-  
-    nohash = hex: with builtins; assert((stringLength hex) == 7); substring 1 6 hex;
-in
-{
-
-  ## USEFUL FUNCTIONS
-  # --------------------------------------------------------------------------------
-  # takes in a string like "#ff0044" and returns "ff0044" symbol
-  inherit nohash;
-
-  # --------------------------------------------------------------------------------
-  # This takes in something like "#ff0044" and returns "255,0,64"
-  hex-to-rgb-comma-string = hex: 
-  with (slice-hex (nohash hex));
-  with builtins;
-  assert(isString hex);
-  "${toString (drune-to-255 r)},${toString (drune-to-255 g)},${toString (drune-to-255 b)}";
-
-  # --------------------------------------------------------------------------------
-  # This is useful if you have a float (like a transparency value) and want a drune representation of it
-  # So 0.0 -> "00" and 1.0 -> "FF" 
-  float-to-drune = f: with builtins; assert(isFloat f); "${num-to-rune (floor((255*f) / 16))}${num-to-rune (floor(255*f) - (floor((255*f) / 16) * 16))}";
-
-  # --------------------------------------------------------------------------------
-  # Takes in hex and a float. 0.5 is +50% brightness and (-0.5) is -50% brightness.
-  # So "#ff0044": 0.3 -> "#ff0055"
-  alter-luminace-hex = hex: amount: 
-  let 
-    color-num = with (slice-hex (nohash hex)); { r = drune-to-255 r; g = drune-to-255 g; b = drune-to-255 b; };
-    alter = num: (num-to-drune (cap-255 (builtins.floor ((125 * amount) + (num * (1+amount))) )));
-  in
-  with color-num; "#${alter r}${alter g}${alter b}";
-}

shell-only.nix

@@ -7,12 +7,12 @@
     ./home-modules/git.nix
     ./home-modules/gpg.nix
     ./home-modules/helix.nix
-    ./home-modules/latex.nix
+    # ./home-modules/latex.nix
     ./home-modules/nh.nix
     ./home-modules/nixd.nix
     ./home-modules/nxgs.nix
     ./home-modules/pandoc.nix
-    ./home-modules/programming/c.nix
+    # ./home-modules/programming/c.nix
     ./home-modules/programming/gleam.nix
     ./home-modules/programming/go.nix
     ./home-modules/programming/java.nix
@@ -30,7 +30,7 @@
   home = {
     username = hyper.user;    
     homeDirectory = hyper.home;
-    stateVersion = hyper.pkgs-version;
+    stateVersion = hyper.main-pkgs-version;
   };
   xdg = {
     enable = true;

system-modules/base-packages.nix

@@ -1,19 +1,18 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; ([
-    git
-    git-crypt
-    lazygit # home-manager module is bugged
-    wget
-    curlHTTP3
-    zip
-    unzip
-    p7zip
-    unar
-    vim
-    htop
-    openssl
-    dmidecode
-    file
-  ]);
+pkgs: with pkgs; [
+  busybox
+  # coreutils-full
+  gitFull
+  git-crypt
 
-}
+  wget
+  curl
+  zip
+  unzip
+  p7zip
+  unar
+  vim
+  htop
+  openssl
+  dmidecode
+  file
+]

system-modules/boot.nix

@@ -9,8 +9,10 @@
   device-boot = if hyper.host == "NxNORTH" then {
     kernelPackages = pkgs.linuxPackages_zen;
     kernelParams = [
-      "fbcon=margin:1"
+      # "fbcon=margin:1"
       "fbcon=nodefer"
+      "video=DP-4:2560x1440@60"
+      # "video=HDMI-A-3:d"
     ];
     lanzaboote = {
       enable = true;
@@ -25,7 +27,11 @@
     kernelPackages = pkgs.linuxPackages;
     extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
     kernelModules = [ "v4l2loopback" ];
-    extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';
+    extraModprobeConfig = ''
+      options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1
+      options snd_hda_intel power_save=0
+      options snd_ac97_codec power_save=0
+    '';
     loader = {
       efi.canTouchEfiVariables = true;
       grub = {
@@ -66,5 +72,23 @@ in {
   config = {
     environment.systemPackages = with pkgs; lib.mkIf ( host == "NxNORTH" ) [ sbctl ];
     boot = { tmp.useTmpfs = false; } // device-boot;
+    # thx fxzzi
+    # sh*tty nvidia makes the tty on my 1440p monitor 1080p
+    # so just resize it to 1440p
+    systemd.services.fbset = lib.mkIf (hyper.host == "NxNORTH") {
+      enable = true;
+      wantedBy = ["multi-user.target"];
+      unitConfig = {
+        Description = "Set framebuffer resolution";
+        Before = "display-manager.service";
+      };
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${lib.getExe pkgs.fbset} -xres 2560 -yres 1440 -match --all";
+        RemainAfterExit = "yes";
+        StandardOutput = "journal";
+        StandardError = "journal";
+      };
+    };
   };
 }

system-modules/calendar/lr.nix

@@ -23,7 +23,8 @@ from ics import Calendar
 import requests
 
 def filter_events(events):
-    return [event for event in events if ("LR" in event.name)]
+    return [event for event in events if ("WT" in event.name)]
+    # return [event for event in events if ("LR" in event.name)]
     # return [event for event in events if ("LR" in event.name) or ("TBD" in event.name)]
 
 def fetch_and_save_ical_events(ical_urls, save_path):
@@ -62,7 +63,7 @@ def fetch_and_save_ical_events(ical_urls, save_path):
 if __name__ == "__main__":
     # Replace with your iCal URL and target file path
     ICAL_URLS = [
-        "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical",
+        # "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical",
         "https://zlypher.github.io/lol-events/cal/league-of-legends-emea-masters.ical"
     ]
     SAVE_PATH = "${config.services.nginx.virtualHosts."${hyper.domain}".root}/lr.ics"

system-modules/davfs.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }@all: with all; let
+  # user = "lennart";
+in {
+	services.davfs2 = {
+	  enable = true;
+	  settings = {
+	    globalSection = {
+	      use_locks = true;
+	    };
+	    sections = {
+	      "${hyper.home}/webdav" = {
+	        gui_optimize = true;
+	      };
+	    };
+	  };
+	};
+	users.users."${hyper.user}".extraGroups = [ "davfs2" ];
+}
+

system-modules/dm.nix

@@ -1,31 +1,87 @@
-{ pkgs, ... }@all: with all; {
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      hyprland = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
-        user = hyper.user;
-      };
-      default_session = hyprland;
-      vt = 2;
-    };  
-    # useTextGreeter = true;
-  };
-  # services.displayManager.ly = {
+{ config, pkgs, ... }@all: with all; {
+  # services.greetd = {
   #   enable = true;
-  #   package = pkgs.ly;
-  #   settings = {
-  #     # animation = "matrix";
-  #     # clear_password = true;
-  #     clock = "%c";
-  #     lang = "de";
-  #     load = true;
-  #     # numlock = false;
-  #     save = true;
+  #   settings = rec {
+  #     hyprland = {
+  #       command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
+  #       user = hyper.user;
+  #     };
+  #     default_session = hyprland;
+  #     vt = 2;
   #   };  
+  #   # useTextGreeter = true;
   # };
+  services.xserver.displayManager.lightdm.enable = false;
+  services.displayManager.ly = pkgs.lib.mkIf (!hyper.isServer) {
+# info and docs at https://codeberg.org/fairyglade/ly/src/branch/master/res/config.ini
+    enable = true;
+    package = pkgs.ly;
+    settings = with rice.color; let h = rice.lib.nohash; in {
+      allow_empty_password = false;
+      animation = "matrix";
+      # animation = "gameoflife";
+      animation_timeout_sec = 0; # forever
+      asterisk = "*";
+      auth_fails = 10;
+      # auto_login_session = "hyprland";
+      # auto_login_user = hyper.user;
+      battery_id = if hyper.isMobile then "BAT0" else null;
+      bg = "0x00${h background}";
+      bigclock_12hr = false;
+      bigclock = "en";
+      bigclock_seconds = false;
+      blank_box = true; # not transparent
+      border_fg = "0x00${h border}";
+      box_title = " Optimistic Nihilism ";
+      clear_password = true;
+      clock = "%c";
+      cmatrix_fg = "0x00${h accent.base}";
+      cmatrix_head_col = "0x01${h accent.bright}";
+      cmatrix_max_codepoint = "0x7B";
+      cmatrix_min_codepoint = "0x21";
+      colormix_col1 = "0x00${h accent.base}";
+      colormix_col2 = "0x00${h secondary.base}";
+      colormix_col3 = "0x20${h tertiary.base}";
+      default_input = "password";
+      # doom_bottom_color = 0x00FFFFFF;
+      # doom_fire_height = 6; # 1-9
+      # doom_fire_spread = 2; # 0-4
+      # doom_middle_color = 0x00C78F17;
+      # doom_top_color = 0x009F2707;
+      # dur_file_path = $CONFIG_DIRECTORY/ly/example.dur;
+      # dur_offset_alignment = center; # Available inputs: topleft, topcenter, topright, centerleft, center, centerright, bottomleft, bottomcenter, bottomright
+      # Dur offset x direction (value is added to the current position determined by alignment, negatives are supported)
+      # dur_x_offset = 0;
+      # dur_y_offset = 0; # Dur offset y direction (value is added to the current position determined by alignment, negatives are supported)
+      # edge_margin = 0; # Set margin to the edges of the DM (useful for curved monitors)
+      error_bg = "0x00${h negative.darker}";
+      error_fg = "0x01${h negative.base}";
+      fg = "0x00${h foreground}";
+      full_color = true;
+      # gameoflife_entropy_interval = 20; # None
+      # gameoflife_fg = "0x00${h accent.base}";
+      # gameoflife_frame_delay = 6;
+      # gameoflife_initial_density = 0.4;
+      # # hibernate_cmd = null;
+      # # hibernate_key = F4;
+      hide_borders = false; # Remove main box borders
+      hide_keyboard_locks = false; # Remove keyboard lock states from the top right corner
+      hide_key_hints = false; # Remove power management command hints
+      hide_version_string = true;
+      # initial_info_text = "Login to ${hyper.host}";
+      # input_len = 35;
+      lang = "de";
+      save = true; # Save the current desktop and login as defaults, and load them on startup
+      # numlock = false;
+      # text_in_center = true; # Center the session name.
+      # vi_default_mode = "normal";
+      # vi_mode = true;
+      # xinitrc = null;
+      # xsessions = null;
+    };
+  };
 
-  # environment.systemPackages = with pkgs; [
-  #   cmatrix    
-  # ];
+  environment.systemPackages = with pkgs; [
+    cmatrix    
+  ];
 }

system-modules/editor.nix

@@ -3,6 +3,7 @@
     variables = {
       EDITOR = "hx";
       VISUAL = "hx";  
+      TERMINAL = "ghostty";
     };
     systemPackages = with pkgs; [
       helix

system-modules/fcitx5.nix

@@ -1,88 +1,14 @@
-{ pkgs, ... }@all: with all;
-{
-  # i18n.inputMethod = {
-  #   type = "fcitx5";
-  #   enable = true;
-  #   fcitx5.addons = with pkgs; [
-  #     fcitx5-gtk             # alternatively, kdePackages.fcitx5-qt
-  #     fcitx5-chinese-addons  # table input method support
-  #     fcitx5-nord            # a color theme
-  #   ];
-  # };
+{ pkgs, ... }@all: with all; {
   i18n.inputMethod = {
     enable = true;
     type = "fcitx5";
-    fcitx5.waylandFrontend = true;
-    fcitx5.addons = with pkgs; [
-      fcitx5-gtk             # alternatively, kdePackages.fcitx5-qt
-      fcitx5-chinese-addons  # table input method support
-      fcitx5-nord            # a color theme
-    ];
+    fcitx5 = {
+      waylandFrontend = true;
+      addons = with pkgs; [
+        fcitx5-gtk        
+        kdePackages.fcitx5-chinese-addons  
+        fcitx5-nord        
+      ];
+    };
   };
-  # i18n.inputMethod = {
-  #   enabled = "fcitx5";
-  #   ignoreUserConfig = true;
-  #   waylandFrontend = true;
-  #   fcitx5 = {
-  #     addons = with pkgs-unstable; [
-  #       rime-data
-  #       fcitx5-rime
-
-  #       # Chinese
-  #       fcitx5-chinese-addons
-  #       fcitx5-table-extra
-  #       fcitx5-pinyin-moegirl
-  #       fcitx5-pinyin-zhwiki
-
-  #       # Japanese
-  #       # fcitx5-mozc
-  #     ];
-  #     settings = {
-        # globalOptions = {
-        #   Hotkey = {
-        #     # Enumerate when press trigger key repeatedly
-        #     EnumerateWithTriggerKeys = "True";
-        #     # Skip first input method while enumerating
-        #     EnumerateSkipFirst = "False";
-        #   };
-        #   "Hotkey/EnumerateForwardKeys"  = { "0" = "Control+space";       };
-        #   "Hotkey/EnumerateBackwardKeys" = { "0" = "Control+Shift+space"; };
-        #   "Hotkey/PrevPage"              = { "0" = "Up";                  };
-        #   "Hotkey/NextPage"              = { "0" = "Down";                };
-        #   "Hotkey/PrevCandidate"         = { "0" = "Shift+Tab";           };
-        #   "Hotkey/NextCandidate"         = { "0" = "Tab";                 };
-        #   Behavior = {
-        #     ActiveByDefault = "False";                       # Active By Default
-        #     ShareInputState = "No";                          # Share Input State
-        #     PreeditEnabledByDefault = "True";                # Show preedit in application
-        #     ShowInputMethodInformation = "True";             # Show Input Method Information when switch input method
-        #     showInputMethodInformationWhenFocusIn = "False"; # Show Input Method Information when changing focus
-        #     CompactInputMethodInformation = "True";          # Show compact input method information
-        #     ShowFirstInputMethodInformation = "True";        # Show first input method information
-        #     DefaultPageSize = "5";                           # Default page size
-        #     OverrideXkbOption = "False";                     # Override Xkb Option
-        #     PreloadInputMethod = "True";                     # Preload input method to be used by default
-        #   };
-        # };
-        # inputMethod = {
-        #   "Groups/0" = {
-        #     "Name" = "Default";
-        #     "Default Layout" = "us";
-        #     "DefaultIM" = "mozc";
-        #   };
-        #   "Groups/0/Items/0" = {
-        #     "Name" = "keyboard-us";
-        #     "Layout" = null;
-        #   };
-        #   "Groups/0/Items/1" = {
-        #     "Name" = "mozc";
-        #     "Layout" = null;
-        #   };
-        #   "GroupOrder" = {
-        #     "0" = "Default";
-        #   };
-        # };
-      # };
-    # };
-  # };
 }

system-modules/fonts.nix

@@ -1,18 +1,18 @@
 { pkgs, ... }@all: with all;
 {
   fonts.packages = with pkgs; [
+    atkinson-hyperlegible
+    nerd-fonts._3270
+    nerd-fonts.heavy-data
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.profont
+    nerd-fonts.proggy-clean-tt
+    nerd-fonts.zed-mono
+    newcomputermodern
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
-    noto-fonts-emoji
-    newcomputermodern
-    atkinson-hyperlegible
-    nerd-fonts.jetbrains-mono
-    nerd-fonts.zed-mono
-    nerd-fonts.profont
-    nerd-fonts.proggy-clean-tt
-    nerd-fonts.heavy-data
-    nerd-fonts._3270
+    noto-fonts-color-emoji
   ] ++ (with rice.font; [
     base.package
     code.package

system-modules/games.nix

@@ -1,15 +1,7 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
-{
+{ pkgs, ... }@all: with all; {
   programs = {
-    steam = {
-      enable = true;
-    };
-    gamemode = {
-      enable = true;
-    };
-    gamescope = {
-      enable = true;
-    };
+    steam.enable = true;
+    gamemode.enable = true;
+    gamescope.enable = true;
   };
 }

system-modules/gui.nix

@@ -1,6 +1,7 @@
-{ ... }: {
+{ pkgs, ... }@all: with all; {
   programs.hyprland = {
     enable = true;
+    package = inputs.hyprland.packages.${hyper.system}.hyprland;
     xwayland.enable = true;
   };
   services.xserver.enable = true;

system-modules/hsmw.nix

@@ -27,8 +27,6 @@
     "hsmw-vpn-secret" = { path = "/etc/ipsec.d/hsmw.secret"; mode = "600"; };
   };
   
-  networking.networkmanager.enableStrongSwan = true;
-
   services.strongswan = {
     enable = true;
     setup = {

system-modules/networking.nix

@@ -10,11 +10,15 @@
     };
     enableIPv6 = true;
     firewall.allowedTCPPorts = [ 
-      (pkgs.lib.mkIf config.services.ollama.enable 11434)
-      80
-      443
       8000
       8080
+      (pkgs.lib.mkIf config.services.nginx.enable 80)
+      (pkgs.lib.mkIf config.services.nginx.enable 443)
+      (pkgs.lib.mkIf config.services.ollama.enable 11434)
+      (pkgs.lib.mkIf config.services.maddy.enable 587)
+      (pkgs.lib.mkIf config.services.maddy.enable 465)
+      (pkgs.lib.mkIf config.services.maddy.enable 993)
+      (pkgs.lib.mkIf config.services.maddy.enable 25025)
     ];
   };
 }

system-modules/nix.nix

@@ -0,0 +1,14 @@
+{ ... }: {
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    substituters = [
+      "https://cache.nixos.org/"
+      "https://cache.nixos-cuda.org"
+      "https://nix-community.cachix.org"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
+    ];
+  };
+}

system-modules/nvidia.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }@all: with all; lib.mkIf hyper.nvidia.enable  {
   environment.systemPackages = with pkgs; [
     lshw
-    glxinfo
+    mesa-demos
     (pkgs.writeShellScriptBin "nvidia-offload" ''
       export __NV_PRIME_RENDER_OFFLOAD=1
       export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0

system-modules/nx2site.nix

@@ -40,13 +40,15 @@ let dns-user = "cloudflare"; in
             sub   = "fc861353142bc05d5dbad1799178e6a1";
             sub6  = "b8082b7afe9e80971fc9f9dda16ec284";
             ssh   = "c0f14f17f32d6595c202f041dd836eb3";
-            ssh6  = "f1ecb2d9d0522d4eec06437688ca76da";
+            ssh6  = "0067f396b3efb21e12f63e0c50643161";
             dev   = "80e76834acc9243696d9763759b22147";
+            mail  = "d62a0dc01614b9f8f2b469219788fe0f";
+            mail6 = "f1ecb2d9d0522d4eec06437688ca76da";
           };
           passord-file-path = config.sops.secrets."nx2site/cloudflare/global-api-key".path;
         in pkgs.writers.writePython3Bin "dyn_dns" {
       libraries = with pkgs.python3Packages; [ requests ];
-      flakeIgnore = [ "E302" "E305" "E226" "E501" "E261" ];
+      flakeIgnore = [ "E302" "E305" "E226" "E501" "E261" "E241" ];
     } /* python */ ''
 import requests
 import subprocess
@@ -55,7 +57,7 @@ from time import sleep
 def get_public_ip(ipv6: bool = False) -> str:
     return subprocess.run(['${pkgs.curl}/bin/curl', '-s', '-6' if ipv6 else '-4', 'https://ifconfig.me'], capture_output=True, text=True).stdout.strip()
 
-def update_record(record_id: str, record_name: str, ip: str, type: str, proxied: bool, pw: str) -> None:
+def update_record(record_id: str, record_name: str, ip: str, type: str, proxied: bool, pw: str) -> requests.Response:
     sleep(5)
     return requests.patch(
         f'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/{record_id}',
@@ -85,14 +87,16 @@ def main():
 
     # Perform DNS updates
     # https://developers.cloudflare.com/api/operations/dns-records-for-a-zone-update-dns-record
-    print(f"${hyper.domain}: {update_record(record_id="${record_id.base}", record_name="${hyper.domain}", ip=my_ip, type="A", proxied=True, pw=pw).status_code}", end=", ")
-    print(f"*.${hyper.domain}: {update_record(record_id="${record_id.sub}", record_name="*.${hyper.domain}", ip=my_ip, type="A", proxied=True, pw=pw).status_code}", end=", ")
-    print(f"ssh.${hyper.domain}: {update_record(record_id="${record_id.ssh}", record_name="ssh.${hyper.domain}", ip=my_ip, type="A", proxied=False, pw=pw).status_code}", end=", ")
-    print(f"dev.${hyper.domain}: {update_record(record_id="${record_id.dev}", record_name="dev.${hyper.domain}", ip=my_ip, type="A", proxied=False, pw=pw).status_code}", end=", ")
+    print(f"${hyper.domain}:      {update_record(record_id="${record_id.base}",  record_name="${hyper.domain}",      ip=my_ip,  type="A",    proxied=True,  pw=pw).status_code}")
+    print(f"*.${hyper.domain}:    {update_record(record_id="${record_id.sub}",   record_name="*.${hyper.domain}",    ip=my_ip,  type="A",    proxied=True,  pw=pw).status_code}")
+    print(f"ssh.${hyper.domain}:  {update_record(record_id="${record_id.ssh}",   record_name="ssh.${hyper.domain}",  ip=my_ip,  type="A",    proxied=False, pw=pw).status_code}")
+    print(f"dev.${hyper.domain}:  {update_record(record_id="${record_id.dev}",   record_name="dev.${hyper.domain}",  ip=my_ip,  type="A",    proxied=False, pw=pw).status_code}")
+    # print(f"mail.${hyper.domain}: {update_record(record_id="${record_id.mail}",   record_name="mail.${hyper.domain}", ip=my_ip,  type="A",    proxied=False, pw=pw).status_code}")
 
-    print(f"${hyper.domain}: {update_record(record_id="${record_id.base6}", record_name="${hyper.domain}", ip=my_ip6, type="AAAA", proxied=True, pw=pw).status_code}", end=", ")
-    print(f"*.${hyper.domain}: {update_record(record_id="${record_id.sub6}", record_name="*.${hyper.domain}", ip=my_ip6, type="AAAA", proxied=True, pw=pw).status_code}", end=", ")
-    print(f"ssh.${hyper.domain}: {update_record(record_id="${record_id.ssh6}", record_name="ssh.${hyper.domain}", ip=my_ip6, type="AAAA", proxied=False, pw=pw).status_code}", end="")
+    print(f"${hyper.domain}:      {update_record(record_id="${record_id.base6}", record_name="${hyper.domain}",      ip=my_ip6, type="AAAA", proxied=True,  pw=pw).status_code}")
+    print(f"*.${hyper.domain}:    {update_record(record_id="${record_id.sub6}",  record_name="*.${hyper.domain}",    ip=my_ip6, type="AAAA", proxied=True,  pw=pw).status_code}")
+    print(f"ssh.${hyper.domain}:  {update_record(record_id="${record_id.ssh6}",  record_name="ssh.${hyper.domain}",  ip=my_ip6, type="AAAA", proxied=False, pw=pw).status_code}")
+    # print(f"mail.${hyper.domain}: {update_record(record_id="${record_id.mail6}",  record_name="mail.${hyper.domain}", ip=my_ip6, type="AAAA", proxied=False, pw=pw).status_code}")
 
 if __name__ == "__main__":
     main()

system-modules/nx2site/baikal.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }@all: with all; {
+  services.baikal = {
+    enable = true;
+    # pool =
+    user = "baikal";
+    group = "baikal";
+    package = pkgs.php.buildComposerProject2 (finalAttrs: {
+      pname = "baikal";
+      version = "0.10.1";
+      src = pkgs.fetchFromGitHub {
+        owner = "sabre-io";
+        repo = "Baikal";
+        tag = "0.10.1";
+        hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04=";
+      };
+      # It doesn't provide a composer.lock file, we have to generate manually.
+      composerLock = ./composer.lock;
+      vendorHash = "sha256-dYg7cULL4gquR5EenA0lD9ZC9Ge4qNwFFDNhELKgSso=";
+    });
+    virtualHost = "baikal.${hyper.domain}";
+  };
+}

system-modules/nx2site/dyn_dns.nix

@@ -1,5 +1,5 @@
-{ pkgs, ... }@all: with all;
-{
+# THIS IS NOT USED
+{ pkgs, ... }@all: with all; {
   sops.secrets = {
     # "nx2site/namecheap.pw" = { };
     # "nx2site/cloudflare/api-token-dns-edit" = { };
@@ -16,6 +16,8 @@
       "${hyper.domain}"
       "*.${hyper.domain}"
       "ssh.${hyper.domain}"
+      "mail.${hyper.domain}"
+      "dev.${hyper.domain}"
     ];
     proxied = true;
     apiTokenFile = config.sops.secrets."nx2site/cloudflare/global-api-key-env".path;

system-modules/nx2site/gitea.nix

@@ -26,7 +26,7 @@ let git-user = "git"; in
     user = git-user; 
     appName = "NxGit";
     stateDir = "/var/lib/gitea"; # default
-    useWizard = false; # default
+    # useWizard = false; # default
     # camoHmacKeyFile = ;
     database = {
       createDatabase = false; # default
@@ -65,6 +65,8 @@ let git-user = "git"; in
         SSH_PORT = secrets.ssh.port;
         DOMAIN = "git.${hyper.domain}";
         SSH_DOMAIN = "ssh.${hyper.domain}";
+        ENABLE_PUSH_CREATE_USER = true;
+        ENABLE_PUSH_CREATE_ORG = true;
         # HTTP_ADDR = "${config.services.gitea.settings.server.DOMAIN}";
         # HTTP_PORT = 3000; # default
         # PROTOCOL = "http"; # default

system-modules/nx2site/imap.nix

@@ -0,0 +1,68 @@
+{ config, pkgs, ... }@all: with all; {
+  sops.secrets = {
+    "nx2site/dovecot" = {
+      owner = "dovecot2";
+      group = "dovecot2";
+      mode = "600";
+    };
+  };
+  services.dovecot2 = {
+    enable = true;
+    enablePAM = false; # independen from linux users
+    enableImap = true;
+    enableLmtp = true;
+    extraConfig = ''
+      # force to use full user name plus domain name
+      # for disambiguation
+      auth_username_format = %Lu
+
+      # Authentication configuration:
+      auth_mechanisms = plain
+      passdb {
+        driver = passwd-file
+        args = ${config.sops.secrets."nx2site/dovecot".path}
+      }
+
+      # for vitual users:
+      userdb {
+        driver = static
+        # the full e-mail address inside passwd-file is the username (%u)
+        # user@example.com
+        # %d for domain_name %n for user_name
+        args = uid=vmail gid=vmail username_format=%u home=/var/spool/mail/vmail/%d/%n
+      }
+      # for connecting with postfix
+      service lmtp {
+       unix_listener /var/spool/postfix/dovecot-lmtp {
+         mode = 0600
+         user = postfix
+         group = postfix
+        }
+      }
+      service auth {
+        unix_listener /var/spool/postfix/auth {
+          mode = 0600
+          user = postfix
+          group = postfix
+        }
+      }
+    '';
+    createMailUser = true;
+    mailUser = "vmail";
+    mailGroup = "vmail";
+    mailLocation = "maildir:~/Maildir";
+    mailboxes = { # RFC standart
+      All = { auto = "create"; autoexpunge = null; specialUse = "All"; };
+      Archive = { auto = "create"; autoexpunge = null; specialUse = "Archive"; };
+      Drafts = { auto = "create"; autoexpunge = null; specialUse = "Drafts"; };
+      Flagged = { auto = "create"; autoexpunge = null; specialUse = "Flagged"; };
+      Junk = { auto = "create"; autoexpunge = "60d"; specialUse = "Junk"; };
+      Sent = { auto = "create"; autoexpunge = null; specialUse = "Sent"; };
+      Trash = { auto = "create"; autoexpunge = "60d"; specialUse = "Trash"; };
+    };
+
+    sslServerCert = "/var/lib/acme/${hyper.domain}/fullchain.pem";
+    sslServerKey = "/var/lib/acme/${hyper.domain}/key.pem";
+    sslCACert = "/var/lib/acme/${hyper.domain}/chain.pem";
+  };
+}

system-modules/nx2site/maddy.nix

@@ -0,0 +1,234 @@
+{ config, pkgs, ... }@all: with all; let
+  users = [ "nxcaldav" "nextcloud" "lennart" "daniel" "diane" "georg" "tessa" ];
+in {
+  sops.secrets = {
+    "nx2site/maddy/nxcaldav_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/nextcloud_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/lennart_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/daniel_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/diane_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/georg_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+    "nx2site/maddy/tessa_password" = { owner = "maddy"; group = "maddy"; mode = "600"; };
+  };
+  users.users."maddy" = {
+    extraGroups = [ "acme" "nginx" ];
+  };
+  services.maddy = {
+    enable = true;
+    primaryDomain = hyper.domain;
+    user = "maddy";
+    group = "maddy";
+    hostname = "ssh.${hyper.domain}";
+    ensureAccounts = [
+      "nxcaldav@${hyper.domain}"
+      "nextcloud@${hyper.domain}"
+      "lennart@${hyper.domain}"
+      "daniel@${hyper.domain}"
+      "diane@${hyper.domain}"
+      "georg@${hyper.domain}"
+      "tessa@${hyper.domain}"
+    ];
+    ensureCredentials = {
+      "nxcaldav@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/nxcaldav_password".path;
+      "nextcloud@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/nextcloud_password".path;
+      "lennart@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/lennart_password".path;
+      "daniel@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/daniel_password".path;
+      "diane@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/diane_password".path;
+      "georg@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/georg_password".path;
+      "tessa@${hyper.domain}".passwordFile = config.sops.secrets."nx2site/maddy/tessa_password".path;
+    };
+
+    openFirewall = true;
+    tls = {
+      loader = "file";
+      certificates = [{
+        keyPath = "/var/lib/acme/nx2.site/key.pem";
+        certPath = "/var/lib/acme/nx2.site/cert.pem";
+      }];
+    };
+    # Enable TLS listeners. Configuring this via the module is not yet
+    # implemented, see https://github.com/NixOS/nixpkgs/pull/153372
+    config = let
+      admin = "lennart@${hyper.domain}";
+      domains = hyper.domain; # could be more
+      inherit (hyper) domain;
+      # nix adds 3 variables, hostname, and tls info before the file (see /etc/maddy/maddy.conf)
+    in /* ini */''
+      auth.pass_table local_authdb {
+        table sql_table {
+          driver sqlite3
+          dsn credentials.db
+          table_name passwords
+        }
+      }
+
+      storage.imapsql local_mailboxes {
+        driver sqlite3
+        dsn imapsql.db
+      }
+
+      table.chain local_rewrites {
+        # tagging with - or +
+        # alice-something@${domain} or alice+something@${domain} lands in inbox alice@${domain}
+        optional_step regexp "(.+)[\+-](.+)@(.+)" "$1@$3"
+        optional_step static {
+          entry postmaster ${admin}
+          entry admin ${admin}
+        }
+      }
+
+      msgpipeline local_routing {
+        destination ${domains} {
+          modify {
+            replace_rcpt &local_rewrites
+          }
+          reroute {
+            destination_in &local_mailboxes {
+              deliver_to &local_mailboxes
+            }
+            default_destination {
+              modify {
+                replace_rcpt regexp ".*" "${admin}"
+              }
+              deliver_to &local_mailboxes
+            }
+          }
+        }
+        # should never happen
+        default_destination {
+          reject 550 5.1.1 "User doesn't exist"
+        }
+      }
+
+      smtp tcp://0.0.0.0:25 {
+        limits {
+          all rate 20 1s
+          all concurrency 10
+        }
+        dmarc yes
+        check {
+          require_mx_record
+          dkim
+          spf
+        }
+        source ${domains} {
+          reject 501 5.1.8 "Use Submission for outgoing SMTP"
+        }
+        default_source {
+          destination postmaster ${domains} {
+            deliver_to &local_routing
+          }
+          default_destination {
+            reject 550 5.1.1 "User doesn't exist"
+          }
+        }
+      }
+
+      submission tls://0.0.0.0:465 tcp://0.0.0.0:587 {
+        limits {
+          all rate 50 1s
+        }
+        auth &local_authdb
+        source ${domains} {
+          check {
+              authorize_sender {
+                  prepare_email &local_rewrites
+                  user_to_email identity
+              }
+          }
+          destination postmaster ${domains} {
+              deliver_to &local_routing
+          }
+          default_destination {
+              modify {
+                  dkim ${domain} ${domains} default
+              }
+              deliver_to &remote_queue
+          }
+        }
+        default_source {
+          reject 501 5.1.8 "Non-local sender domain"
+        }
+      }
+
+      target.remote outbound_delivery {
+        limits {
+          destination rate 20 1s
+          destination concurrency 10
+        }
+        mx_auth {
+          dane
+          mtasts {
+            cache fs
+            fs_dir mtasts_cache/
+          }
+          local_policy {
+              min_tls_level encrypted
+              min_mx_level none
+          }
+        }
+      }
+
+      target.queue remote_queue {
+        target &outbound_delivery
+        autogenerated_msg_domain ${domain}
+        bounce {
+          destination postmaster ${domains} {
+            deliver_to &local_routing
+          }
+          default_destination {
+              reject 550 5.0.0 "Refusing to send DSNs to non-local addresses"
+          }
+        }
+      }
+
+      imap tls://0.0.0.0:993 tcp://0.0.0.0:143 {
+        auth &local_authdb
+        storage &local_mailboxes
+      }
+
+      # localhost only - test purposes only (->spam!)
+      smtp tcp://127.0.0.1:2525 {
+          tls off
+          destination postmaster ${domains} {
+              deliver_to &local_routing
+          }
+          default_destination {
+              modify {
+                  dkim ${domain} ${domains} default
+              }
+              deliver_to &remote_queue
+          }
+      }
+      # nx2s-email-relay backdor
+      smtp tcp://0.0.0.0:25025 {
+
+          # 1. Allow incoming mail from the VM for your domains
+          destination postmaster ${domains} {
+              deliver_to &local_routing
+          }
+          # 2. Prevent the world from using you as an open relay
+          default_destination {
+              reject 521 5.0.0 "User not local"
+          }
+      }
+
+    '';
+  };
+}
+
+
+# --- Receive
+# 1. mx to mail.nx2.site
+# 2. mail.nx2.site to nx2s-email-relay (google e2-micro)
+# 3. nx2s-email-relay uses emaul-relay.service to socat 25 to 25025 home
+# 4. home gets 25025 and handles it
+
+# -- Send
+# 1. Via Smtp2go (mail-eu.smtp2go.com)
+# SPF is coverd by CNAME (return) (somehow)
+
+
+
+
+

system-modules/nx2site/nextcloud.nix

@@ -1,27 +1,108 @@
-{ pkgs, ...}@all: with all;
-{
-  sops.secrets = { 
-    "nx2site/nextcloud/admin-pass" = { owner = "nextcloud"; };
-    "nx2site/nextcloud/db-pass" = { owner = "nextcloud"; };
-    # "nx2site/nextcloud/users-pass/nx2" = { owner = "nextcloud"; };
+{ config, pkgs, ... }@all: with all; let 
+  user = "nextcloud";
+in {
+  sops.secrets = let ss = { owner = user; group = user; mode = "600"; }; in {
+    "nx2site/nextcloud/admin_pass" = ss;
+    "nx2site/nextcloud/db_pass" = ss;
+    "nx2site/nextcloud/lennart_pass" = ss;
+    "nx2site/nextcloud/daniel_pass" = ss;
+    "nx2site/nextcloud/diane_pass" = ss;
+    "nx2site/nextcloud/georg_pass" = ss;
+    "nx2site/nextcloud/tessa_pass" = ss;
+    "nx2site/smtp2go/nextcloud_api_key" = ss;
   };
+  users.users."${user}" = {
+    isSystemUser = true;
+    isNormalUser = false;
+    group = user;
+  };
+  # users.groups."${user}" = {};
+  users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ];
+  services.nextcloud = {
+    enable = true;
+    hostName = "n.${hyper.domain}";
+    # Need to manually increment with every major upgrade.
+    package = pkgs.nextcloud33;
+    # Let NixOS install and configure the database automatically.
+    # database.createLocally = false;
+    # Let NixOS install and configure Redis caching automatically.
+    configureRedis = true;
+    # Increase the maximum file upload size.
+    maxUploadSize = "16G";
+    https = true;
+    # autoUpdateApps.enable = true;
+    appstoreEnable = false;
+    extraAppsEnable = true;
+    extraApps = with config.services.nextcloud.package.packages.apps; {
+      inherit calendar contacts mail notes tasks;
+    };
+    settings = {
+      overwriteProtocol = "https";
+      default_phone_region = "DE";
       
-  services = {
-    nextcloud = {
-      enable = true;
-      package = pkgs.nextcloud;
-      hostName = "nc.${hyper.domain}";
-      https = true;
-      configureRedis = true;
-      config = {
-        adminpassFile = config.sops.secrets."nx2site/nextcloud/admin-pass".path;
-        adminuser = "nx2";
+      # # local
+      # "mail_smtpmode" = "smtp";
+      # "mail_smtphost" = "127.0.0.1";
+      # "mail_smtpport" = 2525;
+      # "mail_from_address" = "nextcloud";
+      # "mail_domain" = hyper.domain;
+      # "mail_smtpsecure" = ""; # = STARTTLS
 
-        dbtype = "pgsql";
-        # dbhost = config.services.postgresql.settings.port; # using usix socket
-        dbname = "nextcloud";
-        dbpassFile = config.sops.secrets."nx2site/nextcloud/db-pass".path;
-      };
+      "mail_smtpmode" = "smtp";
+      "mail_smtphost" = "mail-eu.smtp2go.com";
+      "mail_smtpport" = 2525;
+      "mail_from_address" = "nextcloud";
+      "mail_domain" = hyper.domain;
+      "mail_smtpsecure" = ""; # = STARTTLS
+      "mail_smtpauth" = true;
+      "mail_smtpauthtype" = "LOGIN";
+      "mail_smtpname" = "nextcloud@${hyper.domain}";
+      "simpleSignUpLink.shown" = false;
+    };
+    secrets."mail_smtppassword" = config.sops.secrets."nx2site/smtp2go/nextcloud_api_key".path;
+    # secrets.settings."mail_smtppassword" = config.sops.secrets."nx2site/maddy/nextcloud_password".path;
+    config = {
+      adminpassFile = config.sops.secrets."nx2site/nextcloud/admin_pass".path;
+      dbtype = "pgsql";
+      adminuser = "nextcloud";
+      # dbhost     = "localhost:5432";
+      dbhost     = "/run/postgresql";
+      dbname     = "nextcloud";
+      dbuser     = "nextcloud";
+      dbpassFile = config.sops.secrets."nx2site/nextcloud/db_pass".path;
+    };
+    phpOptions = {
+      "memory_limit" = pkgs.lib.mkForce "2G";
+      "opcache.interned_strings_buffer" = "16";
     };
   };
+  systemd.services.nextcloud-ensure-users = let
+    users = pkgs.lib.mergeAttrsList (pkgs.lib.map (name: {
+      "${name}" = {
+        email = "${name}@nx2.site";
+        passwordFile = config.sops.secrets."nx2site/nextcloud/${name}_pass".path;
+      };
+    }) [ "lennart" "daniel" "diane" "georg" "tessa" ]);
+  in {
+    enable = true;
+    script = let occ = "${config.services.nextcloud.occ}/bin/nextcloud-occ"; in /* bash */ ''
+      ${pkgs.lib.optionalString (users != {}) ''
+        ${pkgs.lib.concatStringsSep "\n" (pkgs.lib.mapAttrsToList (name: cfg: ''
+          if ${occ} user:info "${name}" | grep "user not found"; then
+            export OC_PASS="$(cat ${pkgs.lib.escapeShellArg cfg.passwordFile})"
+            ${occ} user:add --password-from-env "${name}"
+          fi
+          ${pkgs.lib.optionalString (cfg.email != null) ''
+            ${occ} user:setting "${name}" settings email "${cfg.email}"
+          ''}
+        '') users)}
+      ''}
+    '';
+    wantedBy = [ "multi-user.target" ];
+    after = [ "nextcloud-setup.service" ];
+  };
+  services.phpfpm.pools.nextcloud.settings = pkgs.lib.mkIf config.services.nextcloud.enable {
+    "listen.owner" = config.services.nginx.user;
+    "listen.group" = config.services.nginx.group;
+  };
 }

system-modules/nx2site/nxcaldav.nix

@@ -0,0 +1,121 @@
+{ pkgs, ... }@all: with all; let 
+  x = rec { version = "0.0.11";
+  user = "nxcaldav";
+  nxcsrc = pkgs.fetchFromGitea {
+    domain = "git.${hyper.domain}";
+    owner = "nx2";
+    repo = "NxCalDav";
+    rev = version;
+    hash = "sha256-Hk27BQCBtdRQ1aSHVEQ1EVjPrsC2jOUPDT4yuU9OCXQ=";
+  };
+  nxc = pkgs.buildGoModule {
+    pname = "NxCalDav";
+    inherit version;
+    src = nxcsrc;
+    vendorHash = "sha256-prstYDJuwS5E5uRwUkX0M+QdnIaQ0QewKe8HaoZ0Db4=";
+  };
+  nxc_helpers = pkgs.python3Packages.buildPythonApplication {
+    inherit version;
+    format = "other";
+    pname = "nxc_helpers";
+    src = nxcsrc;
+    propagatedBuildInputs = with pkgs.python313Packages; [ pyyaml psycopg2 ];
+    installPhase = ''
+      sed -i "15s|.*|    parser.add_argument('--config', default='${cfg}', help='Path to config.yaml')|" ./export_events.py
+      sed -i "17s|.*|    parser.add_argument('--config', default='${cfg}', help='Path to config.yaml')|" ./import_events.py
+      install -Dm755 "./export_events.py" "$out/bin/nxc_export"
+      install -Dm755 "./import_events.py" "$out/bin/nxc_import"
+    '';
+  };
+  cfg = (pkgs.formats.yaml { }).generate "nxcaldav-config.yaml" {
+    server = {
+      bind_address = "0.0.0.0:14243";
+      public_url = "http://nxc.${hyper.domain}/";
+      redaction_text = "[-]";
+      default_class = "CONFIDENTIAL";
+    };
+    database.url = "postgres://nxcaldav@localhost:5432/nxcaldav?sslmode=disable";
+    users = let dfu = name: {
+      name = name;
+      password_cmd = ''cat ${config.sops.secrets."nx2site/nxcaldav/${name}_password".path}'';
+      groups = [ "family" ];
+    }; in  [
+      (dfu "lennart")
+      (dfu "daniel")
+      (dfu "diane")
+      (dfu "georg")
+      (dfu "tessa")
+      (dfu "shared")
+    ];
+    calendars = [
+      { owner = "lennart"; color = "#dddddd"; id = "preservation";  }
+      { owner = "lennart"; color = "#dd2222"; id = "effort";        }
+      { owner = "lennart"; color = "#2222dd"; id = "experience";    }
+      { owner = "lennart"; color = "#22aa22"; id = "leisure";       }
+      { id = "family";
+        owner = "shared";
+        color = "#dddd22";
+        access = [
+          { group = "family"; mode = "read-write"; }
+        ];
+      }
+    ];
+    address_books = [
+      { owner = "lennart"; id = "Others";   }
+      { owner = "lennart"; id = "TUDa";     }
+      { owner = "lennart"; id = "HSMW";     }
+      { owner = "lennart"; id = "CWG";      }
+      { owner = "lennart"; id = "Handball"; }
+      { id = "Family & Freinds";
+        owner = "shared";
+        access = [
+          { group = "family"; mode = "read-write"; }
+        ];
+      }
+    ];
+    aggregates = [
+      { id = "lennart-aggregate";
+        owner = "shared";
+        sources = [ "preservation" "effort" "experience" "leisure" ];
+        access = [
+          { group = "family" ; mode = "read-only"; }
+          { ics = "future-only"; }
+        ];
+      }
+    ];
+  };
+}; in with x; {
+  sops.secrets = let ss = { owner = user; group = user; mode = "600"; }; in {
+    "nx2site/nxcaldav/lennart_password" = ss;
+    "nx2site/nxcaldav/daniel_password" = ss;
+    "nx2site/nxcaldav/diane_password" = ss;
+    "nx2site/nxcaldav/georg_password" = ss;
+    "nx2site/nxcaldav/tessa_password" = ss;
+    "nx2site/nxcaldav/shared_password" = ss;
+  };
+  users = {
+    groups."${user}" = {};
+    users = {
+      "${hyper.user}".extraGroups = [ user ];
+      "${user}" = {
+        isSystemUser = true;
+        isNormalUser = false;
+        group = user;
+      };
+    };
+  }; 
+  environment.systemPackages = [ nxc_helpers ];
+  systemd.services."nxcaldav" = {
+    enable = true;
+    path = [ pkgs.bash pkgs.coreutils ];
+    serviceConfig = {
+      User = user;
+      Group = user;
+      ExecStart = ''${nxc}/bin/nxcaldav -c ${cfg}'';
+      Restart = "on-failure";
+      RestartSec = 5;
+      StartLimitBurst = 5;
+      StartLimitIntervalSec = 60;
+    };
+  };
+}

system-modules/nx2site/open-web-calendar.nix

@@ -1,9 +1,8 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   services = {
     open-web-calendar = {
       enable = true;
-      domain = "cal.${hyper.domain}";
+      domain = "owc.${hyper.domain}";
       package = pkgs.open-web-calendar;
       settings = {
         # PORT = 21342;        
@@ -11,4 +10,5 @@
       calendarSettings = { };
     };
   };
+  # proxy endpoint is done is done automatically 
 }

system-modules/nx2site/proxy.nix

@@ -1,5 +1,4 @@
-{ pkgs, ...}@all: with all;
-{
+{ pkgs, ...}@all: with all; {
   sops.secrets = {
     "nx2site/sslCertificate.pem" = { owner = config.services.nginx.user; };
     "nx2site/sslCertificateKey.pem" = { owner = config.services.nginx.user; };
@@ -14,19 +13,26 @@
     };
     certs = {
       "${hyper.domain}" = {
-        extraDomainNames = builtins.map (subd: "${subd}.${hyper.domain}") [ "sync" ];
+        extraDomainNames = builtins.map (subd: "${subd}.${hyper.domain}") [
+          "sync"
+          "ssh"
+          # "mail"
+        ];
       };
     };
   };
-  users.users."nginx" = {
-    extraGroups = [ "nginx" "acme" "copyparty" ];
-    useDefaultShell = false;
-    linger = true;
-    home = "/var/nginx/";
-    homeMode = "770";
-    createHome = true;
-    isSystemUser = true;
-    isNormalUser = false;
+  users.users = {
+    "nginx" = {
+      extraGroups = [ "nginx" "acme" "copyparty" ];
+      useDefaultShell = false;
+      linger = true;
+      home = "/var/nginx/";
+      homeMode = "770";
+      createHome = true;
+      isSystemUser = true;
+      isNormalUser = false;
+    };
+    "acme".extraGroups = [ "nginx" "acme" "hugo" ];
   };
   systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
 	services.nginx = let 
@@ -50,7 +56,7 @@
     defaultSSLListenPort = 443;
     enableQuicBPF = true;
     enableReload = true;
-    package = pkgs.nginxQuic;
+    package = pkgs.nginx;
     proxyResolveWhileRunning = false;
     proxyTimeout = "20s";
     recommendedBrotliSettings = true;
@@ -58,7 +64,7 @@
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
-    recommendedZstdSettings = true;
+    # recommendedZstdSettings = true;
     serverTokens = false;
     sslDhparam = config.sops.secrets."nx2site/dhparams.pem".path;
     sslProtocols = "TLSv1.2 TLSv1.3";
@@ -101,8 +107,23 @@
           "~ ^(/gpg)$".return                       = "301 /cards/gpg";
           "~ ^(/contact)$".return                   = "301 /cards/contact";
           "~ ^(/ba)$".return                        = "301 /BA.pdf";
+          "~ ^(/schedule)$".return                  = "301 https://owc.${hyper.domain}/calendar.html?specification_url=https://${hyper.domain}/owc-schedule.json?";
         }; 
       }; 
+      "mail.${hyper.domain}" = {
+        listen = [
+          { addr = "0.0.0.0"; port = 80; }
+          { addr = "[::0]"; port = 80; }
+        ];
+        locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenge";
+      };
+      "ssh.${hyper.domain}" = {
+        listen = [
+          { addr = "0.0.0.0"; port = 80; }
+          { addr = "[::0]"; port = 80; }
+        ];
+        locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenge";
+      };
       "matrix.${hyper.domain}" = {
         listen = dl;
         locations."~.*".return = "502";
@@ -156,6 +177,18 @@
         listen = dl;
         locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; }; 
       });
+      "nxc.${hyper.domain}" = (vh // {
+        listen = dl;
+        locations = { "/" = { proxyPass = "http://127.0.0.1:14243"; }; }; 
+      });
+
+      "n.${hyper.domain}" = {
+        listen = dl;
+        forceSSL = true;
+        enableACME = true;
+        # rest is done by the nextcloud module
+      };
+
       # "nc.${hyper.domain}" = vh // {
       #   # directly to nc 
       # };
@@ -179,13 +212,15 @@
       };
       "dev.${hyper.domain}" = vh // {
         listen = dl;
-        locations."/" = { 
-          proxyPass = "http://127.0.0.1:8080";
-          proxyWebsockets = true;
+        locations = {
+          "/" = { 
+            proxyPass = "http://127.0.0.1:8080";
+            proxyWebsockets = true;
+          }; 
         };
       };
       # is done atomatically
-      # "cal.${hyper.domain}" = vh // {
+      # "owc.${hyper.domain}" = vh // { 
       #   listen = dl;
       #   locations = { "/" = { 
       #     proxyPass = "http://unix:///run/open-web-calendar/socket";
@@ -223,7 +258,7 @@
           };
         };
       };
-      "~^(.*).${hyper.domain}$" = {
+      "~^(?!n\.)(.*)\.${hyper.domain}$" = {
         listen = dl;
         root = "/var/nginx/webroot";
         locations."~.*".return = "502";

system-modules/nx2site/rallly.nix

@@ -1,20 +0,0 @@
-{ pkgs, ... }@all: with all;
-{
-  environment.systemPackages = [
-    (pkgs.mkYarnPackage {
-      name = "rallly";
-      src = pkgs.fetchFromGitHub {
-        owner = "lukevella";
-        repo = "rallly";
-        rev = "v3.11.2";
-        hash = "sha256-ej6Y0ouiheoH6dSBWsSIW6qt9UvsLh9ODDQA5Fqt3zs=";
-      };
-      packageJson = ./package.json;
-      yarnLock = ./yarn.lock;
-      yarnNix = ./yarn.nix;
-      # patchPhase = /* shell */ ''
-      #   cp ........ ?
-      # '';
-    })
-  ];
-}

system-modules/nx2site/smtp.nix

@@ -0,0 +1,60 @@
+{ pkgs, ... }@all: with all; {
+  # Postfix: The SMTP server (MTA)
+  # Handles sending, receiving, and local delivery routing.
+  services.postfix = {
+    enable = true;
+    enableSubmission = true;
+    enableSubmissions = true;
+    
+    # main.cf configuration
+    settings.main = {
+      hostname = "mail.${hyper.domain}";
+      domain = hyper.domain;
+
+      # Allow local services (like CalDAV) to send mail without authentication
+      networks = [ "127.0.0.0/8" "[::1]/128" ];
+      # TLS settings - using ACME certs from proxy.nix
+      smtpd_tls_security_level = "may";
+      smtpd_tls_auth_only = "yes";
+      smtpd_tls_cert_file = "/var/lib/acme/${hyper.domain}/fullchain.pem";
+      smtpd_tls_key_file = "/var/lib/acme/${hyper.domain}/key.pem";
+      
+      # Use Dovecot for authentication (SASL)
+      smtpd_sasl_type = "dovecot";
+      smtpd_sasl_path = "/var/spool/postfix/auth";
+      smtpd_sasl_auth_enable = "yes";
+      smtpd_sasl_security_options = "noanonymous";
+      
+      # Use Dovecot for delivery (LMTP)
+      virtual_transport = "lmtp:unix:/var/spool/postfix/dovecot-lmtp";
+      virtual_mailbox_domains = [ hyper.domain ];
+      mailbox_transport = "lmtp:unix:/var/spool/postfix/dovecot-lmtp";
+      
+      
+      # Basic relay restrictions
+      smtpd_recipient_restrictions = [
+        "permit_mynetworks"
+        "permit_sasl_authenticated"
+        "reject_unauth_destination"
+      ];
+
+      # master.cf configuration: Enable submission (port 587) for mail clients
+      # submission-options = {
+      #   type = "inet";
+      #   private = false;
+      #   command = "smtpd";
+      #   args = [
+      #     "-o smtpd_tls_security_level=encrypt"
+      #     "-o smtpd_sasl_auth_enable=yes"
+      #     "-o smtpd_recipient_restrictions=permit_sasl_authenticated,reject"
+      #     "-o milter_macro_daemon_name=ORIGINATING"
+      #   ];
+      # };
+    };
+  };
+  # create socket ala wiki
+  users.users."postfix" = {
+    createHome = true;
+    home = "/var/spool/postfix";
+  };
+}

system-modules/nx2site/vmail.nix

@@ -0,0 +1,17 @@
+{ ... }:{
+  users = {
+    groups."vmail" = {};
+    users = {
+      "vmail" = {
+        isSystemUser = true;
+        group = "vmail";
+        home = "/var/spool/mail/vmail";
+        createHome = true;
+      };
+      # Permissions to allow Postfix and Dovecot to read ACME certificates
+      "postfix".extraGroups = [ "acme" ];
+      "dovecot2".extraGroups = [ "acme" ];
+    };
+  };
+} 
+

system-modules/postgres.nix

@@ -27,6 +27,7 @@
 				"gitea"
 				"vaultwarden"
 				"paperless"
+				"nxcaldav"
 				"nextcloud"
 			];
 			settings = {
@@ -47,13 +48,17 @@
 					ensureDBOwnership = true;
 				}
 				{
-					name = "nextcloud";
+					name = "paperless";
 					ensureDBOwnership = true;
 				}
 				{
-					name = "paperless";
+					name = "nxcaldav";
 					ensureDBOwnership = true;
 				}
+				{
+				  name = "nextcloud";
+				  ensureDBOwnership = true;
+				}
 			];
 		};
 		postgresqlBackup = {

system-modules/qmk.nix

@@ -2,12 +2,9 @@
 {
   hardware.keyboard.qmk.enable = true;
 
-  # home.packages = with pkgs; [
-  #   via
-  # ];
   environment.systemPackages = with pkgs; [
-    via
+    # via
     qmk
   ];
-  services.udev.packages = [ pkgs.via ];
+  # services.udev.packages = [ pkgs.via ];
 }

system-modules/simple-postgres.nix

@@ -0,0 +1,31 @@
+{ pkgs, ... }@all: with all; {
+	services.postgresql = lib.mkIf (!hyper.isServer) {
+		enable = false;
+		ensureUsers = [{
+			name = "nxcaldav"; 
+			ensureDBOwnership = true;
+		}];
+		package = pkgs.postgresql_16; # https://stackoverflow.com/questions/51688193/how-to-upgrade-postgresql-in-nixos
+
+		dataDir = "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"; # default
+		enableJIT = false; # default
+		initdbArgs = []; # default
+		checkConfig = true; # default
+		enableTCPIP = false;
+		# # extraPlugins =
+		initialScript = null; # default
+    authentication = lib.mkForce ''
+	    # TYPE  DATABASE        USER            ADDRESS                 METHOD
+	    local   all             all                                     trust
+	    host    all             all             127.0.0.1/32            trust #scram-sha-256
+	    host    all             all             ::1/128                 trust #scram-sha-256
+    '';
+		settings = {
+			port = 5432; # default
+			listen_addresses = lib.mkForce "127.0.0.1";
+			log_line_prefix = "[%p] "; # default
+			shared_preload_libraries = [ ]; # default
+		};
+		ensureDatabases = [ "nxcaldav" ];
+	};
+}

system-modules/stay-up.nix

@@ -0,0 +1,36 @@
+{ config, pkgs, ... }@all: with all; let
+  target = "1.1.1.1";
+  timeoutMinutes = 5;
+  logFile = "/var/log/stay-up.log";
+in {
+  systemd.services.wifi-watchdog = {
+    description = "Wi-Fi Watchdog Service";
+    after = [ "network.target" "NetworkManager.service" ];
+    wantedBy = [ "multi-user.target" ];
+    path = with pkgs; [ iputils networkmanager coreutils ];
+    script = /* bash */ ''
+      FAIL_COUNT=0
+      touch "${logFile}"
+      while true; do
+        if ping -c 1 -W 5 "${target}" > /dev/null 2>&1; then
+          FAIL_COUNT=0
+        else
+          FAIL_COUNT=$((FAIL_COUNT + 1))
+          if [ "$FAIL_COUNT" -ge "${toString timeoutMinutes}" ]; then
+            echo "$(date -Iseconds): Network unreachable for ${toString timeoutMinutes} minutes. Restarting Wi-Fi." >> "${logFile}"
+            nmcli radio wifi off
+            sleep 5
+            nmcli radio wifi on
+            FAIL_COUNT=0
+          fi
+        fi
+        sleep 60
+      done
+    '';
+    serviceConfig = {
+      Restart = "always";
+      RestartSec = "10";
+      User = "root"; # Root is required to execute nmcli radio commands and write to /var/log/
+    };
+  };
+}

system-modules/tuda.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   environment.etc = {
     "ssl/certs/tuda-eduroam-root.crt".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2:1.crt";
   };
@@ -10,4 +9,22 @@
       path = "/etc/NetworkManager/system-connections/eduroam.nmconnection";
     };
   };
+  environment.systemPackages = with pkgs; [
+    openconnect
+    networkmanager-openconnect
+    (pkgs.writeShellScriptBin "connect_to_tuda" ''
+      sudo $(grep ExecStart /etc/systemd/system/openconnect-tuda.service | cut -c 11-)
+    '')
+  ];
+  networking.openconnect = {
+    package = pkgs.openconnect;
+    interfaces = {
+      tuda = {
+        autoStart = false;
+        gateway = "vpn.hrz.tu-darmstadt.de";
+        protocol = "anyconnect";
+        user = secrets.email.tuda.tuid;
+      };
+    };
+  };
 }

system-modules/users.nix

@@ -31,6 +31,7 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOWa0xeARLSGbliVCqloGRvF7KlM6TcJSFhd+BxcvRt nxs23u-nx2@ssh.nx2.site"
       ];
     };
   };

wsl.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all; {
   imports = [
     inputs.nixos-wsl.nixosModules.default
-    ./system-modules/base-packages.nix
     ./system-modules/docker.nix
     ./system-modules/gc.nix
     ./system-modules/gpg.nix
@@ -9,7 +8,8 @@
     ./system-modules/nixd.nix
     ./system-modules/users.nix
   ];
-  system.stateVersion = pkgs.version;
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+  system.stateVersion = hyper.main-pkgs-version;
   wsl = {
     defaultUser = hyper.user;
     enable = true;
@@ -27,4 +27,5 @@
     };
   };
   nixpkgs.hostPlatform = hyper.system;
+  services.upower.enable = true;
 }