Remove pim from wheel on gamepc

Remove some default packages

machines/gamepc/default.nix

@@ -6,6 +6,7 @@
   config = {
     pim = {
       cinnamon.enable = true;
+      inWheel = false;
     };
 
     facter.reportPath = ./facter.json;

machines/sue/default.nix

@@ -1,4 +1,4 @@
-{inputs, ...}: {
+{pkgs, ...}: {
   config = {
     pim = {
       lanzaboote.enable = true;
@@ -13,8 +13,25 @@
     services.tailscale.enable = true;
     facter.reportPath = ./facter.json;
     home-manager.users.pim.imports = [./home.nix];
-
     networking.hostName = "sue";
+
+    environment.systemPackages = with pkgs; [
+      borgbackup
+      kubectl
+      nmap
+      poppler_utils # For pdfunite
+      silicon
+      units
+    ];
+
+    virtualisation.docker = {
+      enable = true;
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+      };
+    };
+
     swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}];
     fileSystems = {
       "/" = {

nixos/default.nix

@@ -21,10 +21,17 @@
     ./ssh.nix
   ];
 
+  options.pim.inWheel = lib.mkOption {
+    type = lib.types.bool;
+    default = true;
+  };
+
+  config = {
     time.timeZone = "Europe/Amsterdam";
     i18n.defaultLocale = "en_US.UTF-8";
     programs.ssh.startAgent = true;
     systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
+    hardware.pulseaudio.enable = false;
 
     services = {
       xserver.enable = true;
@@ -50,13 +57,14 @@
 
     users.users.pim = {
       isNormalUser = true;
-    extraGroups = ["wheel" "docker" "input" "wireshark" "dialout"];
+      extraGroups =
+        ["docker" "input" "wireshark" "dialout"]
+        ++ lib.optional config.pim.inWheel "wheel";
     };
 
     environment = {
       systemPackages = with pkgs; [
         age
-      borgbackup
         btop
         btrfs-progs
         curl
@@ -67,14 +75,9 @@
         file
         git
         jq
-      kubectl
-      nmap
-      poppler_utils # For pdfunite
         ripgrep
         sbctl
-      silicon
         tree
-      units
         vim
         wget
         yq
@@ -125,14 +128,6 @@
       '';
     };
 
-  virtualisation.docker = {
-    enable = true;
-    rootless = {
-      enable = true;
-      setSocketVariable = true;
-    };
-  };
-
     nixpkgs = {
       hostPlatform = lib.mkDefault "x86_64-linux";
 
@@ -157,25 +152,10 @@
       ];
     };
 
-  boot = {
+    boot.kernel.sysctl = {
-    kernelModules = ["kvm-intel" "cdrom"];
-    extraModulePackages = [];
-
-    initrd = {
-      availableKernelModules = ["sd_mod"];
-      kernelModules = [];
-    };
-
-    kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
     };
-  };
-
-  hardware = {
-    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    pulseaudio.enable = false;
-  };
 
     home-manager = {
       useGlobalPkgs = true;
@@ -184,4 +164,5 @@
 
       users.pim.imports = ["${self}/home-manager"];
     };
+  };
 }