Merge pull request 'udpdate flake. update some pkgs' (#52) from develop into release-25.11

Reviewed-on: #52

.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

.forgejo/workflows/build-tests.yml

@@ -1,3 +1,4 @@
+---
 name: Build tests
 
 on:

.forgejo/workflows/deploy-docs.yml

@@ -1,3 +1,4 @@
+---
 name: Deploy docs
 
 on:

.forgejo/workflows/flake-check.yml

@@ -1,6 +1,8 @@
+---
 name: Flake check
 
-on: [pull_request]
+on:
+  pull_request:
 
 jobs:
   flake-check:
@@ -11,5 +13,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Check formatting
+        run: nix fmt -- --check
+
       - name: Run flake check
-        run: nix flake check --impure
+        run: nix flake check --impure --all-systems

apps/create/create.sh

@@ -11,9 +11,6 @@ HOSTNAME=""
 # Templates with Home Manager configurations
 HM_CONFIGS=("hyprland")
 
-# This will get overwritten by the derivation
-TEMPLATES_DIR=""
-
 # Print usage information
 usage() {
     cat <<EOF

apps/rebuild/rebuild.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # NixOS and standalone Home Manager rebuild script
 
 # Defaults

apps/update-packages/update-packages.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 SYSTEM="x86_64-linux"
 IGNORE_PACKAGES=(
   "pyman"

docs/getting-started/install-instructions.md

@@ -114,7 +114,8 @@ git clone YOUR_GIT_REPO_URL ~/.config/nixos
 Home Manager is not installed by default. Enter the development shell to apply the configuration:
 
 ```bash
-nix-shell ~/.config/nixos/shell.nix --run 'rebuild home'
+nix --experimental-features "nix-command flakes" develop git+https://git.sid.ovh/sid/synix#devShells.x86_64-linux.install-hm \
+--command "rebuild home"
 ```
 
 ### 8. Reboot your System

flake.lock

@@ -258,11 +258,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776796298,
+        "lastModified": 1778507602,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777851538,
+        "lastModified": 1779506708,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
@@ -465,11 +465,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1777673416,
+        "lastModified": 1779467186,
-        "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
+        "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
+        "rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
         "type": "github"
       },
       "original": {
@@ -511,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777906128,
+        "lastModified": 1779900588,
-        "narHash": "sha256-ei9g+4pCXhacUwnYuljs9v75hwfTqnfU+J6s6s8hfvc=",
+        "narHash": "sha256-b/yda4uMmjpw4uhXI4d0JNv09WtGoXis2JjD5l1Qbts=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c278c296b010e2a32838c8d4539a2d72c1686d4d",
+        "rev": "dd8bdde89853bfb3eae0eb28e3d3a9320b3b8a3c",
         "type": "github"
       },
       "original": {
@@ -605,11 +605,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1777581180,
+        "lastModified": 1778680496,
-        "narHash": "sha256-JcDBTZkkz68WlZKYDoD+MZG8b3dnIJXqMvyuVx3Wkdg=",
+        "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "a2538cd28ae2140ffce9cee9108b8d569a9c4fed",
+        "rev": "fc5bec2e44678eeaa221d566d447a0257a884737",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,7 +3,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
     nix.url = "github:DeterminateSystems/nix-src/flake-schemas";
-
     flake-schemas.url = "github:DeterminateSystems/flake-schemas";
 
     git-hooks.url = "github:cachix/git-hooks.nix";
@@ -29,50 +28,69 @@
       ...
     }@inputs:
     let
-      supportedSystems = [
+      inherit (self) outputs;
+
+      systems = [
         "x86_64-linux"
         "aarch64-linux" # For testing only. Use at your own risk.
       ];
 
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      lib = nixpkgs.lib.extend (_final: _prev: { inherit (self.lib) utils; });
 
-      nixpkgsFor = forAllSystems (
+      mkPkgs =
-        system:
+        {
+          system,
+          config ? { },
+        }:
         import nixpkgs {
           inherit system;
+          inherit config;
           overlays = [
-            self.overlays.default
+            self.overlays.modifications
+            self.overlays.additions
             inputs.nix.overlays.default
+            (final: prev: { synix = self.overlays.additions final prev; })
           ];
-        }
-      );
-
-      test = {
-        system = "x86_64-linux";
-        lib = nixpkgs.lib.extend (final: prev: self.outputs.lib or { });
-        inputs = inputs // {
-          synix = self;
         };
-        outputs = { };
+
-        overlays = [
+      forAllSystems =
-          self.overlays.default
+        function:
-          self.overlays.additions
+        lib.genAttrs systems (
-          self.overlays.modifications
+          system:
-          (final: prev: { synix = self.packages."${final.system}"; })
+          function (mkPkgs {
-        ];
+            inherit system;
-      };
+          })
+        );
+
+      mkNixosConfiguration =
+        system: modules:
+        nixpkgs.lib.nixosSystem {
+          inherit system modules;
+          specialArgs = {
+            inherit inputs outputs lib;
+          };
+        };
+
+      mkHomeConfiguration =
+        system: modules:
+        inputs.home-manager.lib.homeManagerConfiguration {
+          pkgs = mkPkgs { inherit system; };
+          inherit modules;
+          extraSpecialArgs = {
+            inherit inputs outputs;
+          };
+        };
     in
     {
       inherit (inputs.flake-schemas) schemas;
 
       apps = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
+          mkApp = name: description: {
-          mkApp = name: desc: {
             type = "app";
             program = pkgs.lib.getExe (pkgs.callPackage ./apps/${name} { });
-            meta.description = desc;
+            meta.description = description;
           };
         in
         {
@@ -86,13 +104,17 @@
       );
 
       lib = {
-        utils = import ./lib/utils.nix { lib = nixpkgs.lib; };
+        utils = import ./lib/utils.nix { inherit (nixpkgs) lib; };
+        helpers = {
+          inherit mkPkgs;
+        };
       };
 
       packages = forAllSystems (
-        system:
+        pkgs:
         let
-          allArchs = import ./pkgs { pkgs = nixpkgs.legacyPackages.${system}; };
+          inherit (pkgs.stdenv.hostPlatform) system;
+          allArchs = import ./pkgs { inherit pkgs; };
           x64only =
             if system == "x86_64-linux" then
               {
@@ -111,109 +133,89 @@
 
       # test configs
       nixosConfigurations = {
-        nixos-hyprland = nixpkgs.lib.nixosSystem {
+        nixos-hyprland = mkNixosConfiguration "x86_64-linux" [ ./tests/build/nixos-hyprland ];
-          inherit (test) system;
+        nixos-server = mkNixosConfiguration "x86_64-linux" [ ./tests/build/nixos-server ];
-          modules = [
-            ./tests/build/nixos-hyprland
-            { nixpkgs.overlays = test.overlays; }
-          ];
-          specialArgs = {
-            inherit (test) inputs outputs lib;
-          };
-        };
-        nixos-server = nixpkgs.lib.nixosSystem {
-          inherit (test) system;
-          modules = [
-            ./tests/build/nixos-server
-            { nixpkgs.overlays = test.overlays; }
-          ];
-          specialArgs = {
-            inherit (test) inputs outputs lib;
-          };
-        };
       };
       homeConfigurations = {
-        hm-hyprland = inputs.home-manager.lib.homeManagerConfiguration {
+        hm-hyprland = mkHomeConfiguration "x86_64-linux" [ ./tests/build/hm-hyprland ];
-          pkgs = import nixpkgs {
-            inherit (test) overlays system;
-          };
-          extraSpecialArgs = {
-            inherit (test) inputs outputs;
-          };
-          modules = [
-            ./tests/build/hm-hyprland
-          ];
-        };
       };
 
       devShells = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgsFor.${system};
+          inherit (pkgs.stdenv.hostPlatform) system;
+          inherit (self.checks.${system}.pre-commit-check) shellHook enabledPackages;
         in
         {
-          default =
+          default = pkgs.mkShell {
-            let
+            inherit shellHook;
-              inherit (self.checks.${system}.pre-commit-check) shellHook enabledPackages;
+            nativeBuildInputs = [
-            in
+              enabledPackages
-            pkgs.mkShell {
+              pkgs.nix
-              inherit shellHook;
+            ]
-              nativeBuildInputs = [
+            ++ (with pkgs; [
-                enabledPackages
+              (python313.withPackages (
-                pkgs.nix
+                p: with p; [
-              ]
+                  mkdocs
-              ++ (with pkgs; [
+                  mkdocs-material
-                (python313.withPackages (
+                  mkdocs-material-extensions
-                  p: with p; [
+                  pygments
-                    mkdocs
+                ]
-                    mkdocs-material
+              ))
-                    mkdocs-material-extensions
+            ]);
-                    pygments
+          };
-                  ]
+          nix-config = pkgs.mkShell {
-                ))
+            inherit shellHook;
-              ]);
+            nativeBuildInputs = [ enabledPackages ];
-            };
+          };
+          install-hm = pkgs.mkShell {
+            NIX_CONFIG = "extra-experimental-features = nix-command flakes";
+            nativeBuildInputs = [ pkgs.home-manager ];
+          };
         }
       );
 
       formatter = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
+          inherit (pkgs.stdenv.hostPlatform) system;
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check.config) package configFile;
-          inherit (config) package configFile;
-          script = ''
-            ${pkgs.lib.getExe package} run --all-files --config ${configFile}
-          '';
         in
-        pkgs.writeShellScriptBin "pre-commit-run" script
+        pkgs.writeShellScriptBin "pre-commit-run" "${pkgs.lib.getExe package} run --all-files --config ${configFile}"
       );
 
       checks = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
+          inherit (pkgs.stdenv.hostPlatform) system;
-          flakePkgs = self.packages.${system};
-          overlaidPkgs = import nixpkgs {
-            inherit system;
-            overlays = [ self.overlays.modifications ];
-          };
         in
         {
           pre-commit-check = inputs.git-hooks.lib.${system}.run {
             src = ./.;
             hooks = {
-              nixfmt.enable = true;
+              actionlint.enable = true;
+              nixfmt = {
+                enable = true;
+                settings.width = 120;
+              };
+              shellcheck.enable = true;
+              statix.enable = true;
+              yamllint = {
+                enable = true;
+                excludes = [ "secrets.yaml" ];
+                settings.configData = "{rules: {line-length: {max: 120}}}";
+              };
             };
           };
-          build-packages = pkgs.linkFarm "flake-packages-${system}" flakePkgs;
+
-          build-overlays = pkgs.linkFarm "flake-overlays-${system}" {
+          build-additions = pkgs.linkFarm "added-packages-${system}" self.packages.${system};
-            kicad = overlaidPkgs.kicad;
+          build-modifications = pkgs.linkFarm "modified-packages-${system}" (
-          };
+            lib.filterAttrs (_: v: lib.isDerivation v) (self.overlays.modifications pkgs pkgs)
+          );
 
           synapse-test =
             let
-              testPkgs = import nixpkgs {
+              testPkgs = mkPkgs {
                 inherit system;
                 config.permittedInsecurePackages = [ "olm-3.2.16" ];
               };

mkdocs.yml

@@ -1,3 +1,4 @@
+---
 site_name: synix docs
 repo_url: https://git.sid.ovh/sid/synix
 site_url: https://doc.sid.ovh/synix
@@ -20,7 +21,7 @@ markdown_extensions:
   - pymdownx.superfences
 
 nav:
-  - Home: index.md # do not change
+  - Home: index.md  # do not change
   - Introduction to Nix:
       - Overview: introduction-to-nix/overview.md
       - Install Nix: introduction-to-nix/install-nix.md

modules/home/common/cdf.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # change directory with fzf
 # Usage: cdf [optional_relative_path]
 #   - If no argument, searches from $HOME.
@@ -67,7 +68,8 @@ function cdf() {
     "--preview=tree -C {} | head -50"
     "--preview-window=right:50%:wrap"
   )
-  local selected=$(find "${find_args[@]}" 2>/dev/null | fzf "${fzf_args[@]}")
+  local selected
+  selected=$(find "${find_args[@]}" 2>/dev/null | fzf "${fzf_args[@]}")
   
   if [[ -n "$selected" ]]; then
     cd "$selected" || echo "Failed to cd into '$selected'"

modules/home/hyprland/applications/bitwarden/default.nix

@@ -16,31 +16,33 @@ in
   imports = [ ../../../rofi-rbw ];
 
   config = mkIf (cfg.enable && app == "rofi-rbw") {
-    programs.rbw = {
+    programs = {
-      enable = true;
+      rbw = {
-      settings = {
+        enable = true;
-        # email = "you@example.tld"; # You have to set this in your config
+        settings = {
-        pinentry = mkDefault pkgs.pinentry-gnome3;
+          # email = "you@example.tld"; # You have to set this in your config
-        lock_timeout = mkDefault 3600;
+          pinentry = mkDefault pkgs.pinentry-gnome3;
+          lock_timeout = mkDefault 3600;
+        };
       };
-    };
 
-    programs.rofi-rbw = {
+      rofi-rbw = {
-      enable = true;
+        enable = true;
-      package = mkDefault pkgs.rofi-rbw-wayland;
+        package = mkDefault pkgs.rofi-rbw-wayland;
-      settings = {
+        settings = {
-        selector = mkDefault "bemenu";
+          selector = mkDefault "bemenu";
-        selector-args = mkDefault "-i -l 20";
+          selector-args = mkDefault "-i -l 20";
-        action = mkDefault "copy";
+          action = mkDefault "copy";
-        typing-key-delay = mkDefault 0;
+          typing-key-delay = mkDefault 0;
+        };
       };
-    };
 
-    programs.librewolf = mkIf config.programs.librewolf.enable {
+      librewolf = mkIf config.programs.librewolf.enable {
-      profiles.default.extensions.packages =
+        profiles.default.extensions.packages =
-        with inputs.nur.legacyPackages."${pkgs.stdenv.hostPlatform.system}".repos.rycee.firefox-addons; [
+          with inputs.nur.legacyPackages."${pkgs.stdenv.hostPlatform.system}".repos.rycee.firefox-addons; [
-          bitwarden
+            bitwarden
-        ];
+          ];
+      };
     };
   };
 }

modules/home/hyprland/applications/default.nix

@@ -22,7 +22,7 @@ let
     {
       default = mkOption {
         type = types.str;
-        default = default;
+        inherit default;
         description = "The default application to use for the ${default}.";
       };
       bind = mkOption {
@@ -38,12 +38,8 @@ let
     };
 
   # generate lists of all binds and window rules and remove empty strings
-  binds = filter (s: s != "") (
+  binds = filter (s: s != "") (builtins.concatLists (map (app: app.bind or [ "" ]) (attrValues apps)));
-    builtins.concatLists (map (app: app.bind or [ "" ]) (attrValues apps))
+  windowrules = filter (s: s != "") (builtins.concatLists (map (app: app.windowrule or [ "" ]) (attrValues apps)));
-  );
-  windowrules = filter (s: s != "") (
-    builtins.concatLists (map (app: app.windowrule or [ "" ]) (attrValues apps))
-  );
 
   inherit (lib)
     attrValues

modules/home/hyprland/applications/dunst-toggle/dunst-toggle.nix

@@ -5,7 +5,7 @@ let
   pkill = "${pkgs.procps}/bin/pkill";
   signal = "${toString config.programs.waybar.settings.mainBar."custom/notifications".signal}";
 in
-(pkgs.writeShellScriptBin "dunst-toggle" ''
+pkgs.writeShellScriptBin "dunst-toggle" ''
   ${dunst} set-paused toggle
   ${pkill} -RTMIN+${signal} waybar
-'')
+''

modules/home/hyprland/applications/newsboat/default.nix

@@ -9,7 +9,7 @@ let
   cfg = config.wayland.windowManager.hyprland;
   app = cfg.applications.rssreader.default;
   reloadTime = "${toString config.programs.newsboat.reloadTime}";
-  newsboat-reload = (import ./newsboat-reload.nix { inherit config pkgs; });
+  newsboat-reload = import ./newsboat-reload.nix { inherit config pkgs; };
 
   inherit (lib) mkIf;
 in
@@ -27,9 +27,11 @@ in
       timers.newsboat-reload = {
         Unit.Description = "Reload newsboat every ${reloadTime} minutes";
 
-        Timer.OnBootSec = "10sec";
+        Timer = {
-        Timer.OnUnitActiveSec = "${reloadTime}min";
+          OnBootSec = "10sec";
-        Timer.Unit = "newsboat-reload.service";
+          OnUnitActiveSec = "${reloadTime}min";
+          Unit = "newsboat-reload.service";
+        };
 
         Install.WantedBy = [ "timers.target" ];
       };

modules/home/hyprland/applications/newsboat/newsboat-reload.nix

@@ -5,6 +5,6 @@ let
   notify = "${pkgs.libnotify}/bin/notify-send";
   signal = "${toString config.programs.waybar.settings.mainBar."custom/newsboat".signal}";
 in
-(pkgs.writeShellScriptBin "newsboat-reload" ''
+pkgs.writeShellScriptBin "newsboat-reload" ''
   ${notify} -u low 'Newsboat' 'Reloading RSS feeds...' && ${newsboat} -x reload && ${notify} -u low 'Newsboat' 'RSS feeds reloaded.' && pkill -RTMIN+${signal} waybar
-'')
+''

modules/home/hyprland/applications/presentation-mode-bemenu/default.nix

@@ -14,9 +14,7 @@ in
 {
   config = mkIf (cfg.enable && app == "presentation-mode-bemenu") {
     home.packages = [
-      (pkgs.writeShellScriptBin "presentation-mode-bemenu" (
+      (pkgs.writeShellScriptBin "presentation-mode-bemenu" (builtins.readFile ./presentation-mode-bemenu.sh))
-        builtins.readFile ./presentation-mode-bemenu.sh
-      ))
     ];
   };
 }

modules/home/hyprland/applications/presentation-mode-bemenu/presentation-mode-bemenu.sh

@@ -1,5 +1,6 @@
+#!/usr/bin/env bash
 # Variables
-DISPLAYS=( $(hyprctl monitors | grep -E '^Monitor' | awk '{print $2}') )
+mapfile -t DISPLAYS < <(hyprctl monitors | grep -E '^Monitor' | awk '{print $2}')
 EXTEND_RIGHT="Extend to right of main"
 EXTEND_LEFT="Extend to left of main"
 MIRROR="Mirror main"

modules/home/hyprland/applications/screenshot/screenshot.nix

@@ -5,7 +5,7 @@
 let
   screenshotDir = "${config.xdg.userDirs.pictures}/screenshots";
 in
-(pkgs.writeShellScriptBin "screenshot" ''
+pkgs.writeShellScriptBin "screenshot" ''
   mkdir -p ${screenshotDir}
   ${pkgs.hyprshot}/bin/hyprshot --mode $1 --output-folder ${screenshotDir} --filename screenshot_$(date +"%Y-%m-%d_%H-%M-%S").png
-'')
+''

modules/home/hyprland/binds/default.nix

@@ -27,7 +27,7 @@ in
     wayland.windowManager.hyprland = {
       settings = {
         bind = binds;
-        bindm = (import ./mouse.nix);
+        bindm = import ./mouse.nix;
       };
     };
   };

modules/home/hyprland/cursor.nix

@@ -9,17 +9,19 @@ let
   inherit (lib) mkForce;
 in
 {
-  home.pointerCursor = {
+  home = {
-    name = mkForce "Bibata-Original-Ice";
+    pointerCursor = {
-    size = mkForce 24;
+      name = mkForce "Bibata-Original-Ice";
-    package = mkForce pkgs.bibata-cursors;
+      size = mkForce 24;
-  };
+      package = mkForce pkgs.bibata-cursors;
+    };
 
-  home.packages = [ pkgs.hyprcursor ];
+    packages = [ pkgs.hyprcursor ];
 
-  home.sessionVariables = {
+    sessionVariables = {
-    HYPRCURSOR_THEME = config.home.pointerCursor.name;
+      HYPRCURSOR_THEME = config.home.pointerCursor.name;
-    HYPRCURSOR_SIZE = toString config.home.pointerCursor.size;
+      HYPRCURSOR_SIZE = toString config.home.pointerCursor.size;
+    };
   };
 
   # wayland.windowManager.hyprland.cursor.no_hardware_cursors = true;

modules/home/hyprland/default.nix

@@ -78,12 +78,6 @@ in
     # auto discover fonts in `home.packages`
     fonts.fontconfig.enable = true;
 
-    # notifications
-    services.dunst = {
-      enable = mkDefault true;
-      waylandDisplay = config.home.sessionVariables.WAYLAND_DISPLAY;
-    };
-
     # install some applications
     home.packages = import ./packages.nix { inherit pkgs; }; # use programs.PACKAGE or services.SERVICE when possible
 
@@ -94,11 +88,19 @@ in
       fi
     '';
 
-    services.udiskie = {
+    # notifications
-      enable = mkDefault true;
+    services = {
-      tray = mkDefault "never";
+      dunst = {
-    };
+        enable = mkDefault true;
+        waylandDisplay = config.home.sessionVariables.WAYLAND_DISPLAY;
+      };
 
-    services.network-manager-applet.enable = mkDefault true;
+      udiskie = {
+        enable = mkDefault true;
+        tray = mkDefault "never";
+      };
+
+      network-manager-applet.enable = mkDefault true;
+    };
   };
 }

modules/home/hyprland/xdg/default.nix

@@ -20,8 +20,10 @@ in
       enable = mkDefault true;
       createDirectories = mkDefault true;
     };
-    portal.enable = mkDefault true;
+    portal = {
-    portal.extraPortals = [ portal ];
+      enable = mkDefault true;
-    portal.configPackages = [ portal ];
+      extraPortals = [ portal ];
+      configPackages = [ portal ];
+    };
   };
 }

modules/home/librewolf/search/default.nix

@@ -19,13 +19,13 @@ let
     in
     {
       urls = [ { template = engine.url; } ];
-      icon = engine.icon;
+      inherit (engine) icon;
       updateInterval = if (isUrl engine.icon) then every_day else null;
       definedAliases = optional (engine ? alias) engine.alias;
     };
 
   transformedEngines = mapAttrs' (name: engine: {
-    name = name;
+    inherit name;
     value = transformEngine engine;
   }) engines;
 
@@ -79,7 +79,7 @@ in
     profiles.default.search.engines = mapAttrs (_: name: transformedEngines.${name}) (
       listToAttrs (
         map (name: {
-          name = name;
+          inherit name;
           value = name;
         }) cfg.searchEngines
       )

modules/home/nixvim/plugins/treesitter.nix

@@ -16,17 +16,19 @@ in
 {
   config = {
     programs.nixvim = {
-      plugins.treesitter = {
+      plugins = {
-        enable = mkDefault true;
+        treesitter = {
-        nixvimInjections = mkDefault true;
+          enable = mkDefault true;
-        settings = {
+          nixvimInjections = mkDefault true;
-          folding.enable = mkDefault true;
+          settings = {
-          highlight.enable = mkDefault true;
+            folding.enable = mkDefault true;
-          indent.enable = mkDefault true;
+            highlight.enable = mkDefault true;
+            indent.enable = mkDefault true;
+          };
         };
+        treesitter-context = mkIf plugin.enable { enable = mkDefault true; };
+        treesitter-textobjects = mkIf plugin.enable { enable = mkDefault true; };
       };
-      plugins.treesitter-context = mkIf plugin.enable { enable = mkDefault true; };
-      plugins.treesitter-textobjects = mkIf plugin.enable { enable = mkDefault true; };
     };
 
     # Fix for: ERROR `cc` executable not found.

modules/home/password-manager/default.nix

@@ -9,7 +9,7 @@
 let
   cfg = config.programs.passwordManager;
   passmenuScript = pkgs.writeShellScriptBin "passmenu-bemenu" (builtins.readFile ./passmenu); # TODO: override original passmenu script coming from pass itself
-  passff-host = pkgs.passff-host;
+  inherit (pkgs) passff-host;
 
   inherit (lib)
     mkDefault

modules/home/stylix/default.nix

@@ -29,8 +29,7 @@ let
     "moonfly"
     "oxocarbon"
   ];
-  schemeName =
+  schemeName = if builtins.elem cfg.scheme needsSuffix then "${cfg.scheme}-${cfg.polarity}" else cfg.scheme;
-    if builtins.elem cfg.scheme needsSuffix then "${cfg.scheme}-${cfg.polarity}" else cfg.scheme;
 
   inherit (lib)
     mkDefault

modules/home/stylix/schemes/moonfly.yaml

@@ -1,3 +1,4 @@
+---
 system: "base16"
 name: "Moonfly"
 description: "A dark theme inspired by the Moonfly color scheme."

modules/home/stylix/schemes/oxocarbon.yaml

@@ -1,3 +1,4 @@
+---
 system: "base16"
 name: "Oxocarbon"
 description: "A dark theme inspired by the Oxocarbon Dark color scheme."

modules/home/waybar/modules/newsboat.nix

@@ -10,13 +10,13 @@ let
     let
       newsboat = "${pkgs.newsboat}/bin/newsboat";
     in
-    (pkgs.writeShellScriptBin "newsboat-print-unread" ''
+    pkgs.writeShellScriptBin "newsboat-print-unread" ''
       UNREAD=$(${newsboat} -x print-unread | awk '{print $1}')
 
       if [[ $UNREAD -gt 0 ]]; then
       	printf " %i" "$UNREAD"
       fi
-    '');
+    '';
 
   inherit (lib) mkDefault;
 in

modules/home/waybar/modules/timer/timer.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 TIMER_FILE="/tmp/timer" # file to store the current time
 SIGNAL=11 # signal number to send to status bar
 STATUS_BAR="waybar" # Support for more status bars?
@@ -16,7 +17,7 @@ start_timer() {
     notify-send "Timer Started" "Your countdown timer has been started."
 
     trap "exit" INT TERM
-    trap "rm -f -- '$TIMER_FILE'" EXIT
+    trap 'rm -f -- "$TIMER_FILE"' EXIT
 
     while [ $total_seconds -gt 0 ]; do
       hours=$(( total_seconds / 3600 ))
@@ -62,7 +63,7 @@ if [ "$1" = "start" ]; then
   MINUTES=${MINUTES:-0}
   SECONDS=${SECONDS:-0}
 
-  start_timer $HOURS $MINUTES $SECONDS
+  start_timer "$HOURS" "$MINUTES" "$SECONDS"
 
 elif [ "$1" = "stop" ]; then
   notify-send "Timer Stopped" "Your countdown timer has been stopped."

modules/nixos/bluetooth/default.nix

@@ -4,10 +4,16 @@ let
   inherit (lib) mkDefault;
 in
 {
-  hardware.bluetooth.enable = mkDefault true;
+  hardware = {
-  hardware.bluetooth.powerOnBoot = mkDefault false;
+    bluetooth = {
-  hardware.bluetooth.settings.General.Enable = mkDefault "Source,Sink,Media,Socket";
+      enable = mkDefault true;
-  hardware.bluetooth.settings.General.Experimental = mkDefault true;
+      powerOnBoot = mkDefault false;
+      settings.General = {
+        Enable = mkDefault "Source,Sink,Media,Socket";
+        Experimental = mkDefault true;
+      };
+    };
+  };
 
   environment.systemPackages = with pkgs; [
     blueman

modules/nixos/cifsMount/default.nix

@@ -84,8 +84,6 @@ in
     ) { } cfg.remotes;
 
     # Ensure that all cifs-mount services are started with the graphical session
-    systemd.user.targets.graphical-session.wants = map (
+    systemd.user.targets.graphical-session.wants = map (remote: "cifs-mount-${remote.shareName}.service") cfg.remotes;
-      remote: "cifs-mount-${remote.shareName}.service"
-    ) cfg.remotes;
   };
 }

modules/nixos/common/boot.nix

@@ -1,20 +1,20 @@
 { lib, pkgs, ... }:
 
 {
-  # fix CVE-2026-31431
+  boot = {
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.18.22") (
+    # fix CVE-2026-31431
-    lib.mkDefault pkgs.linuxPackages_6_18
+    kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.18.22") (lib.mkDefault pkgs.linuxPackages_6_18);
-  );
 
-  # fix CVE-2026-43500
+    # fix CVE-2026-43500
-  boot.extraModprobeConfig = ''
+    extraModprobeConfig = ''
-    install esp4 ${pkgs.coreutils}/bin/false
+      install esp4 ${pkgs.coreutils}/bin/false
-    install esp6 ${pkgs.coreutils}/bin/false
+      install esp6 ${pkgs.coreutils}/bin/false
-    install rxrpc ${pkgs.coreutils}/bin/false
+      install rxrpc ${pkgs.coreutils}/bin/false
-  '';
+    '';
-  boot.blacklistedKernelModules = [
+    blacklistedKernelModules = [
-    "esp4"
+      "esp4"
-    "esp6"
+      "esp6"
-    "rxrpc"
+      "rxrpc"
-  ];
+    ];
+  };
 }

modules/nixos/common/environment.nix

@@ -9,55 +9,59 @@ let
   inherit (lib) mkDefault optionals;
 in
 {
-  environment.systemPackages =
+  environment = {
-    with pkgs;
+    systemPackages =
-    [
+      with pkgs;
-      cryptsetup
+      [
-      curl
+        cryptsetup
-      dig
+        curl
-      dnsutils
+        dig
-      fzf
+        dnsutils
-      gptfdisk
+        fzf
-      iproute2
+        gptfdisk
-      jq
+        iproute2
-      lm_sensors
+        jq
-      lsof
+        lm_sensors
-      netcat-openbsd
+        lsof
-      nettools
+        netcat-openbsd
-      nixos-container
+        nettools
-      nmap
+        nixos-container
-      nurl
+        nmap
-      p7zip
+        nurl
-      pciutils
+        p7zip
-      psmisc
+        pciutils
-      rclone
+        psmisc
-      rsync
+        rclone
-      tcpdump
+        rsync
-      tmux
+        tcpdump
-      tree
+        tmux
-      unzip
+        tree
-      usbutils
+        unzip
-      wget
+        usbutils
-      xxd
+        wget
-      zip
+        xxd
+        zip
 
-      (callPackage ../../../apps/rebuild { })
+        (callPackage ../../../apps/rebuild { })
-    ]
+      ]
-    ++ optionals (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) [
+      ++ optionals (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) [
-      pkgs.kitty.terminfo
+        pkgs.kitty.terminfo
-    ];
+      ];
 
-  environment.shellAliases = {
+    shellAliases = {
-    l = "ls -lh";
+      l = "ls -lh";
-    ll = "ls -lAh";
+      ll = "ls -lAh";
-    ports = "ss -tulpn";
+      ports = "ss -tulpn";
-    publicip = "curl ifconfig.me/all";
+      publicip = "curl ifconfig.me/all";
-    sudo = "sudo "; # make aliases work with `sudo`
+      sudo = "sudo "; # make aliases work with `sudo`
+    };
+
+    # saves one instance of nixpkgs.
+    ldso32 = null;
   };
 
-  # saves one instance of nixpkgs.
+  boot = {
-  environment.ldso32 = null;
+    tmp.cleanOnBoot = mkDefault true;
-
+    initrd.systemd.enable = mkDefault (!config.boot.swraid.enable && !config.boot.isContainer);
-  boot.tmp.cleanOnBoot = mkDefault true;
+  };
-  boot.initrd.systemd.enable = mkDefault (!config.boot.swraid.enable && !config.boot.isContainer);
 }

modules/nixos/common/well-known.nix

@@ -2,16 +2,13 @@
   # avoid TOFU MITM
   programs.ssh.knownHosts = {
     "github.com".hostNames = [ "github.com" ];
-    "github.com".publicKey =
+    "github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
 
     "gitlab.com".hostNames = [ "gitlab.com" ];
-    "gitlab.com".publicKey =
+    "gitlab.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf";
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf";
 
     "git.sr.ht".hostNames = [ "git.sr.ht" ];
-    "git.sr.ht".publicKey =
+    "git.sr.ht".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZvRd4EtM7R+IHVMWmDkVU3VLQTSwQDSAvW0t2Tkj60";
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZvRd4EtM7R+IHVMWmDkVU3VLQTSwQDSAvW0t2Tkj60";
   };
   # TODO: add synix
 }

modules/nixos/coturn/default.nix

@@ -42,12 +42,8 @@ in
       static-auth-secret-file = mkIf cfg.sops config.sops.secrets."coturn/static-auth-secret".path;
       realm = mkDefault "turn.${config.networking.domain}";
 
-      cert =
+      cert = mkIf (!cfg.no-tls && cfg.sops) "${config.security.acme.certs.${cfg.realm}.directory}/full.pem";
-        mkIf (!cfg.no-tls && cfg.sops)
+      pkey = mkIf (!cfg.no-tls && cfg.sops) "${config.security.acme.certs.${cfg.realm}.directory}/key.pem";
-          "${config.security.acme.certs.${cfg.realm}.directory}/full.pem";
-      pkey =
-        mkIf (!cfg.no-tls && cfg.sops)
-          "${config.security.acme.certs.${cfg.realm}.directory}/key.pem";
 
       extraConfig = ''
         # ban private IP ranges

modules/nixos/device/server.nix

@@ -33,11 +33,13 @@ in
 
   fonts.fontconfig.enable = mkDefault false;
 
-  xdg.autostart.enable = mkDefault false;
+  xdg = {
-  xdg.icons.enable = mkDefault false;
+    autostart.enable = mkDefault false;
-  xdg.menus.enable = mkDefault false;
+    icons.enable = mkDefault false;
-  xdg.mime.enable = mkDefault false;
+    menus.enable = mkDefault false;
-  xdg.sounds.enable = mkDefault false;
+    mime.enable = mkDefault false;
+    sounds.enable = mkDefault false;
+  };
 
   programs.git.package = mkDefault pkgs.gitMinimal;
 
@@ -48,22 +50,25 @@ in
     viAlias = mkDefault true;
   };
 
-  # emergency mode is useless on headless machines
+  systemd = {
-  systemd.enableEmergencyMode = false;
+    # emergency mode is useless on headless machines
+    enableEmergencyMode = false;
+
+    sleep.extraConfig = ''
+      AllowSuspend=no
+      AllowHibernation=no
+    '';
+
+    # force reboots
+    settings.Manager = {
+      RuntimeWatchdogSec = mkDefault "15s";
+      RebootWatchdogSec = mkDefault "30s";
+      KExecWatchdogSec = mkDefault "1m";
+    };
+  };
+
   boot.initrd.systemd.suppressedUnits = mkIf config.systemd.enableEmergencyMode [
     "emergency.service"
     "emergency.target"
   ];
-
-  systemd.sleep.extraConfig = ''
-    AllowSuspend=no
-    AllowHibernation=no
-  '';
-
-  # force reboots
-  systemd.settings.Manager = {
-    RuntimeWatchdogSec = mkDefault "15s";
-    RebootWatchdogSec = mkDefault "30s";
-    KExecWatchdogSec = mkDefault "1m";
-  };
 }

modules/nixos/device/vm.nix

@@ -4,7 +4,9 @@ let
   inherit (lib) mkDefault;
 in
 {
-  services.qemuGuest.enable = mkDefault true;
+  services = {
-  services.spice-vdagentd.enable = mkDefault true;
+    qemuGuest.enable = mkDefault true;
-  services.spice-webdavd.enable = mkDefault true;
+    spice-vdagentd.enable = mkDefault true;
+    spice-webdavd.enable = mkDefault true;
+  };
 }

modules/nixos/ftp-webserver/default.nix

@@ -2,9 +2,9 @@
 
 let
   cfg = config.services.ftp-webserver;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
   fqdn = if (cfg.subdomain != "") then "${cfg.subdomain}.${domain}" else domain;
-  nginx = config.services.nginx;
+  inherit (config.services) nginx;
 
   inherit (lib)
     mkEnableOption
@@ -35,7 +35,7 @@ in
 
   config = mkIf cfg.enable {
     services.nginx.virtualHosts."${fqdn}" = {
-      root = cfg.root;
+      inherit (cfg) root;
       locations."/" = {
         extraConfig = ''
           autoindex on;
@@ -43,7 +43,7 @@ in
           autoindex_localtime on;
         '';
       };
-      forceSSL = cfg.forceSSL;
+      inherit (cfg) forceSSL;
       enableACME = cfg.forceSSL;
       sslCertificate = mkIf cfg.forceSSL "${config.security.acme.certs."${fqdn}".directory}/cert.pem";
       sslCertificateKey = mkIf cfg.forceSSL "${config.security.acme.certs."${fqdn}".directory}/key.pem";

modules/nixos/headplane/default.nix

@@ -7,10 +7,10 @@
 
 let
   cfg = config.services.headplane;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
-  headscale = config.services.headscale;
+  inherit (config.services) headscale;
 
   inherit (lib)
     mkDefault
@@ -55,7 +55,7 @@ in
 
     services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
       "${fqdn}" = mkVirtualHost {
-        port = cfg.settings.server.port;
+        inherit (cfg.settings.server) port;
         ssl = cfg.reverseProxy.forceSSL;
       };
     };
@@ -63,7 +63,7 @@ in
     sops.secrets =
       let
         owner = headscale.user;
-        group = headscale.group;
+        inherit (headscale) group;
         mode = "0400";
       in
       {

modules/nixos/headscale/default.nix

@@ -6,8 +6,8 @@
 
 let
   cfg = config.services.headscale;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
   acl = "headscale/acl.hujson";
 

modules/nixos/hyprland/default.nix

@@ -8,23 +8,9 @@ in
 
   programs.dconf.enable = true; # fixes nixvim hm module
 
-  services.flatpak.enable = true;
+  services = {
-
+    flatpak.enable = true;
-  xdg.portal = {
+    gnome.gnome-keyring.enable = true;
-    enable = true;
+    udisks2.enable = mkDefault true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-    ];
-    config.common.default = "gtk";
   };
-
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services = {
-    login = {
-      enableGnomeKeyring = true;
-    };
-    hyprlock = { };
-  };
-
-  services.udisks2.enable = mkDefault true;
 }

modules/nixos/jellyfin/default.nix

@@ -7,8 +7,8 @@
 
 let
   cfg = config.services.jellyfin;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
 
   inherit (lib)
@@ -48,9 +48,7 @@ in
     ];
 
     systemd.tmpfiles.rules =
-      (map (
+      (map (library: "d ${cfg.dataDir}/libraries/${library} 0770 ${cfg.user} ${cfg.group} -") cfg.libraries)
-        library: "d ${cfg.dataDir}/libraries/${library} 0770 ${cfg.user} ${cfg.group} -"
-      ) cfg.libraries)
       ++ [
         "z ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group} -"
         "Z ${cfg.dataDir}/libraries 0770 ${cfg.user} ${cfg.group} -"

modules/nixos/jirafeau/default.nix

@@ -2,8 +2,8 @@
 
 let
   cfg = config.services.jirafeau;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
 
   inherit (lib)

modules/nixos/librechat-oci/default.nix

@@ -155,7 +155,7 @@ let
     mkOption {
       type = types.package;
       default = defaultImages.${name};
-      description = description;
+      inherit description;
     };
 
   inherit (lib)
@@ -236,10 +236,123 @@ in
   };
 
   config = mkIf cfg.enable {
-    virtualisation.podman = {
+    virtualisation = {
-      enable = true;
+      podman = {
-      autoPrune.enable = true;
+        enable = true;
-      dockerCompat = true;
+        autoPrune.enable = true;
+        dockerCompat = true;
+      };
+
+      oci-containers = {
+        backend = "podman";
+
+        containers = {
+          librechat-mongodb = {
+            image = with cfg.images.mongodb; "${imageName}:${imageTag}";
+            imageFile = cfg.images.mongodb;
+            cmd = [
+              "mongod"
+              "--noauth"
+            ];
+            volumes = [
+              "librechat_mongodb_data:/data/db:rw"
+            ];
+            log-driver = "journald";
+            extraOptions = [
+              "--network-alias=mongodb"
+              "--network=librechat_default"
+            ];
+          };
+
+          librechat-meilisearch = {
+            image = with cfg.images.meilisearch; "${imageName}:${imageTag}";
+            imageFile = cfg.images.meilisearch;
+            environment = {
+              MEILI_NO_ANALYTICS = "true";
+              MEILI_HOST = "http://meilisearch:${toString cfg.meiliPort}";
+            };
+            environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
+            volumes = [
+              "librechat_meili_data:/meili_data:rw"
+            ];
+            log-driver = "journald";
+            extraOptions = [
+              "--network-alias=meilisearch"
+              "--network=librechat_default"
+            ];
+          };
+
+          librechat-vectordb = {
+            image = with cfg.images.vectordb; "${imageName}:${imageTag}";
+            imageFile = cfg.images.vectordb;
+            environment = {
+              POSTGRES_DB = "mydatabase";
+              POSTGRES_USER = "myuser";
+              POSTGRES_PASSWORD = "mypassword";
+            };
+            volumes = [
+              "librechat_pgdata:/var/lib/postgresql/data:rw"
+            ];
+            log-driver = "journald";
+            extraOptions = [
+              "--network-alias=vectordb"
+              "--network=librechat_default"
+            ];
+          };
+
+          librechat-rag-api = {
+            image = with cfg.images.ragApi; "${imageName}:${imageTag}";
+            imageFile = cfg.images.ragApi;
+            environment = {
+              DB_HOST = "vectordb";
+              RAG_PORT = toString cfg.ragPort;
+            };
+            environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
+            dependsOn = [ "librechat-vectordb" ];
+            log-driver = "journald";
+            extraOptions = [
+              "--network-alias=rag_api"
+              "--network=librechat_default"
+            ];
+          };
+
+          librechat = {
+            image = with cfg.images.librechat; "${imageName}:${imageTag}";
+            imageFile = cfg.images.librechat;
+            environment =
+              defaultEnv
+              // {
+                MONGO_URI = "mongodb://mongodb:27017/LibreChat";
+                MEILI_HOST = "http://meilisearch:${toString cfg.meiliPort}";
+                RAG_PORT = toString cfg.ragPort;
+                RAG_API_URL = "http://rag_api:${toString cfg.ragPort}";
+                DOMAIN_CLIENT = if cfg.externalUrl != null then cfg.externalUrl else "http://localhost:${toString cfg.port}";
+                DOMAIN_SERVER = if cfg.externalUrl != null then cfg.externalUrl else "http://localhost:${toString cfg.port}";
+              }
+              // cfg.environment;
+            environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
+            volumes = [
+              "librechat_images:/app/client/public/images:rw"
+              "librechat_uploads:/app/uploads:rw"
+              "librechat_logs:/app/logs:rw"
+            ]
+            ++ optional (cfg.configFile != null) "${cfg.configFile}:/app/librechat.yaml:ro";
+
+            ports = [
+              "0.0.0.0:${toString cfg.port}:${toString cfg.port}/tcp"
+            ];
+            dependsOn = [
+              "librechat-mongodb"
+              "librechat-rag-api"
+            ];
+            log-driver = "journald";
+            extraOptions = [
+              "--network-alias=api"
+              "--network=librechat_default"
+            ];
+          };
+        };
+      };
     };
 
     networking.firewall.interfaces =
@@ -250,278 +363,173 @@ in
         "${matchAll}".allowedUDPPorts = [ 53 ];
       };
 
-    virtualisation.oci-containers.backend = "podman";
+    systemd = {
+      services = {
+        podman-librechat-mongodb = {
+          serviceConfig.Restart = mkOverride 90 "always";
+          after = [
+            "podman-network-librechat_default.service"
+            "podman-volume-librechat_mongodb_data.service"
+          ];
+          requires = [
+            "podman-network-librechat_default.service"
+            "podman-volume-librechat_mongodb_data.service"
+          ];
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
 
-    virtualisation.oci-containers.containers.librechat-mongodb = {
+        podman-librechat-meilisearch = {
-      image = with cfg.images.mongodb; "${imageName}:${imageTag}";
+          serviceConfig.Restart = mkOverride 90 "always";
-      imageFile = cfg.images.mongodb;
+          after = [
-      cmd = [
+            "podman-network-librechat_default.service"
-        "mongod"
+            "podman-volume-librechat_meili_data.service"
-        "--noauth"
+          ];
-      ];
+          requires = [
-      volumes = [
+            "podman-network-librechat_default.service"
-        "librechat_mongodb_data:/data/db:rw"
+            "podman-volume-librechat_meili_data.service"
-      ];
+          ];
-      log-driver = "journald";
+          partOf = [ "podman-compose-librechat-root.target" ];
-      extraOptions = [
+          wantedBy = [ "podman-compose-librechat-root.target" ];
-        "--network-alias=mongodb"
+        };
-        "--network=librechat_default"
-      ];
-    };
 
-    virtualisation.oci-containers.containers.librechat-meilisearch = {
+        podman-librechat-vectordb = {
-      image = with cfg.images.meilisearch; "${imageName}:${imageTag}";
+          serviceConfig.Restart = mkOverride 90 "always";
-      imageFile = cfg.images.meilisearch;
+          after = [
-      environment = {
+            "podman-network-librechat_default.service"
-        MEILI_NO_ANALYTICS = "true";
+            "podman-volume-librechat_pgdata.service"
-        MEILI_HOST = "http://meilisearch:${toString cfg.meiliPort}";
+          ];
+          requires = [
+            "podman-network-librechat_default.service"
+            "podman-volume-librechat_pgdata.service"
+          ];
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-librechat-rag-api = {
+          serviceConfig.Restart = mkOverride 90 "always";
+          after = [
+            "podman-network-librechat_default.service"
+            "podman-librechat-vectordb.service"
+          ];
+          requires = [
+            "podman-network-librechat_default.service"
+            "podman-librechat-vectordb.service"
+          ];
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-librechat = {
+          serviceConfig.Restart = mkOverride 90 "always";
+          after = [
+            "podman-network-librechat_default.service"
+            "podman-volume-librechat_images.service"
+            "podman-volume-librechat_uploads.service"
+            "podman-volume-librechat_logs.service"
+            "podman-librechat-mongodb.service"
+            "podman-librechat-meilisearch.service"
+            "podman-librechat-rag-api.service"
+          ];
+          requires = [
+            "podman-network-librechat_default.service"
+            "podman-volume-librechat_images.service"
+            "podman-volume-librechat_uploads.service"
+            "podman-volume-librechat_logs.service"
+            "podman-librechat-mongodb.service"
+            "podman-librechat-meilisearch.service"
+            "podman-librechat-rag-api.service"
+          ];
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-network-librechat_default = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStop = "podman network rm -f librechat_default";
+          };
+          script = ''
+            podman network inspect librechat_default || podman network create librechat_default
+          '';
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_mongodb_data = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_mongodb_data || podman volume create librechat_mongodb_data";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_meili_data = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_meili_data || podman volume create librechat_meili_data";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_pgdata = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_pgdata || podman volume create librechat_pgdata";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_images = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_images || podman volume create librechat_images";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_uploads = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_uploads || podman volume create librechat_uploads";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
+
+        podman-volume-librechat_logs = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = "podman volume inspect librechat_logs || podman volume create librechat_logs";
+          partOf = [ "podman-compose-librechat-root.target" ];
+          wantedBy = [ "podman-compose-librechat-root.target" ];
+        };
       };
-      environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
-      volumes = [
-        "librechat_meili_data:/meili_data:rw"
-      ];
-      log-driver = "journald";
-      extraOptions = [
-        "--network-alias=meilisearch"
-        "--network=librechat_default"
-      ];
-    };
 
-    virtualisation.oci-containers.containers.librechat-vectordb = {
+      targets.podman-compose-librechat-root = {
-      image = with cfg.images.vectordb; "${imageName}:${imageTag}";
+        unitConfig.Description = "Root target generated by compose2nix.";
-      imageFile = cfg.images.vectordb;
+        wantedBy = [ "multi-user.target" ];
-      environment = {
-        POSTGRES_DB = "mydatabase";
-        POSTGRES_USER = "myuser";
-        POSTGRES_PASSWORD = "mypassword";
       };
-      volumes = [
-        "librechat_pgdata:/var/lib/postgresql/data:rw"
-      ];
-      log-driver = "journald";
-      extraOptions = [
-        "--network-alias=vectordb"
-        "--network=librechat_default"
-      ];
-    };
-
-    virtualisation.oci-containers.containers.librechat-rag-api = {
-      image = with cfg.images.ragApi; "${imageName}:${imageTag}";
-      imageFile = cfg.images.ragApi;
-      environment = {
-        DB_HOST = "vectordb";
-        RAG_PORT = toString cfg.ragPort;
-      };
-      environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
-      dependsOn = [ "librechat-vectordb" ];
-      log-driver = "journald";
-      extraOptions = [
-        "--network-alias=rag_api"
-        "--network=librechat_default"
-      ];
-    };
-
-    virtualisation.oci-containers.containers.librechat = {
-      image = with cfg.images.librechat; "${imageName}:${imageTag}";
-      imageFile = cfg.images.librechat;
-      environment =
-        defaultEnv
-        // {
-          MONGO_URI = "mongodb://mongodb:27017/LibreChat";
-          MEILI_HOST = "http://meilisearch:${toString cfg.meiliPort}";
-          RAG_PORT = toString cfg.ragPort;
-          RAG_API_URL = "http://rag_api:${toString cfg.ragPort}";
-          DOMAIN_CLIENT =
-            if cfg.externalUrl != null then cfg.externalUrl else "http://localhost:${toString cfg.port}";
-          DOMAIN_SERVER =
-            if cfg.externalUrl != null then cfg.externalUrl else "http://localhost:${toString cfg.port}";
-        }
-        // cfg.environment;
-      environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
-      volumes = [
-        "librechat_images:/app/client/public/images:rw"
-        "librechat_uploads:/app/uploads:rw"
-        "librechat_logs:/app/logs:rw"
-      ]
-      ++ optional (cfg.configFile != null) "${cfg.configFile}:/app/librechat.yaml:ro";
-
-      ports = [
-        "0.0.0.0:${toString cfg.port}:${toString cfg.port}/tcp"
-      ];
-      dependsOn = [
-        "librechat-mongodb"
-        "librechat-rag-api"
-      ];
-      log-driver = "journald";
-      extraOptions = [
-        "--network-alias=api"
-        "--network=librechat_default"
-      ];
-    };
-
-    systemd.services.podman-librechat-mongodb = {
-      serviceConfig.Restart = mkOverride 90 "always";
-      after = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_mongodb_data.service"
-      ];
-      requires = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_mongodb_data.service"
-      ];
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-librechat-meilisearch = {
-      serviceConfig.Restart = mkOverride 90 "always";
-      after = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_meili_data.service"
-      ];
-      requires = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_meili_data.service"
-      ];
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-librechat-vectordb = {
-      serviceConfig.Restart = mkOverride 90 "always";
-      after = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_pgdata.service"
-      ];
-      requires = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_pgdata.service"
-      ];
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-librechat-rag-api = {
-      serviceConfig.Restart = mkOverride 90 "always";
-      after = [
-        "podman-network-librechat_default.service"
-        "podman-librechat-vectordb.service"
-      ];
-      requires = [
-        "podman-network-librechat_default.service"
-        "podman-librechat-vectordb.service"
-      ];
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-librechat = {
-      serviceConfig.Restart = mkOverride 90 "always";
-      after = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_images.service"
-        "podman-volume-librechat_uploads.service"
-        "podman-volume-librechat_logs.service"
-        "podman-librechat-mongodb.service"
-        "podman-librechat-meilisearch.service"
-        "podman-librechat-rag-api.service"
-      ];
-      requires = [
-        "podman-network-librechat_default.service"
-        "podman-volume-librechat_images.service"
-        "podman-volume-librechat_uploads.service"
-        "podman-volume-librechat_logs.service"
-        "podman-librechat-mongodb.service"
-        "podman-librechat-meilisearch.service"
-        "podman-librechat-rag-api.service"
-      ];
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-network-librechat_default = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStop = "podman network rm -f librechat_default";
-      };
-      script = ''
-        podman network inspect librechat_default || podman network create librechat_default
-      '';
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_mongodb_data = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_mongodb_data || podman volume create librechat_mongodb_data";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_meili_data = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_meili_data || podman volume create librechat_meili_data";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_pgdata = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_pgdata || podman volume create librechat_pgdata";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_images = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_images || podman volume create librechat_images";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_uploads = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_uploads || podman volume create librechat_uploads";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.services.podman-volume-librechat_logs = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-      script = "podman volume inspect librechat_logs || podman volume create librechat_logs";
-      partOf = [ "podman-compose-librechat-root.target" ];
-      wantedBy = [ "podman-compose-librechat-root.target" ];
-    };
-
-    systemd.targets.podman-compose-librechat-root = {
-      unitConfig.Description = "Root target generated by compose2nix.";
-      wantedBy = [ "multi-user.target" ];
     };
   };
 }

modules/nixos/mailserver/default.nix

@@ -8,7 +8,7 @@
 
 let
   cfg = config.mailserver;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
   fqdn = "${cfg.subdomain}.${domain}";
 
   inherit (lib)
@@ -74,7 +74,7 @@ in
         nameValuePair "${user}@${domain}" {
           name = "${user}@${domain}";
           aliases = map (alias: "${alias}@${domain}") (accConf.aliases or [ ]);
-          sendOnly = accConf.sendOnly;
+          inherit (accConf) sendOnly;
           quota = mkDefault "5G";
           hashedPasswordFile = config.sops.secrets."mailserver/accounts/${user}".path;
         }

modules/nixos/matrix-synapse/bridges.nix

@@ -23,7 +23,7 @@ let
 
     services."mautrix-${name}" = {
       enable = true;
-      package = cfg.bridges.${name}.package;
+      inherit (cfg.bridges.${name}) package;
       environmentFile = mkIf cfg.sops config.sops.templates."mautrix-${name}/env-file".path;
       settings = {
         bridge = {
@@ -71,33 +71,29 @@ let
         mode = "0400";
       in
       {
-        secrets."mautrix-${name}/encryption-pickle-key" = {
+        secrets = {
-          inherit owner group mode;
+          "mautrix-${name}/encryption-pickle-key" = {
-        };
+            inherit owner group mode;
-        secrets."mautrix-${name}/provisioning-shared-secret" = {
+          };
-          inherit owner group mode;
+          "mautrix-${name}/provisioning-shared-secret" = {
-        };
+            inherit owner group mode;
-        secrets."mautrix-${name}/public-media-signing-key" = {
+          };
-          inherit owner group mode;
+          "mautrix-${name}/public-media-signing-key" = {
-        };
+            inherit owner group mode;
-        secrets."mautrix-${name}/direct-media-server-key" = {
+          };
-          inherit owner group mode;
+          "mautrix-${name}/direct-media-server-key" = {
+            inherit owner group mode;
+          };
         };
         templates."mautrix-${name}/env-file" = {
           inherit owner group mode;
           content = ''
-            MAUTRIX_${toUpper name}_ENCRYPTION_PICKLE_KEY=${
+            MAUTRIX_${toUpper name}_ENCRYPTION_PICKLE_KEY=${config.sops.placeholder."mautrix-${name}/encryption-pickle-key"}
-              config.sops.placeholder."mautrix-${name}/encryption-pickle-key"
-            }
             MAUTRIX_${toUpper name}_PROVISIONING_SHARED_SECRET=${
               config.sops.placeholder."mautrix-${name}/provisioning-shared-secret"
             }
-            MAUTRIX_${toUpper name}_PUBLIC_MEDIA_SIGNING_KEY=${
+            MAUTRIX_${toUpper name}_PUBLIC_MEDIA_SIGNING_KEY=${config.sops.placeholder."mautrix-${name}/public-media-signing-key"}
-              config.sops.placeholder."mautrix-${name}/public-media-signing-key"
+            MAUTRIX_${toUpper name}_DIRECT_MEDIA_SERVER_KEY=${config.sops.placeholder."mautrix-${name}/direct-media-server-key"}
-            }
-            MAUTRIX_${toUpper name}_DIRECT_MEDIA_SERVER_KEY=${
-              config.sops.placeholder."mautrix-${name}/direct-media-server-key"
-            }
           '';
         };
       }

modules/nixos/matrix-synapse/default.nix

@@ -84,77 +84,74 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.postgresql = {
+    services = {
-      enable = true;
+      postgresql = {
-      initialScript = pkgs.writeText "synapse-init.sql" ''
+        enable = true;
-        CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+        initialScript = pkgs.writeText "synapse-init.sql" ''
-        CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+          CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
-          TEMPLATE template0
+          CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-          LC_COLLATE = 'C'
+            TEMPLATE template0
-          LC_CTYPE = 'C';
+            LC_COLLATE = 'C'
-      '';
+            LC_CTYPE = 'C';
-    };
+        '';
+      };
 
-    services.matrix-synapse = mkMerge [
+      matrix-synapse = mkMerge [
-      {
+        {
-        settings = {
+          settings = {
-          registration_shared_secret_path =
+            registration_shared_secret_path = mkIf cfg.sops config.sops.secrets."matrix/registration-shared-secret".path;
-            mkIf cfg.sops
+            server_name = config.networking.domain;
-              config.sops.secrets."matrix/registration-shared-secret".path;
+            public_baseurl = baseUrl;
-          server_name = config.networking.domain;
+            listeners = [
-          public_baseurl = baseUrl;
+              {
-          listeners = [
+                inherit (cfg) port;
-            {
+                bind_addresses = [ "127.0.0.1" ];
-              inherit (cfg) port;
+                resources = [
-              bind_addresses = [ "127.0.0.1" ];
+                  {
-              resources = [
+                    compress = true;
-                {
+                    names = [ "client" ];
-                  compress = true;
+                  }
-                  names = [ "client" ];
+                  {
-                }
+                    compress = false;
-                {
+                    names = [ "federation" ];
-                  compress = false;
+                  }
-                  names = [ "federation" ];
+                ];
-                }
+                tls = false;
-              ];
+                type = "http";
-              tls = false;
+                x_forwarded = true;
-              type = "http";
+              }
-              x_forwarded = true;
+            ];
-            }
+          };
-          ];
+        }
+        (mkIf cfg.coturn.enable {
+          settings = {
+            turn_uris = with cfg.coturn; [
+              "turn:${realm}:${toString listening-port}?transport=udp"
+              "turn:${realm}:${toString listening-port}?transport=tcp"
+              "turn:${realm}:${toString tls-listening-port}?transport=udp"
+              "turn:${realm}:${toString tls-listening-port}?transport=tcp"
+              "turn:${realm}:${toString alt-listening-port}?transport=udp"
+              "turn:${realm}:${toString alt-listening-port}?transport=tcp"
+              "turn:${realm}:${toString alt-tls-listening-port}?transport=udp"
+              "turn:${realm}:${toString alt-tls-listening-port}?transport=tcp"
+            ];
+            extraConfigFiles = mkIf cfg.sops [ config.sops.templates."coturn/static-auth-secret.env".path ];
+            turn_user_lifetime = "1h";
+          };
+        })
+      ];
+
+      nginx.virtualHosts."${cfg.settings.server_name}" = {
+        enableACME = true;
+        forceSSL = true;
+
+        locations = {
+          "= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
+          "= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
+          "/_matrix".proxyPass = "http://127.0.0.1:${toString cfg.port}";
+          "/_synapse".proxyPass = "http://127.0.0.1:${toString cfg.port}";
         };
-      }
+      };
-      (mkIf cfg.coturn.enable {
-        settings = {
-          turn_uris = with cfg.coturn; [
-            "turn:${realm}:${toString listening-port}?transport=udp"
-            "turn:${realm}:${toString listening-port}?transport=tcp"
-            "turn:${realm}:${toString tls-listening-port}?transport=udp"
-            "turn:${realm}:${toString tls-listening-port}?transport=tcp"
-            "turn:${realm}:${toString alt-listening-port}?transport=udp"
-            "turn:${realm}:${toString alt-listening-port}?transport=tcp"
-            "turn:${realm}:${toString alt-tls-listening-port}?transport=udp"
-            "turn:${realm}:${toString alt-tls-listening-port}?transport=tcp"
-          ];
-          extraConfigFiles = mkIf cfg.sops [ config.sops.templates."coturn/static-auth-secret.env".path ];
-          turn_user_lifetime = "1h";
-        };
-      })
-    ];
-
-    environment.shellAliases = mkIf cfg.sops {
-      register_new_matrix_user = "${cfg.package}/bin/register_new_matrix_user -k $(sudo cat ${cfg.settings.registration_shared_secret_path})";
-    };
-
-    services.nginx.virtualHosts."${cfg.settings.server_name}" = {
-      enableACME = true;
-      forceSSL = true;
-
-      locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
-      locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
-
-      locations."/_matrix".proxyPass = "http://127.0.0.1:${toString cfg.port}";
-      locations."/_synapse".proxyPass = "http://127.0.0.1:${toString cfg.port}";
     };
 
     sops = mkIf cfg.sops {

modules/nixos/matrix-synapse/livekit.nix

@@ -6,51 +6,53 @@
 
 let
   cfg = config.services.matrix-synapse;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
 
   inherit (lib) mkIf mkDefault;
 in
 {
   config = mkIf cfg.enable {
-    services.livekit = {
+    services = {
-      enable = true;
+      livekit = {
-      settings.port = mkDefault 7880;
+        enable = true;
-      settings.room.auto_create = mkDefault false;
+        settings.port = mkDefault 7880;
-      openFirewall = mkDefault true;
+        settings.room.auto_create = mkDefault false;
-      keyFile = mkIf cfg.sops config.sops.templates."livekit/key".path;
+        openFirewall = mkDefault true;
-    };
+        keyFile = mkIf cfg.sops config.sops.templates."livekit/key".path;
+      };
 
-    services.lk-jwt-service = {
+      lk-jwt-service = {
-      enable = true;
+        enable = true;
-      port = mkDefault 8080;
+        port = mkDefault 8080;
-      livekitUrl = "wss://${domain}/livekit/sfu";
+        livekitUrl = "wss://${domain}/livekit/sfu";
-      keyFile = mkIf cfg.sops config.sops.templates."livekit/key".path;
+        keyFile = mkIf cfg.sops config.sops.templates."livekit/key".path;
-    };
+      };
 
-    systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = domain;
+      nginx.virtualHosts = {
-
+        "${domain}".locations = {
-    services.nginx.virtualHosts = {
+          "^~ /livekit/jwt/" = {
-      "${domain}".locations = {
+            priority = 400;
-        "^~ /livekit/jwt/" = {
+            proxyPass = "http://127.0.0.1:${toString config.services.lk-jwt-service.port}/";
-          priority = 400;
+          };
-          proxyPass = "http://127.0.0.1:${toString config.services.lk-jwt-service.port}/";
+          "^~ /livekit/sfu/" = {
-        };
+            priority = 400;
-        "^~ /livekit/sfu/" = {
+            proxyPass = "http://127.0.0.1:${toString config.services.livekit.settings.port}/";
-          priority = 400;
+            proxyWebsockets = true;
-          proxyPass = "http://127.0.0.1:${toString config.services.livekit.settings.port}/";
+            extraConfig = ''
-          proxyWebsockets = true;
+              proxy_send_timeout 120;
-          extraConfig = ''
+              proxy_read_timeout 120;
-            proxy_send_timeout 120;
+              proxy_buffering off;
-            proxy_read_timeout 120;
+              proxy_set_header Accept-Encoding gzip;
-            proxy_buffering off;
+              proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Accept-Encoding gzip;
+              proxy_set_header Connection "upgrade";
-            proxy_set_header Upgrade $http_upgrade;
+            '';
-            proxy_set_header Connection "upgrade";
+          };
-          '';
         };
       };
     };
 
+    systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = domain;
+
     sops = mkIf cfg.sops {
       secrets."livekit/key" = { };
       templates."livekit/key".content = ''

modules/nixos/maubot/default.nix

@@ -76,7 +76,7 @@ in
     sops = mkIf cfg.sops (
       let
         owner = user.name;
-        group = user.group;
+        inherit (user) group;
         mode = "0400";
       in
       {
@@ -98,9 +98,7 @@ in
             ''
               admins:
             ''
-            + concatLines (
+            + concatLines (map (admin: "  ${admin}: ${config.sops.placeholder."maubot/admins/${admin}"}") cfg.admins)
-              map (admin: "  ${admin}: ${config.sops.placeholder."maubot/admins/${admin}"}") cfg.admins
-            )
           );
         };
       }

modules/nixos/mcpo/default.nix

@@ -96,7 +96,7 @@ in
 
     users.users."${cfg.user}" = {
       isSystemUser = true;
-      group = cfg.group;
+      inherit (cfg) group;
     };
 
     users.groups."${cfg.group}" = { };

modules/nixos/miniflux/default.nix

@@ -6,8 +6,8 @@
 
 let
   cfg = config.services.miniflux;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
   port = 8085;
 

modules/nixos/nginx/default.nix

@@ -50,8 +50,7 @@ in
             "1.1.1.1"
             "2606:4700:4700::1111"
           ];
-          resolvers =
+          resolvers = if config.networking.nameservers == [ ] then cloudflare else config.networking.nameservers;
-            if config.networking.nameservers == [ ] then cloudflare else config.networking.nameservers;
         in
         map escapeIPv6 resolvers;
 
@@ -60,7 +59,7 @@ in
       virtualHosts = {
         "${config.networking.domain}" = mkDefault {
           enableACME = cfg.forceSSL;
-          forceSSL = cfg.forceSSL;
+          inherit (cfg) forceSSL;
         };
       };
     };

modules/nixos/normalUsers/default.nix

@@ -21,7 +21,7 @@ in
       types.submodule {
         options = {
           extraGroups = mkOption {
-            type = (types.listOf types.str);
+            type = types.listOf types.str;
             default = [ ];
             description = "Extra groups for the user";
             example = [ "wheel" ];
@@ -37,7 +37,7 @@ in
             description = "Initial password for the user";
           };
           sshKeyFiles = mkOption {
-            type = (types.listOf types.path);
+            type = types.listOf types.path;
             default = [ ];
             description = "SSH key files for the user";
             example = [ "/path/to/id_rsa.pub" ];

modules/nixos/nostr-relay/default.nix

@@ -2,8 +2,8 @@
 
 let
   cfg = config.services.nostr-relay;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
 
   inherit (lib)
@@ -48,9 +48,8 @@ in
     services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
       "${fqdn}" = {
         enableACME = cfg.reverseProxy.forceSSL;
-        forceSSL = cfg.reverseProxy.forceSSL;
+        inherit (cfg.reverseProxy) forceSSL;
-        locations."/".proxyPass =
+        locations."/".proxyPass = "http://127.0.0.1:${toString config.services.nostr-rs-relay.settings.network.port}";
-          "http://127.0.0.1:${toString config.services.nostr-rs-relay.settings.network.port}";
       };
     };
   };

modules/nixos/nvidia/default.nix

@@ -9,20 +9,26 @@ let
   inherit (lib) mkDefault;
 in
 {
-  boot.blacklistedKernelModules = [ "nouveau" ];
+  boot = {
-  boot.extraModulePackages = [ config.hardware.nvidia.package ];
+    blacklistedKernelModules = [ "nouveau" ];
-  boot.initrd.kernelModules = [ "nvidia" ];
+    extraModulePackages = [ config.hardware.nvidia.package ];
+    initrd.kernelModules = [ "nvidia" ];
+  };
 
   environment.systemPackages = with pkgs; [
     nvtopPackages.nvidia
   ];
 
-  hardware.enableRedistributableFirmware = true;
+  hardware = {
-  hardware.graphics.enable = true;
+    enableRedistributableFirmware = true;
-  hardware.nvidia.modesetting.enable = true;
+    graphics.enable = true;
-  hardware.nvidia.nvidiaSettings = true;
+    nvidia = {
-  hardware.nvidia.open = false;
+      modesetting.enable = true;
-  hardware.nvidia.package = mkDefault config.boot.kernelPackages.nvidiaPackages.latest;
+      nvidiaSettings = true;
+      open = false;
+      package = mkDefault config.boot.kernelPackages.nvidiaPackages.latest;
+    };
+  };
 
   nixpkgs.config.cudaSupport = true;
 

modules/nixos/ollama/default.nix

@@ -2,8 +2,8 @@
 
 let
   cfg = config.services.ollama;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
 
   inherit (lib)
@@ -31,7 +31,7 @@ in
 
     services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
       "${fqdn}" = mkVirtualHost {
-        port = cfg.port;
+        inherit (cfg) port;
         ssl = cfg.reverseProxy.forceSSL;
         recommendedProxySettings = mkForce false;
         extraConfig = ''

modules/nixos/open-webui-oci/default.nix

@@ -83,10 +83,43 @@ in
   };
 
   config = mkIf cfg.enable {
-    virtualisation.podman = {
+    virtualisation = {
-      enable = true;
+      podman = {
-      autoPrune.enable = true;
+        enable = true;
-      dockerCompat = true;
+        autoPrune.enable = true;
+        dockerCompat = true;
+      };
+
+      oci-containers = {
+        backend = "podman";
+
+        containers."open-webui" = {
+          image = with cfg.image; imageName + ":" + imageTag;
+          imageFile = cfg.image;
+          environment =
+            defaultEnv
+            // cfg.environment
+            // {
+              PORT = "${toString cfg.port}";
+              CORS_ALLOW_ORIGIN = concatStringsSep ";" (
+                [
+                  "http://localhost:${toString cfg.port}"
+                  "http://127.0.0.1:${toString cfg.port}"
+                  "http://0.0.0.0:${toString cfg.port}"
+                ]
+                ++ optional (cfg.externalUrl != null) cfg.externalUrl
+              );
+            };
+          environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
+          volumes = [
+            "open-webui_open-webui:/app/backend/data:rw"
+          ];
+          log-driver = "journald";
+          extraOptions = [
+            "--network=host"
+          ];
+        };
+      };
     };
 
     networking.firewall.interfaces =
@@ -97,70 +130,44 @@ in
         "${matchAll}".allowedUDPPorts = [ 53 ];
       };
 
-    virtualisation.oci-containers.backend = "podman";
+    systemd = {
-
+      services."podman-open-webui" = {
-    virtualisation.oci-containers.containers."open-webui" = {
+        serviceConfig = {
-      image = with cfg.image; imageName + ":" + imageTag;
+          Restart = mkOverride 90 "always";
-      imageFile = cfg.image;
-      environment =
-        defaultEnv
-        // cfg.environment
-        // {
-          PORT = "${toString cfg.port}";
-          CORS_ALLOW_ORIGIN = concatStringsSep ";" (
-            [
-              "http://localhost:${toString cfg.port}"
-              "http://127.0.0.1:${toString cfg.port}"
-              "http://0.0.0.0:${toString cfg.port}"
-            ]
-            ++ optional (cfg.externalUrl != null) cfg.externalUrl
-          );
         };
-      environmentFiles = optional (cfg.environmentFile != null) cfg.environmentFile;
+        after = [
-      volumes = [
+          "podman-volume-open-webui_open-webui.service"
-        "open-webui_open-webui:/app/backend/data:rw"
+        ];
-      ];
+        requires = [
-      log-driver = "journald";
+          "podman-volume-open-webui_open-webui.service"
-      extraOptions = [
+        ];
-        "--network=host"
+        partOf = [
-      ];
+          "podman-compose-open-webui-root.target"
-    };
+        ];
-    systemd.services."podman-open-webui" = {
+        wantedBy = [
-      serviceConfig = {
+          "podman-compose-open-webui-root.target"
-        Restart = mkOverride 90 "always";
+        ];
       };
-      after = [
-        "podman-volume-open-webui_open-webui.service"
-      ];
-      requires = [
-        "podman-volume-open-webui_open-webui.service"
-      ];
-      partOf = [
-        "podman-compose-open-webui-root.target"
-      ];
-      wantedBy = [
-        "podman-compose-open-webui-root.target"
-      ];
-    };
 
-    systemd.services."podman-volume-open-webui_open-webui" = {
+      services."podman-volume-open-webui_open-webui" = {
-      path = [ pkgs.podman ];
+        path = [ pkgs.podman ];
-      serviceConfig = {
+        serviceConfig = {
-        Type = "oneshot";
+          Type = "oneshot";
-        RemainAfterExit = true;
+          RemainAfterExit = true;
+        };
+        script = ''
+          podman volume inspect open-webui_open-webui || podman volume create open-webui_open-webui
+        '';
+        partOf = [ "podman-compose-open-webui-root.target" ];
+        wantedBy = [ "podman-compose-open-webui-root.target" ];
       };
-      script = ''
-        podman volume inspect open-webui_open-webui || podman volume create open-webui_open-webui
-      '';
-      partOf = [ "podman-compose-open-webui-root.target" ];
-      wantedBy = [ "podman-compose-open-webui-root.target" ];
-    };
 
-    systemd.targets."podman-compose-open-webui-root" = {
+      targets."podman-compose-open-webui-root" = {
-      unitConfig = {
+        unitConfig = {
-        Description = "Root target generated by compose2nix.";
+          Description = "Root target generated by compose2nix.";
+        };
+        wantedBy = [ "multi-user.target" ];
       };
-      wantedBy = [ "multi-user.target" ];
     };
   };
 }

modules/nixos/print-server/default.nix

@@ -7,8 +7,8 @@
 
 let
   cfg = config.services.print-server;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
   port = 631;
 
@@ -36,47 +36,49 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.printing = {
+    services = {
-      enable = true;
+      printing = {
-      listenAddresses = [ "*:${builtins.toString port}" ];
+        enable = true;
-      webInterface = true;
+        listenAddresses = [ "*:${builtins.toString port}" ];
-      tempDir = "/tmp/cups";
+        webInterface = true;
-      allowFrom = [ "all" ];
+        tempDir = "/tmp/cups";
-      snmpConf = ''
+        allowFrom = [ "all" ];
-        Address @LOCAL
+        snmpConf = ''
-      '';
+          Address @LOCAL
-      clientConf = "";
+        '';
-      openFirewall = cfg.openFirewall;
+        clientConf = "";
-      drivers = with pkgs; [
+        inherit (cfg) openFirewall;
-        brlaser
+        drivers = with pkgs; [
-        brgenml1lpr
+          brlaser
-        brgenml1cupswrapper # Brother
+          brgenml1lpr
-        postscript-lexmark # Lexmark
+          brgenml1cupswrapper # Brother
-        hplip
+          postscript-lexmark # Lexmark
-        hplipWithPlugin # HP
+          hplip
-        splix
+          hplipWithPlugin # HP
-        samsung-unified-linux-driver # Samsung
+          splix
-        gutenprint
+          samsung-unified-linux-driver # Samsung
-        gutenprintBin # different vendors
+          gutenprint
-      ];
+          gutenprintBin # different vendors
-      defaultShared = true;
+        ];
-      browsing = true;
+        defaultShared = true;
-      browsedConf = ''
+        browsing = true;
-        BrowsePoll ${fqdn}
+        browsedConf = ''
-      '';
+          BrowsePoll ${fqdn}
-    };
+        '';
+      };
 
-    # autodiscovery of network printers
+      # autodiscovery of network printers
-    services.avahi = {
+      avahi = {
-      enable = true;
+        enable = true;
-      nssmdns4 = true;
+        nssmdns4 = true;
-      openFirewall = cfg.openFirewall;
+        inherit (cfg) openFirewall;
-    };
+      };
 
-    services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
+      nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
-      ${fqdn} = mkVirtualHost {
+        ${fqdn} = mkVirtualHost {
-        inherit port;
+          inherit port;
-        ssl = cfg.reverseProxy.forceSSL;
+          ssl = cfg.reverseProxy.forceSSL;
+        };
       };
     };
   };

modules/nixos/radicale/default.nix

@@ -7,8 +7,8 @@
 
 let
   cfg = config.services.radicale;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
   port = 5232;
 
@@ -63,7 +63,7 @@ in
 
     services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
       "${fqdn}" = {
-        forceSSL = cfg.reverseProxy.forceSSL;
+        inherit (cfg.reverseProxy) forceSSL;
         enableACME = cfg.reverseProxy.forceSSL;
         locations = {
           "/" = {

modules/nixos/rss-bridge/default.nix

@@ -2,8 +2,8 @@
 
 let
   cfg = config.services.rss-bridge;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
-  subdomain = cfg.reverseProxy.subdomain;
+  inherit (cfg.reverseProxy) subdomain;
   fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain;
 
   inherit (lib)
@@ -33,7 +33,7 @@ in
     services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable {
       "${fqdn}" = {
         enableACME = cfg.reverseProxy.forceSSL;
-        forceSSL = cfg.reverseProxy.forceSSL;
+        inherit (cfg.reverseProxy) forceSSL;
       };
     };
   };

modules/nixos/tailscale/default.nix

@@ -56,8 +56,7 @@ in
   config =
     let
       defaultTailnets = filterAttrs (_: t: t.default) cfg.tailnets;
-      defaultTailnet =
+      defaultTailnet = if defaultTailnets == { } then null else builtins.head (builtins.attrValues defaultTailnets);
-        if defaultTailnets == { } then null else builtins.head (builtins.attrValues defaultTailnets);
 
       entries = mapAttrsToList (name: tcfg: ''
         TAILNETS["${name}"]="${tcfg.loginServer}|${if tcfg.enableSSH then "true" else "false"}|${
@@ -111,8 +110,7 @@ in
     mkIf cfg.enable {
       assertions = [
         {
-          assertion =
+          assertion = (builtins.length (builtins.attrValues (filterAttrs (_: t: t.default) cfg.tailnets))) <= 1;
-            (builtins.length (builtins.attrValues (filterAttrs (_: t: t.default) cfg.tailnets))) <= 1;
           message = "services.tailscale.tailnets: Only one tailnet can be set as default.";
         }
         {

modules/nixos/virtualisation/default.nix

@@ -58,16 +58,18 @@ in
         enable = mkDefault true;
         onBoot = mkDefault "ignore";
         onShutdown = mkDefault "shutdown";
-        qemu.runAsRoot = mkDefault false;
+        qemu = {
-        qemu.verbatimConfig = ''
+          runAsRoot = mkDefault false;
-          clear_emulation_capabilities = ${boolToZeroOne cfg.libvirtd.clearEmulationCapabilities}
+          verbatimConfig = ''
-        ''
+            clear_emulation_capabilities = ${boolToZeroOne cfg.libvirtd.clearEmulationCapabilities}
-        + optionalString (cfg.libvirtd.deviceACL != [ ]) ''
+          ''
-          cgroup_device_acl = [
+          + optionalString (cfg.libvirtd.deviceACL != [ ]) ''
-            ${aclString}
+            cgroup_device_acl = [
-          ]
+              ${aclString}
-        '';
+            ]
-        qemu.swtpm.enable = mkDefault true; # TPM 2.0
+          '';
+          swtpm.enable = mkDefault true; # TPM 2.0
+        };
       };
       spiceUSBRedirection.enable = mkDefault true;
     };

modules/nixos/virtualisation/iommu-groups.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 shopt -s nullglob
 for d in /sys/kernel/iommu_groups/*/devices/*; do
     n=${d#*/iommu_groups/*}; n=${n%%/*}

modules/nixos/virtualisation/kvmfr.nix

@@ -78,34 +78,32 @@ let
     };
   };
 
-  deviceType = (
+  deviceType = types.submodule (
-    types.submodule (
+    { config, options, ... }:
-      { config, options, ... }:
+    {
-      {
+      options = {
-        options = {
+        resolution = mkOption {
-          resolution = mkOption {
+          type = types.nullOr resolutionType;
-            type = types.nullOr resolutionType;
+          default = null;
-            default = null;
+          description = "Automatically calculate the minimum device size for a specific resolution. Overrides `size` if set.";
-            description = "Automatically calculate the minimum device size for a specific resolution. Overrides `size` if set.";
-          };
-
-          size = mkOption {
-            type = types.number;
-            description = "Size for the kvmfr device in megabytes.";
-          };
-
-          permissions = mkOption {
-            type = permissionsType;
-            default = { };
-            description = "Permissions of the kvmfr device.";
-          };
         };
 
-        config = {
+        size = mkOption {
-          size = mkIf (config.resolution != null) (sizeFromResolution config.resolution);
+          type = types.number;
+          description = "Size for the kvmfr device in megabytes.";
         };
-      }
+
-    )
+        permissions = mkOption {
+          type = permissionsType;
+          default = { };
+          description = "Permissions of the kvmfr device.";
+        };
+      };
+
+      config = {
+        size = mkIf (config.resolution != null) (sizeFromResolution config.resolution);
+      };
+    }
   );
 
   inherit (lib)
@@ -144,7 +142,7 @@ in
       '';
 
       "modprobe.d/kvmfr.conf".text = ''
-        options kvmfr static_size_mb=${concatStringsSep "," (map (size: toString size) deviceSizes)}
+        options kvmfr static_size_mb=${concatStringsSep "," (map toString deviceSizes)}
       '';
 
       "apparmor.d/local/abstractions/libvirt-qemu" = mkIf config.security.apparmor.enable {

modules/nixos/webPage/default.nix

@@ -2,7 +2,7 @@
 
 let
   cfg = config.services.webPage;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
   fqdn = if (cfg.subdomain != "") then "${cfg.subdomain}.${domain}" else domain;
   nginxUser = config.services.nginx.user;
 
@@ -41,7 +41,7 @@ in
   config = mkIf cfg.enable {
     services.nginx.virtualHosts."${fqdn}" = {
       enableACME = cfg.forceSSL;
-      forceSSL = cfg.forceSSL;
+      inherit (cfg) forceSSL;
       root = cfg.webRoot;
       locations."/".index = "index.html";
       sslCertificate = mkIf cfg.forceSSL "${config.security.acme.certs."${fqdn}".directory}/cert.pem";

modules/nixos/windows-oci/default.nix

@@ -81,90 +81,97 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = [ "d ${cfg.volume} 0755 root podman -" ];
+    systemd = {
+      tmpfiles.rules = [ "d ${cfg.volume} 0755 root podman -" ];
 
-    virtualisation.podman = {
+      services = {
-      enable = true;
+        "podman-windows" = {
-      autoPrune.enable = true;
+          serviceConfig = {
-      dockerCompat = true;
+            Restart = mkOverride 90 "always";
-      defaultNetwork.settings = {
+          };
-        dns_enabled = true;
+          after = [
+            "podman-network-windows_default.service"
+          ];
+          requires = [
+            "podman-network-windows_default.service"
+          ];
+          partOf = [
+            "podman-compose-windows-root.target"
+          ];
+          wantedBy = [
+            "podman-compose-windows-root.target"
+          ];
+        };
+
+        "podman-network-windows_default" = {
+          path = [ pkgs.podman ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStop = "podman network rm -f windows_default";
+          };
+          script = ''
+            podman network inspect windows_default || podman network create windows_default
+          '';
+          partOf = [ "podman-compose-windows-root.target" ];
+          wantedBy = [ "podman-compose-windows-root.target" ];
+        };
+      };
+
+      targets."podman-compose-windows-root" = {
+        unitConfig = {
+          Description = "Root target generated by compose2nix.";
+        };
+        wantedBy = [ "multi-user.target" ];
+      };
+    };
+
+    virtualisation = {
+      podman = {
+        enable = true;
+        autoPrune.enable = true;
+        dockerCompat = true;
+        defaultNetwork.settings = {
+          dns_enabled = true;
+        };
+      };
+
+      oci-containers = {
+        backend = "podman";
+        containers."windows" = {
+          image = "dockurr/windows";
+          environment = with cfg.settings; {
+            "VERSION" = version;
+            "RAM_SIZE" = ramSize;
+            "CPU_CORES" = cpuCores;
+            "DISK_SIZE" = diskSize;
+            "USERNAME" = username;
+            "PASSWORD" = password;
+            "REGION" = region;
+            "KEYBOARD" = keyboard;
+          };
+          volumes = [
+            "${cfg.volume}:/storage:rw"
+          ]
+          ++ optional (cfg.sharedVolume != null) "${cfg.sharedVolume}:/shared:rw";
+          ports = [
+            "8006:8006/tcp"
+            "3389:3389/tcp"
+            "3389:3389/udp"
+          ];
+          log-driver = "journald";
+          extraOptions = [
+            "--cap-add=NET_ADMIN"
+            "--device=/dev/kvm:/dev/kvm:rwm"
+            "--device=/dev/net/tun:/dev/net/tun:rwm"
+            "--network-alias=windows"
+            "--network=windows_default"
+          ];
+        };
       };
     };
 
     # https://github.com/NixOS/nixpkgs/issues/226365
     networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 ];
-
-    virtualisation.oci-containers.backend = "podman";
-
-    virtualisation.oci-containers.containers."windows" = {
-      image = "dockurr/windows";
-      environment = with cfg.settings; {
-        "VERSION" = version;
-        "RAM_SIZE" = ramSize;
-        "CPU_CORES" = cpuCores;
-        "DISK_SIZE" = diskSize;
-        "USERNAME" = username;
-        "PASSWORD" = password;
-        "LANGUAGE" = language;
-        "REGION" = region;
-        "KEYBOARD" = keyboard;
-      };
-      volumes = [
-        "${cfg.volume}:/storage:rw"
-      ]
-      ++ optional (cfg.sharedVolume != null) "${cfg.sharedVolume}:/shared:rw";
-      ports = [
-        "8006:8006/tcp"
-        "3389:3389/tcp"
-        "3389:3389/udp"
-      ];
-      log-driver = "journald";
-      extraOptions = [
-        "--cap-add=NET_ADMIN"
-        "--device=/dev/kvm:/dev/kvm:rwm"
-        "--device=/dev/net/tun:/dev/net/tun:rwm"
-        "--network-alias=windows"
-        "--network=windows_default"
-      ];
-    };
-    systemd.services."podman-windows" = {
-      serviceConfig = {
-        Restart = mkOverride 90 "always";
-      };
-      after = [
-        "podman-network-windows_default.service"
-      ];
-      requires = [
-        "podman-network-windows_default.service"
-      ];
-      partOf = [
-        "podman-compose-windows-root.target"
-      ];
-      wantedBy = [
-        "podman-compose-windows-root.target"
-      ];
-    };
-
-    systemd.services."podman-network-windows_default" = {
-      path = [ pkgs.podman ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStop = "podman network rm -f windows_default";
-      };
-      script = ''
-        podman network inspect windows_default || podman network create windows_default
-      '';
-      partOf = [ "podman-compose-windows-root.target" ];
-      wantedBy = [ "podman-compose-windows-root.target" ];
-    };
-
-    systemd.targets."podman-compose-windows-root" = {
-      unitConfig = {
-        Description = "Root target generated by compose2nix.";
-      };
-      wantedBy = [ "multi-user.target" ];
-    };
   };
 }

modules/shared/common/nix.nix

@@ -14,74 +14,78 @@ let
     ;
 in
 {
-  nix.package = mkDefault pkgs.nix;
+  nix = {
+    package = mkDefault pkgs.nix;
 
-  # for `nix run synix#foo`, `nix build synix#bar`, etc
+    # for `nix run synix#foo`, `nix build synix#bar`, etc
-  nix.registry = {
+    registry = {
-    synix = {
+      synix = {
-      from = {
+        from = {
-        id = "synix";
+          id = "synix";
-        type = "indirect";
+          type = "indirect";
-      };
+        };
-      to = {
+        to = {
-        owner = "sid";
+          owner = "sid";
-        repo = "synix";
+          repo = "synix";
-        host = "git.sid.ovh";
+          host = "git.sid.ovh";
-        type = "gitea";
+          type = "gitea";
+        };
       };
     };
-  };
 
-  nix.settings.warn-dirty = mkDefault false;
+    settings = {
+      warn-dirty = mkDefault false;
 
-  # fallback quickly if substituters are not available.
+      # fallback quickly if substituters are not available.
-  nix.settings.connect-timeout = mkDefault 5;
+      connect-timeout = mkDefault 5;
-  nix.settings.fallback = true;
+      fallback = true;
 
-  nix.settings.experimental-features = [
+      experimental-features = [
-    "nix-command"
+        "nix-command"
-    "flakes"
+        "flakes"
-  ]
+      ]
-  ++ optional (
+      ++ optional (
-    config.nix.package != null && versionOlder (versions.majorMinor config.nix.package.version) "2.22"
+        config.nix.package != null && versionOlder (versions.majorMinor config.nix.package.version) "2.22"
-  ) "repl-flake";
+      ) "repl-flake";
 
-  nix.settings.log-lines = mkDefault 25;
+      log-lines = mkDefault 25;
 
-  # avoid disk full issues
+      # avoid disk full issues
-  nix.settings.max-free = mkDefault (3000 * 1024 * 1024);
+      max-free = mkDefault (3000 * 1024 * 1024);
-  nix.settings.min-free = mkDefault (512 * 1024 * 1024);
+      min-free = mkDefault (512 * 1024 * 1024);
 
-  # avoid copying unnecessary stuff over SSH
+      # avoid copying unnecessary stuff over SSH
-  nix.settings.builders-use-substitutes = true;
+      builders-use-substitutes = true;
 
-  # workaround for https://github.com/NixOS/nix/issues/9574
+      # workaround for https://github.com/NixOS/nix/issues/9574
-  nix.settings.nix-path = config.nix.nixPath;
+      nix-path = config.nix.nixPath;
 
-  nix.settings.download-buffer-size = 524288000; # 500 MiB
+      download-buffer-size = 524288000; # 500 MiB
 
-  # add all wheel users to the trusted-users group
+      # add all wheel users to the trusted-users group
-  nix.settings.trusted-users = [
+      trusted-users = [
-    "@wheel"
+        "@wheel"
-  ];
+      ];
 
-  # binary caches
+      # binary caches
-  nix.settings.substituters = [
+      substituters = [
-    "https://cache.nixos.org"
+        "https://cache.nixos.org"
-    "https://nix-community.cachix.org"
+        "https://nix-community.cachix.org"
-    "https://cache.garnix.io"
+        "https://cache.garnix.io"
-    "https://numtide.cachix.org"
+        "https://numtide.cachix.org"
-  ];
+      ];
-  nix.settings.trusted-public-keys = [
+      trusted-public-keys = [
-    "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-    "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-    "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
+        "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-  ];
+      ];
+    };
 
-  nix.gc = {
+    gc = {
-    automatic = true;
+      automatic = true;
-    dates = "weekly";
+      dates = "weekly";
-    options = "--delete-older-than 30d";
+      options = "--delete-older-than 30d";
+    };
   };
 }

overlays/default.nix

@@ -9,11 +9,17 @@
 
   modifications = final: prev: {
     # https://github.com/NixOS/nixpkgs/issues/335003#issuecomment-2755803376
-    kicad = (
+    kicad = prev.kicad.override {
-      prev.kicad.override {
+      stable = true;
-        stable = true;
+    };
-      }
+
-    );
+    python312 = prev.python312.override {
+      packageOverrides = pyFinal: pyPrev: {
+        arxiv = pyPrev.arxiv.overridePythonAttrs (old: {
+          pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "requests" ];
+        });
+      };
+    };
 
     # bemenu is not a valid selector in v1.5.1
     rofi-rbw-wayland = prev.rofi-rbw-wayland.overrideAttrs (oldAttrs: {

pkgs/arxiv-mcp-server/default.nix

@@ -1,25 +1,28 @@
 {
   lib,
-  python3,
+  python312,
   fetchPypi,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  python = python312;
+in
+python.pkgs.buildPythonApplication rec {
   pname = "arxiv-mcp-server";
-  version = "0.4.12";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "arxiv_mcp_server";
     inherit version;
-    hash = "sha256-khY63SfUKgNjyACNESEQpY9q3uJSlLhuJBEaBKGmZy8=";
+    hash = "sha256-vxrKyq+uOgVYtWrvikcIidLra6n0GFlFvfKztrc7GH8=";
   };
 
   build-system = [
-    python3.pkgs.hatchling
+    python.pkgs.hatchling
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python.pkgs; [
     aiofiles
     aiohttp
     anyio
@@ -36,7 +39,7 @@ python3.pkgs.buildPythonApplication rec {
     uvicorn
   ];
 
-  optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python.pkgs; {
     test = [
       aioresponses
       pytest
@@ -48,6 +51,7 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRemoveDeps = [
     "black"
+    "mcp"
   ];
 
   pythonImportsCheck = [

pkgs/baibot/default.nix

@@ -11,17 +11,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "baibot";
-  version = "1.18.0";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "baibot";
     rev = "v${version}";
-    hash = "sha256-TwtN8tEml/z0Js78jjWzEYV58Dg8a5YKxdEU9hBDtNs=";
+    hash = "sha256-Fr1CvFocb/VAYQGykXXZ6CCfvC31bKB/tr1aoA4oIME=";
   };
 
-  useFetchCargoVendor = true;
+  cargoHash = "sha256-CNEkge585bzUUPMHCSJ1CAH5wx3Wttq9I3A3oqfBzis=";
-  cargoHash = "sha256-2TJsFT+I7JG1DauEOvB8HluMDb1vW0qXD/mzzSlAfew=";
+
+  cargoBuildFlags = "--ignore-rust-version";
+  cargoTestFlags = "--ignore-rust-version";
 
   nativeBuildInputs = [
     pkg-config

pkgs/fetcher-mcp/default.nix

@@ -12,11 +12,9 @@
 let
   revision = "1161";
 
-  chromium-headless-shell =
+  chromium-headless-shell = playwright-driver.passthru.components."chromium-headless-shell".overrideAttrs (old: {
-    playwright-driver.passthru.components."chromium-headless-shell".overrideAttrs
+    inherit revision;
-      (old: {
+  });
-        inherit revision;
-      });
 
   browsers-headless-only = linkFarm "playwright-browsers-headless-only" [
     {
@@ -62,7 +60,6 @@ buildNpmPackage {
     description = "MCP server for fetch web page content using Playwright headless browser";
     homepage = "https://github.com/jae-jae/fetcher-mcp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
     mainProgram = "fetcher-mcp";
     platforms = lib.platforms.all;
   };

pkgs/kicad-mcp/default.nix

@@ -35,8 +35,8 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mixelpixx";
     repo = "KiCAD-MCP-Server";
-    rev = "216d3f189d194cdd539b274264b8b7ec00cbb13e";
+    rev = "d765bfec78bec563b060c2eac5abd7e2c912ac43";
-    hash = "sha256-73yDzYlWMDnnytf/IcUuwQp/P7YYaxrNr+JsGrgMI40=";
+    hash = "sha256-i4wbtyfeWIitZxenLSKouFaJON/yyeCeSGtDFB97pBQ=";
   };
 
   npmDepsHash = "sha256-qR43NvSK28RLt5sL9BZQzSyFRszYMt2CC0wTs9jf/hU=";

pkgs/pass2bw/pass2bw.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [ "$#" -ne 2 ]; then
     echo "Usage: $0 <pass_storepath> <output_csv>"
     exit 1

templates/container/.gitignore

@@ -0,0 +1,5 @@
+.direnv/
+.envrc
+.pre-commit-config.yaml
+result
+target

templates/container/flake.nix

@@ -2,10 +2,10 @@
   description = "Container NixOS configurations";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
     synix.url = "git+https://git.sid.ovh/sid/synix.git?ref=release-25.11";
-    synix.imputs.nixpkgs.follows = "nixpkgs";
+    synix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -17,42 +17,62 @@
     let
       inherit (self) outputs;
 
-      system = "x86_64-linux";
+      systems = [
+        "x86_64-linux"
+      ];
 
-      lib = nixpkgs.lib.extend (final: prev: inputs.synix.lib or { });
+      lib = nixpkgs.lib.extend (_final: _prev: inputs.synix.lib or { });
-    in
-    {
-      packages =
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        import ./pkgs { inherit pkgs; };
 
-      overlays = import ./overlays { inherit (self) inputs; };
+      inherit (lib.helpers) mkPkgs;
 
-      devShells =
+      forAllSystems =
-        let
+        function:
-          pkgs = nixpkgs.legacyPackages.${system};
+        lib.genAttrs systems (
-        in
+          system:
-        {
+          function (mkPkgs {
-          default = pkgs.mkShell {
+            inherit system;
-            buildInputs = with pkgs; [
+          })
-              nixos-container
+        );
-              tmux
-            ];
-          };
-        };
 
-      nixosModules = import ./modules;
+      mkNixosConfiguration =
-
+        system: modules:
-      nixosConfigurations = {
+        nixpkgs.lib.nixosSystem {
-        container = nixpkgs.lib.nixosSystem {
+          inherit system modules;
-          inherit system;
-          modules = [ ./config ];
           specialArgs = {
             inherit inputs outputs lib;
           };
         };
+    in
+    {
+      packages = forAllSystems (pkgs: import ./pkgs { inherit pkgs; });
+
+      overlays = import ./overlays { inherit (self) inputs; };
+
+      devShells = forAllSystems (pkgs: {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            nixos-container
+            tmux
+          ];
+        };
+      });
+
+      nixosModules = import ./modules;
+
+      nixosConfigurations = {
+        container = mkNixosConfiguration "x86_64-linux" [ ./config ];
       };
+
+      checks = forAllSystems (
+        pkgs:
+        let
+          inherit (pkgs.stdenv.hostPlatform) system;
+        in
+        {
+          inherit (inputs.synix.checks.${system}) pre-commit-check build-additions build-modifications;
+        }
+      );
+
+      inherit (inputs.synix) formatter;
     };
 }

templates/dev/c-hello/.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

templates/dev/c-hello/.github/workflows/c-nix.yml

@@ -1,10 +1,7 @@
+---
 name: C Nix Pipeline
 
-on:
+on:  # yamllint disable-line
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   build-and-test:
@@ -12,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Set up Nix
+      - name: Set up Nix
-      uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v18
-      with:
+        with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-    - name: Run nix flake check
+      - name: Run nix flake check
-      run: nix flake check
+        run: nix flake check

templates/dev/c-hello/build.sh

@@ -1,2 +1,3 @@
+#!/usr/bin/env bash
 make clean
 bear --output build/compile_commands.json -- make all

templates/dev/c-hello/flake.nix

@@ -81,7 +81,7 @@
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check) config;
           inherit (config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}

templates/dev/esp-blink/.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

templates/dev/esp-blink/flake.nix

@@ -56,7 +56,7 @@
           pkgs = nixpkgsFor.${system};
         in
         {
-          default = esp.devShells."${system}".default;
+          inherit (esp.devShells."${system}") default;
         }
       );
 
@@ -64,7 +64,7 @@
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check) config;
           inherit (config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}

templates/dev/esp-blink/main/idf_component.yml

@@ -1,2 +1,3 @@
+---
 dependencies:
   espressif/led_strip: "^3.0.0"

templates/dev/flask-hello/.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

templates/dev/flask-hello/.github/workflows/python-nix.yml

@@ -1,10 +1,7 @@
+---
 name: Python Nix Pipeline
 
-on:
+on:  # yamllint disable-line
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   build-and-test:
@@ -12,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Set up Nix
+      - name: Set up Nix
-      uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v18
-      with:
+        with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-    - name: Run nix flake check
+      - name: Run nix flake check
-      run: nix flake check
+        run: nix flake check

templates/dev/flask-hello/flake.nix

@@ -54,7 +54,7 @@
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check) config;
           inherit (config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}

templates/dev/flask-hello/nix/module.nix

@@ -8,7 +8,7 @@
 
 let
   cfg = config.services.flask_hello;
-  domain = config.networking.domain;
+  inherit (config.networking) domain;
   fqdn = if (cfg.nginx.subdomain != "") then "${cfg.nginx.subdomain}.${domain}" else domain;
 
   python-with-packages = pkgs.python3.withPackages (
@@ -109,7 +109,7 @@ in
     users.users."${cfg.user}" = {
       home = "/var/lib/${cfg.user}";
       isSystemUser = true;
-      group = cfg.group;
+      inherit (cfg) group;
     };
     users.groups."${cfg.group}" = { };
 

templates/dev/py-hello/.github/workflows/python-nix.yml

@@ -1,10 +1,7 @@
+---
 name: Python Nix Pipeline
 
-on:
+on:  # yamllint disable-line
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   build-and-test:
@@ -12,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Set up Nix
+      - name: Set up Nix
-      uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v18
-      with:
+        with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-    - name: Run nix flake check
+      - name: Run nix flake check
-      run: nix flake check
+        run: nix flake check

templates/dev/py-hello/flake.nix

@@ -105,7 +105,7 @@
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check) config;
           inherit (config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}

templates/dev/rs-hello/.github/workflows/rust-nix.yml

@@ -1,10 +1,7 @@
+---
 name: Rust Nix Pipeline
 
-on:
+on:  # yamllint disable-line
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   build-and-test:
@@ -12,15 +9,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Set up Nix
+      - name: Set up Nix
-      uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v18
-      with:
+        with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-    - name: Run cargo tests in dev shell
+      - name: Run cargo tests in dev shell
-      run: nix develop --command bash -c "cargo test"
+        run: nix develop --command bash -c "cargo test"
 
-    - name: Run nix flake check
+      - name: Run nix flake check
-      run: nix flake check
+        run: nix flake check

templates/dev/rs-hello/flake.nix

@@ -76,7 +76,7 @@
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
+          inherit (self.checks.${system}.pre-commit-check) config;
           inherit (config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}

templates/dev/stm32-blink/.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

templates/microvm/.envrc

@@ -1 +1,2 @@
+# shellcheck shell=bash
 use flake

templates/microvm/flake.nix

@@ -2,13 +2,13 @@
   description = "MicroVM NixOS configurations";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
     microvm.url = "github:microvm-nix/microvm.nix";
     microvm.inputs.nixpkgs.follows = "nixpkgs";
 
     synix.url = "git+https://git.sid.ovh/sid/synix.git?ref=release-25.11";
-    synix.imputs.nixpkgs.follows = "nixpkgs";
+    synix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -20,20 +20,22 @@
     let
       inherit (self) outputs;
 
-      supportedSystems = [
+      systems = [
         "x86_64-linux"
-        "aarch64-linux"
       ];
 
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      lib = nixpkgs.lib.extend (_final: _prev: inputs.synix.lib or { });
 
-      lib = nixpkgs.lib.extend (final: prev: inputs.synix.lib or { });
+      inherit (lib.helpers) mkPkgs;
 
-      mkApp = program: description: {
+      forAllSystems =
-        type = "app";
+        function:
-        inherit program;
+        lib.genAttrs systems (
-        meta.description = description;
+          system:
-      };
+          function (mkPkgs {
+            inherit system;
+          })
+        );
 
       mkNixosConfiguration =
         system: modules:
@@ -43,13 +45,20 @@
             inherit inputs outputs lib;
           };
         };
+
+      mkApp = program: description: {
+        type = "app";
+        inherit program;
+        meta.description = description;
+      };
     in
     {
       apps = forAllSystems (
-        system:
+        pkgs:
         let
-          microvm = self.nixosConfigurations."microvm-${system}".config.microvm;
+          inherit (pkgs.stdenv.hostPlatform) system;
-          inherit (nixpkgs.lib) getExe;
+          inherit (self.nixosConfigurations."microvm-${system}".config) microvm;
+          inherit (pkgs.lib) getExe;
         in
         {
           rebuild = mkApp (getExe microvm.deploy.rebuild) "Rebuild the VM.";
@@ -57,34 +66,22 @@
         }
       );
 
-      packages = forAllSystems (
+      packages = forAllSystems (pkgs: import ./pkgs { inherit pkgs; });
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        import ./pkgs { inherit pkgs; }
-      );
 
       overlays = import ./overlays { inherit (self) inputs; };
 
-      devShells = forAllSystems (
+      devShells = forAllSystems (pkgs: {
-        system:
+        default = pkgs.mkShell {
-        let
+          buildInputs = with pkgs; [
-          pkgs = nixpkgs.legacyPackages.${system};
+            tmux
-        in
+          ];
-        {
+        };
-          default = pkgs.mkShell {
+        # FIXME: `microvm.deploy.rebuild` does not seem to care about askpass
-            buildInputs = with pkgs; [
+        # shellHook = ''
-              tmux
+        #   export SSH_ASKPASS="pass <SUDO_BUILD_HOST_PASSWORD>"
-            ];
+        #   export SSH_ASKPASS_REQUIRE="force"
-          };
+        # '';
-          # FIXME: `microvm.deploy.rebuild` does not seem to care about askpass
+      });
-          # shellHook = ''
-          #   export SSH_ASKPASS="pass <SUDO_BUILD_HOST_PASSWORD>"
-          #   export SSH_ASKPASS_REQUIRE="force"
-          # '';
-        }
-      );
 
       nixosModules = import ./modules;
 
@@ -92,5 +89,17 @@
         microvm-x86_64-linux = mkNixosConfiguration "x86_64-linux" [ ./config ];
         microvm-aarch64-linux = mkNixosConfiguration "aarch64-linux" [ ./config ];
       };
+
+      checks = forAllSystems (
+        pkgs:
+        let
+          inherit (pkgs.stdenv.hostPlatform) system;
+        in
+        {
+          inherit (inputs.synix.checks.${system}) pre-commit-check build-additions build-modifications;
+        }
+      );
+
+      inherit (inputs.synix) formatter;
     };
 }

templates/nix-configs/hetzner-amd/.gitignore

@@ -0,0 +1,5 @@
+.direnv/
+.envrc
+.pre-commit-config.yaml
+result
+target

templates/nix-configs/hetzner-amd/flake.nix

@@ -5,10 +5,7 @@
     nixpkgs-old-stable.url = "github:nixos/nixpkgs/nixos-25.05";
 
     synix.url = "git+https://git.sid.ovh/sid/synix.git?ref=release-25.11";
-    synix.imputs.nixpkgs.follows = "nixpkgs";
+    synix.inputs.nixpkgs.follows = "nixpkgs";
-
-    git-hooks.url = "github:cachix/git-hooks.nix";
-    git-hooks.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -20,14 +17,22 @@
     let
       inherit (self) outputs;
 
-      supportedSystems = [
+      systems = [
         "x86_64-linux"
-        "aarch64-linux"
       ];
 
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      lib = nixpkgs.lib.extend (_final: _prev: inputs.synix.lib or { });
 
-      lib = nixpkgs.lib.extend (final: prev: inputs.synix.lib or { });
+      inherit (lib.helpers) mkPkgs;
+
+      forAllSystems =
+        function:
+        lib.genAttrs systems (
+          system:
+          function (mkPkgs {
+            inherit system;
+          })
+        );
 
       mkNixosConfiguration =
         system: modules:
@@ -39,7 +44,7 @@
         };
     in
     {
-      packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+      packages = forAllSystems (pkgs: import ./pkgs { inherit pkgs; });
 
       overlays = import ./overlays { inherit inputs; };
 
@@ -49,41 +54,26 @@
         HOSTNAME = mkNixosConfiguration "x86_64-linux" [ ./hosts/HOSTNAME ];
       };
 
-      formatter = forAllSystems (
+      devShells = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
+          inherit (pkgs.stdenv.hostPlatform) system;
-          config = self.checks.${system}.pre-commit-check.config;
-          inherit (config) package configFile;
-          script = ''
-            ${pkgs.lib.getExe package} run --all-files --config ${configFile}
-          '';
         in
-        pkgs.writeShellScriptBin "pre-commit-run" script
+        {
+          default = inputs.synix.devShells.${system}.nix-config;
+        }
       );
 
       checks = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
+          inherit (pkgs.stdenv.hostPlatform) system;
-          flakePkgs = self.packages.${system};
-          overlaidPkgs = import nixpkgs {
-            inherit system;
-            overlays = [ self.overlays.modifications ];
-          };
         in
         {
-          pre-commit-check = inputs.git-hooks.lib.${system}.run {
+          inherit (inputs.synix.checks.${system}) pre-commit-check build-additions build-modifications;
-            src = ./.;
-            hooks = {
-              nixfmt.enable = true;
-            };
-          };
-          build-packages = pkgs.linkFarm "flake-packages-${system}" flakePkgs;
-          build-overlays = pkgs.linkFarm "flake-overlays-${system}" {
-            # package = overlaidPkgs.package;
-          };
         }
       );
+
+      inherit (inputs.synix) formatter;
     };
 }

templates/nix-configs/hetzner-amd/hosts/HOSTNAME/hardware.nix

@@ -11,20 +11,22 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot = {
-    "ahci"
+    initrd.availableKernelModules = [
-    "nvme"
+      "ahci"
-    "sd_mod"
+      "nvme"
-    "sdhci_pci"
+      "sd_mod"
-    "sr_mod"
+      "sdhci_pci"
-    "usb_storage"
+      "sr_mod"
-    "virtio_pci"
+      "usb_storage"
-    "virtio_scsi"
+      "virtio_pci"
-    "xhci_pci"
+      "virtio_scsi"
-  ];
+      "xhci_pci"
-  boot.initrd.kernelModules = [ ];
+    ];
-  boot.kernelModules = [ ];
+    initrd.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+    kernelModules = [ ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/ROOT";

templates/nix-configs/hyprland/.gitignore

@@ -0,0 +1,5 @@
+.direnv/
+.envrc
+.pre-commit-config.yaml
+result
+target