hosts/common/common.nix

@@ -18,6 +18,9 @@
 
   environment.systemPackages = with pkgs; [
     home-manager
+    lf
+    arduino-ide
+    calibre
     tor
     tshark
     freecad-wayland

modules/nix/base-cli/pkgs.nix

@@ -19,7 +19,6 @@ in
       file
       vim
       fastfetch
-      lf
     ];
   };
 }

modules/nix/default.nix

@@ -18,8 +18,6 @@
     ./vpn
     ./utilities
     ./flatpak
-    ./ide
-    ./ebook
   ];
 
   # Timzone and locales (same for all machines so I put it here)

modules/nix/ebook/calibre.nix

@@ -1,15 +0,0 @@
-{  lib, config, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.calibre.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable calibre";
-  };
-
-  config = mkIf config.smayzy.calibre.enable {
-    environment.systemPackages = with pkgs; [ calibre ];
-  };
-}

modules/nix/ebook/default.nix

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

modules/nix/groups/desktop.nix

@@ -39,8 +39,6 @@ in
         dev.enable = true;
         gaming.enable = true;
       };
-      arduino.enable = true;
-      calibre.enable = true;
     };
   };
 }

modules/nix/groups/laptop.nix

@@ -37,8 +37,6 @@ in
         dev.enable = true;
         media.enable = true;
       };
-      arduino.enable = true;
-      calibre.enable = true;
     };
     services.logind.lidSwitch = "ignore";
   };

modules/nix/ide/arduino.nix

@@ -1,15 +0,0 @@
-{  lib, config, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.arduino.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "arduino ide";
-  };
-
-  config = mkIf config.smayzy.arduino.enable {
-    environment.systemPackages = with pkgs; [ arduino-ide ];
-  };
-}

modules/nix/ide/default.nix

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