feat: update compose submodule for ollama-gfx906 (v0.23.2) + add Dockerfile

flake.lock

@@ -70,11 +70,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1774721317,
-        "narHash": "sha256-KS0ElyhZKdUFcfaxfwid3yi2Id3EP9i+dGL16/wx1T8=",
+        "lastModified": 1777373577,
+        "narHash": "sha256-K0sXr8tRA9L1FGE8Khl42NR+DmZOY9gNYCP8ljX7TAo=",
         "ref": "main",
-        "rev": "d0190cff6f2314cc1c727ff113aea20e086f4bcc",
-        "revCount": 19103,
+        "rev": "faaa14a303dabc6309a52cc8e5eba86f9e29ccaf",
+        "revCount": 19152,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -178,11 +178,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774386573,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,18 +12,10 @@
       url = "git+https://git.lix.systems/lix-project/lix?ref=main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-uconsole = {
-      url = "github:nixos-uconsole/nixos-uconsole";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixos-raspberrypi = {
-      url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     self.submodules = true;
   };
 
-  outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
+  outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
     let
       system = "x86_64-linux";
       keys = import ./lib/keys.nix;
@@ -34,7 +26,7 @@
           "/etc/ssh/ssh_host_ed25519_key"
           "/root/.age/bootstrap.key" ];
       };
-      overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
+      overlays = [ agenix.overlays.default ];
       pkgs = import nixpkgs {
         inherit system overlays;
         config.allowUnfree = true;
@@ -88,22 +80,6 @@
               ./hosts/cyt-pi/hardware-configuration.nix
             ];
           };
-
-          uConsole = nixos-raspberrypi.lib.nixosSystem {
-            specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
-            modules = [
-              {
-                nixpkgs.overlays = overlays;
-                nixpkgs.config.allowUnfree = true;
-                nixpkgs.hostPlatform = "aarch64-linux";
-                nix.package = lix.packages."aarch64-linux".default;
-              }
-              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-              nixos-uconsole.nixosModules.uconsole-cm5
-              ./hosts/uConsole/configuration.nix
-              ./hosts/uConsole/hardware-configuration.nix
-            ];
-          };
         };
         devShells.${system}.default = devShell;
       };

hosts/lazyworkhorse/configuration.nix

@@ -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;

hosts/uConsole/configuration.nix

@@ -1,167 +0,0 @@
-{ config, lib, pkgs, paths, self, ... }:
-
-{
-  # Basic Host Info
-  networking.hostName = "uConsole";
-  time.timeZone = "America/Montreal";
-  i18n.defaultLocale = "en_CA.UTF-8";
-
-  # System State
-  system.stateVersion = "25.05";
-
-  # Boot & Hardware (uconsole-cm5 module handles boot.loader)
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # Networking
-  networking.networkmanager.enable = true;
-  services.openssh = {
-    enable = true;
-    settings.PermitRootLogin = "prohibit-password";
-    settings.PasswordAuthentication = false;
-  };
-
-  # User
-  users.users.gortium = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "video" "dialout" "kismet" ];
-    openssh.authorizedKeys.keys = [
-      keys.users.gortium.main
-      keys.users.gortium.gitea
-    ];
-  };
-  security.sudo.extraRules = [
-    {
-      users = [ "gortium" ];
-      commands = [
-        {
-          command = "ALL";
-          options = [ "NOPASSWD" ];
-        }
-      ];
-    }
-  ];
-
-  # ============================================================
-  # Package groups
-  # ============================================================
-
-  environment.systemPackages = with pkgs; [
-    # ===== Base =====
-    emacs-pgtk
-    git
-    ripgrep
-    fd
-    htop
-    tmux
-    neovim
-
-    # ===== HAM Radio =====
-    js8call
-    wsjtx
-    fldigi
-    pat                        # Winlink client
-    direwolf                   # AX.25 packet modem
-    chirp                      # Radio programming tool
-    hamlib                     # Ham radio control libraries
-    trustedqsl                 # Logbook of the World (LoTW)
-
-    # ===== SDR / RF =====
-    sdrpp                      # SDR++ spectrum analyzer
-    gqrx                       # SDR receiver GUI
-    rtl-sdr                    # RTL-SDR drivers & utilities
-    inspectrum                # Offline signal analysis
-    soapysdr-with-plugins      # SoapySDR + hardware support plugins
-
-    # ===== Mesh / LoRa =====
-    meshtastic                 # Python CLI for Meshtastic devices
-    reticulumStack             # Reticulum Network Stack (rnsd, rnsh, rncp, rnx, rnpath, etc.)
-    lxmf                       # LXMF messaging protocol
-    nomadnet                   # Nomad Network client
-
-    # ===== Security =====
-    nmap
-    aircrack-ng
-    kismet                     # Wi-Fi monitor / IDS
-    bettercap                  # MITM/network attack framework
-    wireshark                  # Packet analyzer
-    hashcat                    # GPU password cracker
-    john                       # John the Ripper
-    sqlmap                     # SQL injection tool
-
-    # ===== GPS / Maps =====
-    foxtrotgps
-    viking                     # GPS map editor
-    gpsbabel                   # GPS data conversion
-  ];
-
-  # Packages noted but not in unstable nixpkgs:
-  #   - metasploit: unfree; install manually via Git clone
-  #   - burpsuite: unfree Java app (Community Edition available for download)
-  #   - sidechannel: not a distinct PyPI package; functionality covered by
-  #     the Reticulum stack. For LXMF GUI client, install Sideband manually
-  #     from github.com/markqvist/Sideband
-
-  # ============================================================
-  # Reticulum Service (rnsd)
-  # ============================================================
-  systemd.services.rnsd = {
-    description = "Reticulum Network Stack Daemon";
-    after = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      User = "gortium";
-      Group = "gortium";
-      ExecStart = "${pkgs.reticulumStack}/bin/rnsd";
-      Restart = "always";
-      RestartSec = "10s";
-      LimitNOFILE = 65536;
-    };
-  };
-
-  # ============================================================
-  # Kismet Service (Wi-Fi monitoring / mesh node)
-  # ============================================================
-  systemd.services.kismet = {
-    description = "Kismet Wi-Fi Monitor & IDS";
-    after = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      User = "gortium";
-      Group = "kismet";
-      ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-base=/home/gortium/kismet_logs --no-nc-ui";
-      Restart = "always";
-      RestartSec = "10s";
-    };
-  };
-
-  # ============================================================
-  # Kernel modules for SDR and radio
-  # ============================================================
-  boot.kernelModules = [
-    "88x2bu"          # Realtek 8812/8821BU USB WiFi (common adapter)
-    "rtl8xxxu"        # RTL8188/8192/8723 USB WiFi
-    "rtl2832_sdr"     # RTL-SDR kernel module
-    "dvb_usb_rtl28xxu" # RTL-SDR DVB-T
-  ];
-
-  boot.blacklistedKernelModules = [ ];
-
-  # ============================================================
-  # Extra udev rules for SDR and HAM radio devices
-  # ============================================================
-  services.udev.packages = with pkgs; [ rtl-sdr ];
-
-  # ============================================================
-  # Enable IPv6 for Reticulum mesh
-  # ============================================================
-  networking.enableIPv6 = true;
-
-  # ============================================================
-  # Firewall: open ports for Reticulum (optional)
-  # ============================================================
-  networking.firewall.allowedTCPPorts = [ 22 ]; # SSH only
-  networking.firewall.allowedUDPPorts = [ ];
-  # Reticulum uses its own encryption and doesn't need open ports
-  # for basic mesh operations (peer-to-peer discovery).
-  # For TCP interfaces, open additional ports as needed.
-}

hosts/uConsole/hardware-configuration.nix

@@ -1,26 +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 = [ ];
-
-  # uConsole CM5 uses NVMe or eMMC for boot storage
-  # The uconsole-cm5 module sets up /boot/firmware and default /
-  # Override device label here if using different storage
-  fileSystems."/" = lib.mkDefault {
-    device = "/dev/disk/by-label/NIXOS_UCM5";
-    fsType = "ext4";
-    options = [ "noatime" ];
-  };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  hardware.enableRedistributableFirmware = true;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-}

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;
     };
   };
 }

overlays/reticulum.nix

@@ -1,77 +0,0 @@
-final: prev: let
-  python3 = final.python3;
-  pyPkgs = python3.pkgs;
-in {
-  reticulumStack = python3.pkgs.buildPythonApplication rec {
-    pname = "reticulum";
-    version = "1.2.9";
-    src = pyPkgs.fetchPypi {
-      pname = "rns";
-      inherit version;
-      sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75";
-    };
-    propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ];
-    doCheck = false;
-    pythonImportsCheck = [ "RNS" ];
-    meta = with final.lib; {
-      description = "Self-configuring, encrypted and resilient mesh networking stack";
-      homepage = "https://reticulum.network/";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  lxmf = python3.pkgs.buildPythonApplication rec {
-    pname = "lxmf";
-    version = "0.9.8";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
-    };
-    propagatedBuildInputs = [ final.reticulumStack ];
-    doCheck = false;
-    pythonImportsCheck = [ "LXMF" ];
-    meta = with final.lib; {
-      description = "Lightweight Extensible Message Format for Reticulum";
-      homepage = "https://github.com/markqvist/lxmf";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  nomadnet = python3.pkgs.buildPythonApplication rec {
-    pname = "nomadnet";
-    version = "1.1.1";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
-    };
-    propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ];
-    doCheck = false;
-    pythonImportsCheck = [ "nomadnet" ];
-    meta = with final.lib; {
-      description = "Nomad Network — resilient mesh communications platform";
-      homepage = "https://github.com/markqvist/NomadNet";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  rnsh = python3.pkgs.buildPythonApplication rec {
-    pname = "rnsh";
-    version = "0.1.7";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
-    };
-    propagatedBuildInputs = [ final.reticulumStack ];
-    doCheck = false;
-    pythonImportsCheck = [ "rnsh" ];
-    meta = with final.lib; {
-      description = "Remote shell over Reticulum";
-      homepage = "https://github.com/acehoss/rnsh";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-}

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-----

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-----