feat: update compose submodule for Hermes fork Dockerfile

2026-05-10 17:56:28 -04:00
19 changed files with 88 additions and 669 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "assets/compose"]
 	path = assets/compose
 	url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
-[submodule "assets/dotfiles"]
-	path = assets/dotfiles
-	url = ssh://git@code.lazyworkhorse.net:2222/gortium/dotfiles.git
--- a/assets/compose
+++ b/assets/compose
--- a/flake.lock
+++ b/flake.lock
@@ -23,22 +23,6 @@
        "type": "github"
      }
    },
-    "argononed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729566243,
-        "narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
-        "owner": "nvmd",
-        "repo": "argononed",
-        "rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvmd",
-        "repo": "argononed",
-        "type": "github"
-      }
-    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -53,21 +37,6 @@
        "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
      }
    },
-    "flake-compat_2": {
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -175,80 +144,6 @@
        "type": "github"
      }
    },
-    "nixos-images": {
-      "inputs": {
-        "nixos-stable": [
-          "nixos-raspberrypi",
-          "nixpkgs"
-        ],
-        "nixos-unstable": [
-          "nixos-raspberrypi",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747747741,
-        "narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
-        "owner": "nvmd",
-        "repo": "nixos-images",
-        "rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvmd",
-        "ref": "sdimage-installer",
-        "repo": "nixos-images",
-        "type": "github"
-      }
-    },
-    "nixos-raspberrypi": {
-      "inputs": {
-        "argononed": "argononed",
-        "flake-compat": "flake-compat_2",
-        "nixos-images": "nixos-images",
-        "nixpkgs": [
-          "nixpkgs-uconsole"
-        ]
-      },
-      "locked": {
-        "lastModified": 1781324200,
-        "narHash": "sha256-JWqxN2Yle86+4Q+GFh12SvB92ZyLeqalVsN9lfMh6eQ=",
-        "owner": "gortium",
-        "repo": "nixos-raspberrypi",
-        "rev": "721a6e9e67dca3a23133db650b87018646bca3e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gortium",
-        "ref": "cm5-cross-v1",
-        "repo": "nixos-raspberrypi",
-        "type": "github"
-      }
-    },
-    "nixos-uconsole": {
-      "inputs": {
-        "nixos-raspberrypi": [
-          "nixos-raspberrypi"
-        ],
-        "nixpkgs": [
-          "nixpkgs-uconsole"
-        ]
-      },
-      "locked": {
-        "lastModified": 1781476310,
-        "narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
-        "owner": "gortium",
-        "repo": "nixos-uconsole",
-        "rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gortium",
-        "ref": "pr/dcs-panel-detection",
-        "repo": "nixos-uconsole",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1705033721,
@@ -281,22 +176,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-uconsole": {
-      "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1774386573,
@@ -333,10 +212,7 @@
      "inputs": {
        "agenix": "agenix",
        "lix": "lix",
-        "nixos-raspberrypi": "nixos-raspberrypi",
-        "nixos-uconsole": "nixos-uconsole",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-uconsole": "nixpkgs-uconsole"
+        "nixpkgs": "nixpkgs_2"
      }
    },
    "systems": {
--- a/flake.nix
+++ b/flake.nix
@@ -12,21 +12,10 @@
      url = "git+https://git.lix.systems/lix-project/lix?ref=main";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
-    nixos-uconsole = {
-      url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
-      inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
-    };
-    nixos-raspberrypi = {
-      url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
-    };
+    self.submodules = true;
  };

-  outputs = { self, nixpkgs, agenix, lix
-            , nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
-            , ... }@inputs:
+  outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
    let
      system = "x86_64-linux";
      keys = import ./lib/keys.nix;
@@ -41,159 +30,56 @@
      pkgs = import nixpkgs {
        inherit system overlays;
        config.allowUnfree = true;
-        config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
+        config.permittedInsecurePackages = [
+          "openclaw-2026.3.12"
+        ];
      };
+
      devShell = import ./shells/nix_dev.nix {
        inherit pkgs system agenix;
      };
-    in {
-      nixosConfigurations = {
-        lazyworkhorse = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit system self keys paths inputs; };
-          modules = [
-            {
-              nixpkgs.overlays = overlays;
-              nixpkgs.config.allowUnfree = true;
-              nixpkgs.config.rocmSupport = true;
-              nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
-              nix.package = lix.packages.${system}.default;
-            }
-            agenix.nixosModules.default
-            ./hosts/lazyworkhorse/configuration.nix
-            ./hosts/lazyworkhorse/hardware-configuration.nix
-            ./modules/nixos/filesystem/hoardingcow-mount.nix
-            ./modules/nixos/services/docker_manager.nix
-            ./modules/nixos/services/open_code_server.nix
-            ./modules/nixos/services/ollama_init_custom_models.nix
-            ./modules/nixos/services/openclaw_node.nix
-            ./modules/nixos/security/ai-worker-restricted.nix
-            ./users/gortium.nix
-            ./users/ai-worker.nix
-          ];
-        };
-
-        cyt-pi = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit self keys paths inputs; };
-          modules = [
-            {
-              nixpkgs.overlays = overlays;
-              nixpkgs.config.allowUnfree = true;
-              nixpkgs.hostPlatform = "aarch64-linux";
-              nix.package = lix.packages."aarch64-linux".default;
-            }
-            ./hosts/cyt-pi/configuration.nix
-            ./hosts/cyt-pi/hardware-configuration.nix
-          ];
-        };
-
-        uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
-          system = "aarch64-linux";
-          specialArgs = {
-            inherit self keys paths inputs;
-            nixos-raspberrypi = nixos-raspberrypi;
-            isCM4 = false;
+    in
+      {
+        nixosConfigurations = {
+          lazyworkhorse = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit system self keys paths inputs; };
+            modules = [
+              {
+                nixpkgs.overlays = overlays;
+                nixpkgs.config.allowUnfree = true;
+                nixpkgs.config.rocmSupport = true;
+                nixpkgs.config.permittedInsecurePackages = [
+                  "openclaw-2026.3.12"
+                ];
+                nix.package = lix.packages.${system}.default;
+              }
+              agenix.nixosModules.default
+              ./hosts/lazyworkhorse/configuration.nix
+              ./hosts/lazyworkhorse/hardware-configuration.nix
+              ./modules/nixos/filesystem/hoardingcow-mount.nix
+              ./modules/nixos/services/docker_manager.nix
+              ./modules/nixos/services/open_code_server.nix
+              ./modules/nixos/services/ollama_init_custom_models.nix
+              ./modules/nixos/services/openclaw_node.nix
+              ./users/gortium.nix
+              ./users/ai-worker.nix
+            ];
          };
-          modules = [
-            {
-              nixpkgs.buildPlatform = "x86_64-linux";
-              nixpkgs.hostPlatform = "aarch64-linux";
-              nixpkgs.config.allowUnfree = true;
-              boot.loader.raspberry-pi.bootloader = "kernel";
-              # Kill camera packages — not needed on uConsole, break cross-compile
-              nixpkgs.overlays = [
-                # Make camera packages "unavailable" so no pkgs depend on them
-                (final: prev: {
-                  libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
-                  libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
-                  libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
-                  # Pipewire in nixos-25.11 has libcamera unconditionally in buildInputs;
-                  # meta.platforms trick doesn't help — must actually remove it
-                  pipewire = prev.pipewire.overrideAttrs (old: {
-                    buildInputs = builtins.filter
-                      (x: !(x?pname && x.pname == "libcamera"))
-                      (old.buildInputs or []);
-                    mesonFlags = builtins.filter
-                      (flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
-                      (old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
-                  });
-                  # gjs cross-compile fails without GTK; skip intro tests
-                  gjs = prev.gjs.overrideAttrs (old: {
-                    mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
-                  });
-                  # Qt6Quick missing from aarch64 qtdeclarative cross-compile;
-                  # skip qtutils runtime deps — Hyprland only needs it for QML UI
-                  hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
-                  # hyprwayland-scanner not found by cross pkg-config wrapper
-                  xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
-                    preConfigure = (old.preConfigure or "") + ''
-                      # Point cmake to the correct hyprwayland-scanner pkgconfig
-                      cmakeFlags="$cmakeFlags -Dhyprwayland-scanner_DIR=${prev.buildPackages.hyprwayland-scanner}/lib/cmake/hyprwayland-scanner" 2>/dev/null || true
-                      export PKG_CONFIG_PATH="${prev.buildPackages.hyprwayland-scanner}/lib/pkgconfig:$PKG_CONFIG_PATH"
-                    '';
-                  });
-                })
-              ];
-            }
-            nixos-raspberrypi.nixosModules.nixpkgs-rpi
-            # Disable libcamera in rpi pipewire too (separate nixpkgs instance)
-            ({ config, lib, pkgs, ... }: {
-              nixpkgs.overlays = [
-                (final: prev: {
-                  pipewire = prev.pipewire.overrideAttrs (old: {
-                    buildInputs = builtins.filter
-                      (x: !(x?pname && x.pname == "libcamera"))
-                      (old.buildInputs or []);
-                    mesonFlags = builtins.filter
-                      (flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
-                      (old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
-                  });
-                })
-              ];
-            })

-# Patches are now in gortium/nixos-uconsole fork (pr/dcs-panel-detection branch)
-            nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-            nixos-raspberrypi.lib.inject-overlays
-            nixos-raspberrypi.lib.inject-overlays-global
-            nixos-uconsole.nixosModules.uconsole-cm5
-            ({ config, lib, pkgs, inputs, ... }: let
-              lix-cross = import inputs.nixpkgs-uconsole {
-                localSystem = { system = "x86_64-linux"; };
-                crossSystem = { system = "aarch64-linux"; };
-                overlays = [ inputs.lix.overlays.default ];
-              };
-            in { nix.package = lix-cross.lix; })
-            agenix.nixosModules.default
-            ./hosts/uconsole-cm5/configuration.nix
-            ./hosts/uconsole-cm5/hardware-configuration.nix
-          ];
-        };
-      };
-
-      devShells.${system}.default = devShell;
-
-      packages.${system} = {
-        uconsole-cm5-image = (nixos-raspberrypi.lib.nixosSystem {
-          system = "aarch64-linux";
-          specialArgs = {
-            inherit self keys inputs;
-            nixos-raspberrypi = nixos-raspberrypi;
-            isCM4 = false;
+          cyt-pi = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit self keys paths inputs; };
+            modules = [
+              {
+                nixpkgs.overlays = overlays;
+                nixpkgs.config.allowUnfree = true;
+                nixpkgs.hostPlatform = "aarch64-linux";
+                nix.package = lix.packages."aarch64-linux".default;
+              }
+              ./hosts/cyt-pi/configuration.nix
+              ./hosts/cyt-pi/hardware-configuration.nix
+            ];
          };
-          modules = [
-            {
-              nixpkgs.buildPlatform = system;
-              nixpkgs.hostPlatform = "aarch64-linux";
-            }
-            nixos-raspberrypi.nixosModules.nixpkgs-rpi
-            nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-            nixos-raspberrypi.lib.inject-overlays-global
-            nixos-raspberrypi.nixosModules.sd-image
-            nixos-uconsole.nixosModules.uconsole-cm5
-            agenix.nixosModules.default
-            ./hosts/uconsole-cm5/configuration.nix
-          ];
-        }).config.system.build.sdImage;
+        };
+        devShells.${system}.default = devShell;
      };
-    };
 }
--- a/hosts/lazyworkhorse/configuration.nix
+++ b/hosts/lazyworkhorse/configuration.nix
@@ -9,7 +9,7 @@
  hoardingcow-mount.enable = true;

  # Flakesss
-  nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
+  nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
  nix.settings.trusted-users = [ "root" "gortium" ];

  # Garbage collection
@@ -207,7 +207,6 @@
    ai = {
      path = self + "/assets/compose/ai";
      envFile = config.age.secrets.containers_env.path;
-      ports = [ 22000 ];  # Syncthing TCP sync
    };

    cloudstorage = {
@@ -475,7 +474,7 @@
  services.openssh.settings = {
    PermitRootLogin = "no";
    MaxAuthTries = 3;
-    MaxSessions = 20;
+    MaxSessions = 10;
    LoginGraceTime = 30;
    ClientAliveInterval = 300;
    ClientAliveCountMax = 2;
--- a/hosts/uconsole-cm5/configuration.nix
+++ b/hosts/uconsole-cm5/configuration.nix
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, keys, ... }:
-
-{
-  networking.hostName = "uConsole";
-  time.timeZone = "America/Montreal";
-  i18n.defaultLocale = "en_CA.UTF-8";
-  system.stateVersion = "25.11";
-
-  # SSH — root access avec clés gortium + ai-worker
-  services.openssh = {
-    enable = true;
-    settings = {
-      PermitRootLogin = lib.mkForce "prohibit-password";
-      PasswordAuthentication = lib.mkForce false;
-    };
-  };
-
-  users.users.root.openssh.authorizedKeys.keys = with keys; [
-    users.gortium.main
-    users.ai-worker.main
-  ];
-
-  # WiFi via NetworkManager + secret agenix
-  networking.networkmanager.enable = true;
-
-  # Firmware
-  hardware.enableRedistributableFirmware = true;
-
-  # Hyprland Wayland compositor (manual start — no SDDM)
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
-
-
-}
--- a/hosts/uconsole-cm5/hardware-configuration.nix
+++ b/hosts/uconsole-cm5/hardware-configuration.nix
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
-  boot.initrd.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # SD card partitions (nixos-uconsole layout)
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXOS_SD";
-    fsType = "ext4";
-    options = [ "noatime" ];
-  };
-
-  fileSystems."/boot/firmware" = {
-    device = "/dev/disk/by-label/FIRMWARE";
-    fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
-  };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  hardware.enableRedistributableFirmware = true;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-}
--- a/modules/nixos/security/README-ai-worker.md
+++ b/modules/nixos/security/README-ai-worker.md
@@ -1,105 +0,0 @@
-# AI Worker Restricted Access
-
-This module provides SSH access for the AI worker (hermes-agent) to run ollama benchmarks on the host.
-
-## Security Model
-
-The `ai-worker` user has:
-
-### Filesystem Access
- **Home directory**: `/home/ai-worker` (standard user home)
- **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
- **Cannot access**: Any files outside standard system paths
-
-### Sudo Access
- **NONE**: ai-worker has no sudo privileges
- Cannot run `nh`, `nixos-rebuild`, `nixpkgs-fmt`, or `nix` with elevated permissions
-
-### Docker Access
- Member of `docker` group - can run `docker` and `docker exec` commands
- Primary use: `docker exec ollama ollama ...` for benchmarking
- Can run `docker exec --privileged ollama rocm-smi ...` for VRAM monitoring
-
-## Workflow: SSH + Docker Benchmarking
-
-The AI worker connects from the Hermes container to the host via SSH, runs ollama benchmarks, then returns to save results.
-
-### Example Workflow
-
-```bash
-# From Hermes container, SSH to host
-ssh -i /path/to/ssh/key ai-worker@host.docker.internal
-
-# On host, run ollama benchmarks via docker
-docker exec ollama ollama pull devstral-small-2:24b
-
-# Create test modelfile
-docker exec ollama bash -c 'cat <<EOF > /root/.ollama/test.modelfile
-FROM devstral-small-2:24b
-PARAMETER num_ctx 65536
-PARAMETER num_gpu 99
-PARAMETER flash_attn true
-EOF'
-
-# Create and test model
-docker exec ollama ollama create test-model -f /root/.ollama/test.modelfile
-docker exec ollama ollama run test-model "Write a Python async function"
-
-# Check VRAM usage
-docker exec --privileged ollama rocm-smi --showmeminfo vram
-
-# Cleanup
-docker exec ollama ollama rm test-model
-
-# Exit SSH, return to Hermes container
-exit
-
-# Save results in Hermes container
-# /opt/data/ai-optimizer/state.json
-# /opt/data/ai-optimizer/results.csv
-```
-
-## SSH Access
-
-Connect as:
-```bash
-ssh ai-worker@lazyworkhorse
-```
-
-The working directory will be `/home/ai-worker`. No infra repo access.
-
-## Verification
-
-Check ai-worker permissions:
-```bash
-# On the host, as root or gortium:
-sudo -u ai-worker sudo -l
-# Should show: no sudo access
-
-# Check docker group membership
-groups ai-worker
-# Should show: ai-worker docker
-```
-
-## Troubleshooting
-
-If ai-worker cannot run docker commands:
-```bash
-# Check docker group membership
-groups ai-worker
-
-# Verify ollama container is running
-docker ps | grep ollama
-
-# Test docker access
-sudo -u ai-worker docker exec ollama ollama list
-```
-
-If SSH connection fails:
-```bash
-# Check SSH key is authorized
-cat /home/ai-worker/.ssh/authorized_keys
-
-# Check SSH service
-systemctl status sshd
-```
--- a/modules/nixos/security/ai-worker-restricted.nix
+++ b/modules/nixos/security/ai-worker-restricted.nix
@@ -1,17 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-  options.services.aiWorkerAccess = mkOption {
-    type = types.bool;
-    default = false;
-    description = "Enable AI worker SSH access with docker group membership for ollama benchmarking";
-  };
-
-  config = mkIf config.services.aiWorkerAccess {
-    # ai-worker is member of docker group - can run docker commands via SSH
-    # No bind mounts, no sudo access - docker-only for ollama benchmarking
-    users.groups.docker.members = [ "ai-worker" ];
-  };
-}
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./dotfiles.nix
-    ./systemd
-  ];
-}
--- a/modules/nixos/services/dotfiles.nix
+++ b/modules/nixos/services/dotfiles.nix
@@ -1,69 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.dotfiles;
-  stowDir = cfg.stowDir;
-
-  # Function to recursively find all files in a directory
-  findFiles = dir:
-    let
-      files = builtins.attrNames (builtins.readDir dir);
-    in
-      concatMap (name:
-        let
-          path = dir + "/${name}";
-        in
-          if (builtins.typeOf (builtins.readDir path) == "set")
-          then findFiles path
-          else [ path ]
-      ) files;
-
-  # Get a list of all packages (directories) in the stow directory
-  stowPackages = builtins.attrNames (builtins.readDir stowDir);
-
-  # Create an attribute set where each attribute is a package name
-  # and the value is a list of files to be linked.
-  homeManagerLinks = listToAttrs (map (pkg:
-    let
-      pkgPath = stowDir + "/${pkg}";
-      files = findFiles pkgPath;
-    in
-      nameValuePair pkg (map (file: {
-        source = file;
-        target = removePrefix (pkgPath + "/") file;
-      }) files)
-  ) stowPackages);
-
-in
-{
-  options.services.dotfiles = {
-    enable = mkEnableOption "Enable dotfiles management";
-
-    stowDir = mkOption {
-      type = types.path;
-      description = "The directory where your stow packages are located.";
-    };
-
-    user = mkOption {
-      type = types.str;
-      description = "The user to manage dotfiles for.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home-manager.users.${cfg.user} = {
-      home.file =
-        let
-          allFiles = concatLists (attrValues homeManagerLinks);
-        in
-          listToAttrs (map (file:
-            nameValuePair file.target {
-              source = file.source;
-            }
-          ) allFiles);
-    };
-  };
-}
-
--- a/modules/nixos/services/ollama_init_custom_models.nix
+++ b/modules/nixos/services/ollama_init_custom_models.nix
@@ -1,87 +1,67 @@
 { pkgs, ... }: {
  systemd.services.init-ollama-model = {
    description = "Initialize LLM models with extra context in Ollama Docker";
-    
-    # On s'assure que Docker tourne avant de lancer ce script
-    after = [ "docker.service" ];
+    after = [ "docker-ollama.service" ];
    wantedBy = [ "multi-user.target" ];
-    
    script = ''
-      # Fonction de création asynchrone pour ne pas bloquer le démarrage
-      (
-        echo "Starting asynchronous Ollama initialization..."
-        
-        # Attente d'Ollama (maximum 120 secondes pour éviter une boucle infinie)
-        TIMEOUT=60
-        COUNT=0
-        while ! ${pkgs.curl}/bin/curl -s -f http://127.0.0.1:11434/api/tags > /dev/null; do
-          if [ $COUNT -ge $TIMEOUT ]; then
-            echo "Ollama did not become ready in time. Exiting."
-            exit 1
-          fi
-          echo "Waiting for Ollama API to be reachable..."
-          sleep 5
-          COUNT=$((COUNT + 5))
-        done
+      # Wait for Ollama
+      while ! ${pkgs.curl}/bin/curl -s http://localhost:11434/api/tags > /dev/null; do
+        sleep 2
+      done

-        create_model_if_missing() {
-          local model_name=$1
-          local base_model=$2
+      create_model_if_missing() {
+        local model_name=$1
+        local base_model=$2
+        if ! ${pkgs.docker}/bin/docker exec ollama ollama list | grep -q "$model_name"; then
+          echo "$model_name not found, creating from $base_model..."
          
-          # Vérification robuste via l'API HTTP d'Ollama plutôt que docker exec (évite les conflits de tty)
-          if ! ${pkgs.curl}/bin/curl -s http://127.0.0.1:11434/api/tags | ${pkgs.jq}/bin/jq -e ".models[] | select(.name == \"$model_name\")" > /dev/null; then
-            echo "$model_name not found, creating from $base_model..."
-            
-            # Utilisation d'un fichier temporaire sur l'hôte pour l'injecter proprement dans Docker
-            TMP_FILE=$(mktemp)
-            cat <<EOF > "$TMP_FILE"
+          # We use a custom TEMPLATE block to strip the 'currentDate' function 
+          # which is unsupported in Ollama 0.5.7 but present in Devstral's default manifest.
+          ${pkgs.docker}/bin/docker exec ollama sh -c "cat <<EOF > /root/.ollama/$model_name.modelfile
 FROM $base_model
-TEMPLATE """{{- if .System }}
+TEMPLATE \"\"\"{{- if .System }}
 [SYSTEM_PROMPT]
 {{ .System }}
 [/SYSTEM_PROMPT]
 {{- end }}
 {{- range .Messages }}
-{{- if eq .Role "user" }}
+{{- if eq .Role \"user\" }}
 [INST]
 {{ .Content }}
 [/INST]
-{{- else if eq .Role "assistant" }}
+{{- else if eq .Role \"assistant\" }}
 {{ .Content }}
 {{- end }}
-{{- end }}"""
+{{- end }}\"\"\"
 PARAMETER num_ctx 131072
 PARAMETER num_predict 4096
 PARAMETER num_keep 1024
 PARAMETER repeat_penalty 1.1
 PARAMETER top_k 40
-PARAMETER stop "[INST]"
-PARAMETER stop "[/INST]"
-PARAMETER stop "</s>"
-EOF
+PARAMETER stop \"[INST]\"
+PARAMETER stop \"[/INST]\"
+PARAMETER stop \"</s>\"
+EOF"
+          ${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f "/root/.ollama/$model_name.modelfile"
+          ${pkgs.docker}/bin/docker exec ollama rm "/root/.ollama/$model_name.modelfile"
+        else
+          echo "$model_name already exists, skipping."
+        fi
+      }

-            # Copie et création dans le conteneur
-            ${pkgs.docker}/bin/docker cp "$TMP_FILE" ollama:/tmp/model.modelfile
-            ${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f /tmp/model.modelfile
-            ${pkgs.docker}/bin/docker exec ollama rm /tmp/model.modelfile
-            rm -f "$TMP_FILE"
-          else
-            echo "$model_name already exists, skipping."
-          fi
-        }
-
-        # Create Nemotron
-        create_model_if_missing "nemotron-3-nano:30b-128k" "nemotron-3-nano:30b"
-        
-        # Create Devstral
-        create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b" 
-        
-      ) &
+      # Create Nemotron
+      create_model_if_missing "nemotron-3-nano:30b-128k" "nemotron-3-nano:30b"
+      
+      # Create Devstral
+      create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b" 
+      
+      # create_model_if_missing "qwen2.5-coder:32b-128k" "qwen2.5-coder:32b"
+      
+      # create_model_if_missing "mistral-large-planner:123b" "mistral-large:123b-instruct-v2407-q4_K_S"
    '';
-
    serviceConfig = {
-      Type = "forking"; # Permet à systemd de savoir que le script passe en arrière-plan via '&'
-      User = "root";
+      Type = "oneshot";
+      RemainAfterExit = true;
    };
  };
 }
--- a/secrets/home_wifi.age
+++ b/secrets/home_wifi.age
@@ -1,10 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
-YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
-V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
-Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
-aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
-cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
-TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
-KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
-----END AGE ENCRYPTED FILE-----
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -11,5 +11,4 @@ in
  "lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
  "n8n_ssh_key.age".publicKeys = authorizedKeys;
  "openclaw_gateway_token.age".publicKeys = authorizedKeys;
-  "home_wifi.age".publicKeys = authorizedKeys;
 }
--- a/secrets/wireguard_preshared_key.age
+++ b/secrets/wireguard_preshared_key.age
@@ -1,9 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA3VG9Z
-MVFPVFc2VVJ3d0h0dmtBUnI3WHl2SzUxTkRZbjFCaGloWmV3dnd3ClcxdnVPeGd6
-SU4zR0Q0K1dtVjRRVHd0VW5XSFI0dVFpTjZnYk1DNjRxTVEKLT4gQzlgRy1ncmVh
-c2UKeUozOWgyUytSTVF0NjY2STBEb2VadwotLS0gblI3bmJCUWxxU3QrYTEyVFBI
-Snc4NC9rTkh0NnZYbUtxUE9hRWRkelpmMAq58fmH6cK13GeD7wGLxKmx10hmJeW4
-b7KqnCD1ZP7uG85s32xzVRwRG8RrG4xZo5nR9Mrtg1CoTSFfUGeFnf5xveN+Ej0X
-wDVB1LwC+Q==
-----END AGE ENCRYPTED FILE-----
--- a/secrets/wireguard_private_key.age
+++ b/secrets/wireguard_private_key.age
@@ -1,11 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA5dzVG
-WUNvT3NlRmcrWS81bzJqSWlTekVYaDFFTE10SkI2dEgzaGpxcUI4Cmk5Y0FGYTRZ
-K0NGYzY3VUp4aS9ZZGRmWTgybDJFUURva2pZNmVOS3QxdEUKLT4gPnVRTCtldGMt
-Z3JlYXNlCk04OTJZeFRNeDI5aGpMVTk1ZTE0Y2FMMnFEMjlJalJpMHRlaTE4ZWIx
-d2lCRGQ5RHVjcktOMGJCb1VERlNWcTYKaSt0L1Z6dVJ0QWIyZkhsYzFEVjZSQWUr
-ZWpwVlo1TmhoUFJZdkEvR0gxNlVhcXF2ZTRnCi0tLSBLcmM2MThNVkdWclpHUXRr
-VTF6QVk2WUZlTXpZMVNLMlpBOFc3M1o5WjZzCs9xbPlIX+u5vRSQ/z9utu+I9S2c
-02DOsIb1kzxzb1OK91b8Kh4JucQSq3qkyEvRucsNn5QW8hIHDnRuND6EbPyN7p4S
-YB/F0dxSqgnq
-----END AGE ENCRYPTED FILE-----
--- a/users/ai-worker.nix
+++ b/users/ai-worker.nix
@@ -9,20 +9,8 @@
    openssh.authorizedKeys.keys = [
      keys.users.ai-worker.main
    ];
-    # No password login - SSH key only
-    hashedPassword = "!";
  };
  users.groups.ai-worker = {};
-
-  # Enable restricted AI worker SSH access for ollama benchmarking
-  # SECURITY: ai-worker can only:
-  #   - SSH into host from Hermes container
-  #   - Run docker commands (docker exec ollama ...) via docker group
-  #   - Run specific security audit commands
-  #   - NO access to infra repo (no bind mount)
-  #   - NO sudo access (no nh, nixos-rebuild, nixpkgs-fmt, nix)
-  # WORKFLOW: SSH from Hermes container, run docker benchmarks, return and save results to /opt/data/ai-optimizer/
-  services.aiWorkerAccess = true;
  
  # Restricted sudo for ai-worker - security checks only
  security.sudo.extraRules = [
--- a/users/gortium/default.nix
+++ b/users/gortium/default.nix
@@ -1,5 +1,4 @@
 { pkgs, inputs, config, keys, ... }: {
-  home-manager.users.gortium = import ./home.nix;
  users.users.gortium = {
    isNormalUser = true;
    extraGroups = [ "wheel" "docker" "video" "render"];
--- a/users/gortium/home.nix
+++ b/users/gortium/home.nix
@@ -1,12 +0,0 @@
-{ pkgs, ... }: {
-  services.dotfiles = {
-    enable = true;
-    stowDir = ../../../assets/dotfiles;
-    user = "gortium";
-  };
-
-  home.username = "gortium";
-  home.homeDirectory = "/home/gortium";
-  home.stateVersion = "23.11"; # Please change this to your version.
-  programs.home-manager.enable = true;
-}