put keymap in default

hosts/desktop1/configuration.nix

@@ -12,6 +12,8 @@
     steam.enable = true;
     prism.enable = true;
     fzf.enable = true;
+    firefox.enable = true;
+    zsh.enable = true;
   };
 
   home-manager = {
@@ -38,14 +40,6 @@
   networking.hostName = "desktop1";
   networking.networkmanager.enable = true;
 
-  users.defaultUserShell = pkgs.zsh;
-
-  services.xserver.xkb = {
-    layout = "fr";
-    variant = "";
-  };
-  console.keyMap = "fr";
-
   services.desktopManager.plasma6.enable = true;
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
@@ -97,7 +91,4 @@
     ];
   };
 
-  programs.firefox.enable = true;
-
-  programs.zsh.enable = true;
 }

modules/nix/browser/default.nix

@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./firefox.nix
+  ];
+}

modules/nix/browser/firefox.nix

@@ -0,0 +1,15 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.firefox.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "firefox";
+  };
+
+  config = mkIf config.smayzy.firefox.enable {
+    programs.firefox.enable = true;
+  };
+}

modules/nix/default.nix

@@ -6,6 +6,8 @@
     ./hardware
     ./virt
     ./games
+    ./browser
+    ./shell
   ];
 
   # Timzone and locales (same for all machines so I put it here)
@@ -21,4 +23,9 @@
     "nvidia-x11"
     "nvidia-settings"
   ];
+  services.xserver.xkb = {
+    layout = "fr";
+    variant = "";
+  };
+  console.keyMap = "fr";
 }

modules/nix/shell/default.nix

@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./zsh.nix
+  ];
+}

modules/nix/shell/zsh.nix

@@ -0,0 +1,16 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.zsh.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "zsh";
+  };
+
+  config = mkIf config.smayzy.zsh.enable {
+    programs.zsh.enable = true;
+    users.defaultUserShell = pkgs.zsh;
+  };
+}