quick update host

flake.nix

@@ -50,13 +50,15 @@
           stylix.nixosModules.stylix
           home-manager.nixosModules.home-manager
           {
+            home-manager = {
               # default config
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = { inherit inputs; };
               # emplacement de la config
-            home-manager.users.afoucaultc = import ./home/afoucaultc/home.nix;
-            home-manager.backupFileExtension = "backup";
+              users.afoucaultc = import ./home/afoucaultc/home.nix;
+              backupFileExtension = "backup";
+            };
           }
         ];
       };
@@ -71,12 +73,14 @@
           home-manager.nixosModules.home-manager
           {
             # default config
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = { inherit inputs; };
               # emplacement de la config
-            home-manager.users.afoucaultc = import ./home/afoucaultc/home-laptop.nix;
-            home-manager.backupFileExtension = "backup";
+              users.afoucaultc = import ./home/afoucaultc/home-laptop.nix;
+              backupFileExtension = "backup";
+            };
           }
         ];
       };

home/afoucaultc/dotfiles_apps.nix

@@ -16,3 +16,9 @@
   xdg.configFile."nvim".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/dotfiles/nvim";
 }
+
+# xdg.configFile."i3blocks/config".source = ./i3blocks.conf;
+# home.file.".gdbinit".text = ''
+#   set auto-load safe-path /nix/store
+#   '';
+#   create symlink $XDG_CONFIG_HOME/i3blocks/config and ~/.gdbinit

home/afoucaultc/packages/niri.nix

@@ -0,0 +1,22 @@
+{ ... }:
+{
+  programs.niri = {
+    enable = true;
+    settings = {
+      prefer-no-csd = true;
+      input.keyboard.xkb = {
+        layout = "us";
+        variant = "intl";
+      };
+      layout = {
+        gaps = 4;
+        focus-ring = {
+          enable = true;
+          width = 2;
+          active.color = "#${config.colorScheme.palette.base0D}ff";
+          inactive.color = "#${config.colorScheme.palette.base03}ff";
+        };
+      };
+    };
+  };
+}

hosts/nixos-home/config/basesystem/memory.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+    memoryPercent = 50;
+  };
+}

hosts/nixos-home/config/extra-services.nix

@@ -1,30 +0,0 @@
-{ pkgs, ... }:
-{
-  # mullvad VPN
-  services.mullvad-vpn.gui = {
-    enable = true;
-    package = pkgs.mullvad-vpn;
-  };
-  # steam
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = false;
-  };
-  programs.gamemode.enable = true;
-  programs.gamescope = {
-    enable = true;
-    capSysNice = true;
-  };
-  zramSwap = {
-    enable = true;
-    algorithm = "zstd";
-    memoryPercent = 50;
-  };
-  # ajouts pour KDE/dolphin
-  services.gvfs.enable = true;
-  services.tumbler.enable = true;
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-  };
-}

hosts/nixos-home/config/programs/gamescope.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  programs.gamemode.enable = true;
+  programs.gamescope = {
+    enable = true;
+    capSysNice = true;
+  };
+}

hosts/nixos-home/config/programs/steam.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = false;
+  };
+}

hosts/nixos-home/config/services/kde.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  services.gvfs.enable = true;
+  services.tumbler.enable = true;
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+  };
+}

hosts/nixos-home/config/services/mullvad.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  services.mullvad-vpn.gui = {
+    enable = true;
+    package = pkgs.mullvad-vpn;
+  };
+}

hosts/nixos-home/config/services/zramswap.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+
+}

hosts/nixos-home/configuration.nix

@@ -5,21 +5,29 @@
     # à copier dans le dossier courant depuis /etc/nixos
     ./hardware-configuration.nix
     # ensemble de packages et configurations système
-    ./config/bluetooth.nix
-    ./config/boot.nix
-    ./config/drivers_video.nix
-    ./config/extra-services.nix
-    ./config/fonts.nix
+    ./config/basesystem/bluetooth.nix
+    ./config/basesystem/boot.nix
+    ./config/basesystem/drivers_video.nix
+    ./config/basesystem/language.nix
+    ./config/basesystem/memory.nix
+    ./config/basesystem/system.nix
+    ./config/basesystem/system_saves.nix
+    ./config/basesystem/users.nix
+    # style
+    ./config/style/fonts.nix
+    ./config/style/stylix.nix
+    # additional services
+    ./config/services/kde.nix
+    ./config/services/mullvad.nix
+    ./config/services/power_management.nix
+    ./config/services/sound.nix
+    # programs
+    ./config/programs/gamescope.nix
+    ./config/programs/steam.nix
+    # packages & others
     ./config/hyprland.nix
-    ./config/language.nix
-    ./config/power_management.nix
-    ./config/sound.nix
-    ./config/stylix.nix
     ./config/system_packages.nix
-    ./config/system_saves.nix
-    ./config/system_services.nix
-    ./config/user.nix
-    # profil nixos pour mon ordi portable
+    # profil nixos pour mon ordi portable maison
     # nécessite l'input nixos-hardware dans flake.nix.
     inputs.nixos-hardware.nixosModules.common-cpu-intel # active le microcode intel, KMS pour GPU intégré, etc...
     inputs.nixos-hardware.nixosModules.common-pc-laptop # active tlp