hosts/desktop1/configuration.nix

@@ -12,8 +12,6 @@
     steam.enable = true;
     prism.enable = true;
     fzf.enable = true;
-    firefox.enable = true;
-    zsh.enable = true;
   };
 
   home-manager = {
@@ -40,6 +38,14 @@
   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;
@@ -91,4 +97,7 @@
     ];
   };
 
+  programs.firefox.enable = true;
+
+  programs.zsh.enable = true;
 }

modules/nix/browser/default.nix

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

modules/nix/browser/firefox.nix

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

modules/nix/shell/default.nix

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

modules/nix/shell/zsh.nix

@@ -1,16 +0,0 @@
-{  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;
-  };
-}