hosts/common/common.nix

@@ -20,17 +20,28 @@
     font-awesome
     thunderbird
     lf
+    qalculate-qt
+    baobab
     arduino-ide
     piper
     calibre
+    loupe
+    gimp3
+    mullvad-vpn
     base16-schemes
     tor
+    wireshark
     tshark
     freecad-wayland
     aegisub
+    audacity
     mpv
     fritzing
+    networkmanagerapplet
+    gparted
+    gnome-disk-utility
     sl
+    vlc
   ];
 
   services.ratbagd.enable = true;

modules/nix/default.nix

@@ -15,8 +15,6 @@
     ./office
     ./comm
     ./displaymanager
-    ./vpn
-    ./utilities
   ];
 
   # Timzone and locales (same for all machines so I put it here)

modules/nix/groups/desktop.nix

@@ -23,8 +23,6 @@ in
       element.enable = true;
       webcord.enable = true;
       sddm.enable = true;
-      mullvad.enable = true;
-      gui-utilities.enable = true;
     };
   };
 }

modules/nix/groups/laptop.nix

@@ -23,8 +23,6 @@ in
       webcord.enable = true;
       element.enable = true;
       sddm.enable = true;
-      mullvad.enable = true;
-      gui-utilities.enable = true;
     };
     services.logind.lidSwitch = "ignore";
   };

modules/nix/utilities/default.nix

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

modules/nix/utilities/gui-utilities.nix

@@ -1,26 +0,0 @@
-{  lib, config, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.gui-utilities.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "basic gui-utilities";
-  };
-
-  config = mkIf config.smayzy.gui-utilities.enable {
-    environment.systemPackages = with pkgs; [
-      qalculate-qt
-      baobab
-      loupe
-      gimp3
-      wireshark
-      audacity
-      networkmanagerapplet
-      gparted
-      gnome-disk-utility
-      vlc
-    ];
-  };
-}

modules/nix/vpn/default.nix

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

modules/nix/vpn/mullvad.nix

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