hosts/common/common.nix

@@ -13,14 +13,6 @@
 
   smayzy.virt.enable = true;
 
-  smayzy.nh.enable = true;
-
-  smayzy.locales.enable = true;
-  
-  smayzy.nvf.enable = true;
-
-  smayzy.audio.enable = true;
-
   users.users.smayzy = {
     isNormalUser = true;
     description = "smayzy";

modules/nix/locales.nix

@@ -1,25 +1,15 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
 {
-  options.smayzy.locales.enable = mkOption {
+  i18n.defaultLocale = "en_US.UTF-8";
-    type = types.bool;
+  i18n.extraLocaleSettings = {
-    default = false;
+    LC_ADDRESS = "fr_FR.UTF-8";
-    description = "set my locales & TZ";
+    LC_IDENTIFICATION = "fr_FR.UTF-8";
+    LC_MEASUREMENT = "fr_FR.UTF-8";
+    LC_MONETARY = "fr_FR.UTF-8";
+    LC_NAME = "fr_FR.UTF-8";
+    LC_NUMERIC = "fr_FR.UTF-8";
+    LC_PAPER = "fr_FR.UTF-8";
+    LC_TELEPHONE = "fr_FR.UTF-8";
   };
-  config = mkIf config.smayzy.locales.enable {
+  time.timeZone = "Europe/Paris";
-    i18n.defaultLocale = "en_US.UTF-8";
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = "fr_FR.UTF-8";
-      LC_IDENTIFICATION = "fr_FR.UTF-8";
-      LC_MEASUREMENT = "fr_FR.UTF-8";
-      LC_MONETARY = "fr_FR.UTF-8";
-      LC_NAME = "fr_FR.UTF-8";
-      LC_NUMERIC = "fr_FR.UTF-8";
-      LC_PAPER = "fr_FR.UTF-8";
-      LC_TELEPHONE = "fr_FR.UTF-8";
-    };
-    time.timeZone = "Europe/Paris";
-    };
 }

modules/nix/nh.nix

@@ -1,20 +1,9 @@
 { config, lib, pkgs, ...}:
-let
-  inherit (lib) mkIf mkOption types;
-in
 {
-  options.smayzy.nh.enable = mkOption {
+programs.nh = {
-    type = types.bool;
+    enable = true;
-    default = false;
+    clean.enable = true;
-    description = "use nh";
+    clean.extraArgs = "--keep 10";
-  };
+    flake = "/home/smayzy/nix-config";
-
-  config = mkIf config.smayzy.nh.enable {
-    programs.nh = {
-      enable = true;
-      clean.enable = true;
-      clean.extraArgs = "--keep 10";
-      flake = "/home/smayzy/nix-config";
-    };
   };
 }

modules/nix/nvf.nix

@@ -1,43 +1,32 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
 {
-  options.smayzy.nvf.enable = mkOption {
+programs.nvf = {
-    type = types.bool;
+    enable = true;
-    default = false;
+    settings = {
-    description = "nvf config";
+      vim = {
-  };
+        viAlias = false;
-  
+        vimAlias = true;
-  config = mkIf config.smayzy.nvf.enable {
+        lsp = {
-    programs.nvf = {
+          enable = true;
-      enable = true;
+          servers.nil.enable = true;
-      settings = {
-        vim = {
-          viAlias = false;
-          vimAlias = true;
-          lsp = {
-            enable = true;
-            servers.nil.enable = true;
-          };
-          languages = {
-            nix.enable = true;
-            clang.enable = true;
-            rust.enable = true;
-          };
-  	  theme = {
-    	  enable = true;
-  	  name = lib.mkDefault "dracula";
-	  };
-          treesitter.enable = true;
-	  statusline.lualine.enable = true;
-	  telescope.enable = true;
-	  autocomplete.nvim-cmp.enable = true;
         };
+        languages = {
+          nix.enable = true;
+          clang.enable = true;
+          rust.enable = true;
+        };
+	theme = {
+	 enable = true;
+	 name = lib.mkDefault "dracula";
+	};
+        treesitter.enable = true;
+	statusline.lualine.enable = true;
+	telescope.enable = true;
+	autocomplete.nvim-cmp.enable = true;
       };
     };
-    environment.systemPackages = [
-      pkgs.nil
-    ];
   };
+  environment.systemPackages = [
+    pkgs.nil
+  ];
 }

modules/nix/pipewire.nix

@@ -1,22 +1,11 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
 {
-  options.smayzy.audio.enable = mkOption {
+  services.pulseaudio.enable = false;
-    type = types.bool;
+  security.rtkit.enable = true;
-    default = false;
+  services.pipewire = {
-    description = "audio settings";
+    enable = true;
-  };
+    alsa.enable = true;
-  
+    alsa.support32Bit = true;
-  config = mkIf config.smayzy.audio.enable {
+    pulse.enable = true;
-    services.pulseaudio.enable = false;
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
   };
 }