reorganise code: os modules in flake.nix

flake.lock

@@ -192,16 +192,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1736549401,
+        "lastModified": 1773122722,
-        "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
+        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
+        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -244,11 +244,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1773136055,
+        "lastModified": 1773351562,
-        "narHash": "sha256-wvTn86J1kugxIBliYHW5+WQtm96+qt8dhJoSYE5pyHI=",
+        "narHash": "sha256-H5flYFBFbyhMh0j+7aEbIBo2vyFmVIhJZNlKhRgOfBc=",
-        "rev": "3a062c2ba8d4b390090f53f6c38ce2c583098625",
+        "rev": "398cfc9a93b3d1d56dd205839e30b5e7fe062fec",
         "type": "tarball",
-        "url": "https://git.antoinevaure.fr/api/v1/repos/ant/st-flexipatch/archive/3a062c2ba8d4b390090f53f6c38ce2c583098625.tar.gz"
+        "url": "https://git.antoinevaure.fr/api/v1/repos/ant/st-flexipatch/archive/398cfc9a93b3d1d56dd205839e30b5e7fe062fec.tar.gz"
       },
       "original": {
         "type": "tarball",

flake.nix

@@ -23,14 +23,13 @@
       pkgs = inputs.nixpkgs.legacyPackages.${system};
       pkgs-unstable = inputs.unstable.legacyPackages.${system};
       nixgl = inputs.nixgl.packages.${system};
-      osConfig = name: nixpkgs.lib.nixosSystem {
+      sshKeys = (import ./sshKeys.nix);
+      osConfig = modules: nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
         };
-        modules = [
+        inherit modules;
-          ./os/${name}/configuration.nix
-        ];
       };
       homeConfig = modules: inputs.home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
@@ -92,10 +91,46 @@
         ./home/moon.nix
       ];
 
-      nixosConfigurations.basado = osConfig "basado";
+      nixosConfigurations.basado = osConfig [
-      nixosConfigurations.moon = osConfig "moon";
+        ./os/basado/configuration.nix
-      nixosConfigurations.hs = osConfig "hs";
+        ./os/basado/hardware-configuration.nix
-      nixosConfigurations.ks = osConfig "ks";
+
+        ./os/common.nix
+        ./os/common-graphics.nix
+        (import ./os/remote-disk-unlock.nix ["igb"] (with sshKeys; [moon]))
+        ./os/builder.nix
+        ./os/kdeconnect-ports.nix
+        (import ./os/swapfile.nix 64) 
+        ./os/ccache.nix
+      ];
+      nixosConfigurations.moon = osConfig [
+        ./os/moon/configuration.nix
+        ./os/moon/hardware-configuration.nix
+
+        ./os/common.nix
+        ./os/common-graphics.nix
+        ./os/kdeconnect-ports.nix
+      ];
+      nixosConfigurations.hs = osConfig [
+        ./os/hs/configuration.nix
+        ./os/hs/hardware-configuration.nix
+        ./os/hs/syncthing.nix
+        ./os/hs/disks.nix
+        ./os/hs/backup.nix
+
+        ./os/common.nix
+        ./os/forgejo.nix
+        (import ./os/remote-disk-unlock.nix ["r8169"] (with sshKeys; [moon basado]))
+        ./os/builder.nix
+        ./os/ccache.nix
+        (import ./os/swapfile.nix 64) 
+      ];
+      nixosConfigurations.ks = osConfig [
+        ./os/ks/configuration.nix
+        ./os/ks/hardware-configuration.nix
+        ./os/common.nix
+        ./os/3proxy.nix
+      ];
 
       build-all = pkgs.runCommand "build-all" {
         buildInputs = 

home/ui.nix

@@ -30,7 +30,7 @@ in
       nerd-fonts.caskaydia-cove
       cascadia-code
       inter
-      joypixels
+      symbola
 
       bluetuith
       keepmenu

os/basado/configuration.nix

@@ -1,20 +1,5 @@
 { config, pkgs, ... }:
-let sshKeys = with (import ../../sshKeys.nix); [
-  moon
-];
-in
 {
-  imports = [
-    ./hardware-configuration.nix
-    ../common.nix
-    ../common-graphics.nix
-    (import ../remote-disk-unlock.nix ["igb"] sshKeys)
-    ../builder.nix
-    ../kdeconnect-ports.nix
-    (import ../swapfile.nix 64) 
-    ../ccache.nix
-  ];
-
   boot.loader = {
     grub = {
       enable = true;

os/hs/configuration.nix

@@ -1,28 +1,10 @@
 { config, pkgs, ... }:
 
 let
-  sshKeys = with (import ../../sshKeys.nix); [
+  sshKeys = import ../../sshKeys.nix;
-    basado
-    moon
-    allegro
-    hs
-  ];
   domain = "antoinev.freeboxos.fr";
   utils = import ../utils.nix;
 in {
-  imports = [
-    ./hardware-configuration.nix
-    ./syncthing.nix
-    ./disks.nix
-    ./backup.nix
-    ../common.nix
-    ../forgejo.nix
-    (import ../remote-disk-unlock.nix ["r8169"] sshKeys)
-    ../builder.nix
-    ../ccache.nix
-    (import ../swapfile.nix 64) 
-  ];
-
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
@@ -49,7 +31,7 @@ in {
       "wheel"
       "jellyfin"
     ];
-    openssh.authorizedKeys.keys = sshKeys;
+    openssh.authorizedKeys.keys = (with sshKeys; [ basado moon allegro hs ]);
   };
   security.sudo.wheelNeedsPassword = false;
 

os/ks/configuration.nix

@@ -6,9 +6,6 @@ let
   sshKeys = (import ../../sshKeys.nix);
 in {
   imports = [
-    ./hardware-configuration.nix
-    ../common.nix
-    ../3proxy.nix
     inputs.simple-nixos-mailserver.nixosModule
   ]; 
 

os/moon/configuration.nix

@@ -1,12 +1,5 @@
 { config, pkgs, ... }:
 {
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ../common.nix
-    ../common-graphics.nix
-    ../kdeconnect-ports.nix
-  ];
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;