more cleanup

systems/x86_64-linux/nas/default.nix

@@ -5,7 +5,6 @@
 {
   config,
   pkgs,
-  lib,
   namespace,
   ...
 }:
@@ -32,6 +31,15 @@
   ${namespace} = {
     bootloader.lanzaboote.enable = true;
     desktop.cosmic.enable = false;
+    development = {
+      enable = true;
+      includeLanguages = [
+        "python"
+        "c"
+      ];
+      includeContainers = true;
+    };
+    monitoring.enable = true;
     hardware.nvidia = {
       enable = true;
       enableBeta = true;
@@ -126,34 +134,25 @@
     systemPackages = with pkgs; [
       attic-client
       bcachefs-tools
-      binutils
       cryptsetup
       clevis
-      cmake
       deconz
       duperemove
       efibootmgr
       ffmpeg
-      gcc
-      glances
       ipset
-      jq
       llama-cpp
-      ninja
       # inputs.nas-nixai.packages.x86_64-linux.nixai
       networkmanagerapplet
-      nmon
       nut
       packagekit
       pass
       protonmail-bridge
       protonvpn-cli
-      python3
       python3Packages.llama-cpp-python
       qrencode
       rcon
       sbctl
-      speedtest-cli
       tigervnc
       tpm2-tools
       tpm2-tss
@@ -163,8 +162,6 @@
   # Configure programs
   programs = {
     virt-manager.enable = true;
-    nix-ld.enable = true;
-    screen.enable = true;
     coolercontrol = {
       enable = true;
       nvidiaSupport = true;
@@ -213,42 +210,6 @@
     '';
   };
 
-  # Virtualisation
-  virtualisation = {
-    podman = {
-      enable = true;
-      dockerCompat = true;
-      autoPrune.enable = true;
-      defaultNetwork.settings = {
-        dns_enabled = true;
-      };
-    };
-
-    libvirtd.enable = true;
-  };
-
-  # Enable nix flakes and nix-command tools
-  nix = {
-    settings = {
-      substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-      warn-dirty = lib.mkForce false;
-      experimental-features = lib.mkForce [
-        "nix-command"
-        "flakes"
-      ];
-      trusted-users = [ "@wheel" ];
-    };
-
-    # Garbage collect automatically every week
-    gc.automatic = lib.mkDefault true;
-    gc.options = lib.mkDefault "--delete-older-than 30d";
-
-    optimise.automatic = lib.mkDefault true;
-  };
+  # Additional virtualization beyond what's in development module
+  virtualisation.libvirtd.enable = true;
 }

systems/x86_64-linux/nuc/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   namespace,
   ...
 }:
@@ -49,28 +48,4 @@
     };
   };
 
-  # Enable nix flakes and nix-command tools
-  nix = {
-    settings = {
-      substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-      warn-dirty = lib.mkForce false;
-      experimental-features = lib.mkForce [
-        "nix-command"
-        "flakes"
-      ];
-      trusted-users = [ "@wheel" ];
-    };
-
-    # Garbage collect automatically every week
-    gc.automatic = lib.mkDefault true;
-    gc.options = lib.mkDefault "--delete-older-than 30d";
-
-    optimise.automatic = lib.mkDefault true;
-  };
 }