Clean up unused modules

hosts/Pihole/default.nix

@@ -12,16 +12,13 @@
 
   aux.system = {
     apps.tmux.enable = true;
-    boot = {
-      enable = true;
-      secureboot.enable = false;
-    };
+    bootloader.enable = false;  # Bootloader configured in hardware-configuration.nix
     packages = with pkgs; [
-    libraspberrypi
-    raspberrypifw
-    raspberrypi-eeprom
-    linuxKernel.kernels.linux_rpi4
-  ];
+      libraspberrypi
+      raspberrypifw
+      raspberrypi-eeprom
+      linuxKernel.kernels.linux_rpi4
+    ];
     services.ssh = {
       enable = true;
       ports = [ config.secrets.hosts.haven.ssh.port ];

hosts/Shura/default.nix

@@ -5,6 +5,9 @@
   ...
 }:
 let
+  # Do not change this value! This tracks when NixOS was installed on your system.
+  stateVersion = "24.05";
+
   # Copy bluetooth device configs
   shure-aonic-bluetooth = pkgs.writeText "info" (
     builtins.readFile ./bluetooth/shure-aonic-bluetooth-params
@@ -26,7 +29,7 @@ in
 {
   imports = [ ./hardware-configuration.nix ];
 
-  system.stateVersion = "24.05";
+  system.stateVersion = stateVersion;
 
   aux.system = {
     apps = {
@@ -42,9 +45,28 @@ in
         languagetool.enable = true;
       };
     };
+
+    # Configure the bootloader.
+    bootloader = {
+      enable = true;
+      secureboot.enable = true;
+      tpm2.enable = true;
+    };
+
+    # Change the default text editor. Options are "emacs", "nano", or "vim".
+    editor = "nano";
+
+    # Enable GPU support.
     gpu.amd.enable = true;
-    packages = with pkgs; [ boinc ];
+
+    packages = with pkgs; [
+      boinc # Boinc client
+    ];
+
+    # Keep old generations for one week.
     retentionPeriod = "7d";
+
+    # Run daily automatic updates.
     services.autoUpgrade = {
       enable = true;
       configDir = config.secrets.nixConfigFolder;

modules/apps/kdeconnect.nix

@@ -1,35 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-
-let
-  cfg = config.aux.system.apps.kdeconnect;
-in
-with lib;
-{
-  options = {
-    aux.system.apps.kdeconnect.enable = mkEnableOption (mdDoc "Enables KDE Connect");
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ gnomeExtensions.gsconnect ];
-
-    networking.firewall = {
-      allowedTCPPortRanges = [
-        {
-          from = 1714;
-          to = 1764;
-        }
-      ];
-      allowedUDPPortRanges = [
-        {
-          from = 1714;
-          to = 1764;
-        }
-      ];
-    };
-  };
-}

modules/services/autoupgrade.nix

@@ -26,11 +26,7 @@ in
 {
   options = {
     aux.system.services.autoUpgrade = {
-      enable = lib.mkOption {
-        default = true;
-        type = lib.types.bool;
-        description = "Enables automatic system updates.";
-      };
+      enable = lib.mkEnableOption (lib.mdDoc "Enables automatic system updates.");
       branches = lib.mkOption {
         type = lib.types.attrs;
         description = "Which local and remote branches to compare.";

modules/services/k3s.nix

@@ -1,60 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.aux.system.services.k3s;
-in
-with lib;
-{
-  options = {
-    aux.system.services.k3s = {
-      enable = mkEnableOption (mdDoc "Enables K3s");
-      role = mkOption {
-        default = "server";
-        type = types.enum [
-          "agent"
-          "server"
-        ];
-        description = "Which K3s role to use";
-      };
-      serverAddr = mkOption {
-        default = "";
-        type = types.str;
-        description = "If an agent, this is the address of the server.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Add packages for developing with K3s.
-    # For details, see https://nixos.wiki/wiki/K3s
-    environment.systemPackages = with pkgs; [ k3s ];
-
-    networking.firewall = {
-      allowedTCPPorts = [
-        6443 # k3s: required so that pods can reach the API server (running on port 6443 by default)
-        # 2379 # k3s, etcd clients: required if using a "High Availability Embedded etcd" configuration
-        # 2380 # k3s, etcd peers: required if using a "High Availability Embedded etcd" configuration
-      ];
-      allowedUDPPorts = [
-        # 8472 # k3s, flannel: required if using multi-node for inter-node networking
-      ];
-    };
-
-    services.k3s = {
-      enable = true;
-      inherit (cfg) role;
-      extraFlags = toString [
-        # "--kubelet-arg=v=4" # Optionally add additional args to k3s
-      ];
-    } // optionalAttrs (cfg.role == "agent") { inherit (cfg) serverAddr; };
-
-    # Increase number of open file handlers so K3s doesn't exhaust them...again.
-    systemd.extraConfig = ''
-      DefaultLimitNOFILE=8192:1048576
-    '';
-  };
-}

modules/services/virtualization.nix

@@ -12,7 +12,7 @@ in
 {
   options = {
     aux.system.services.virtualization = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables virtualization hosting tools on this aux.system.");
+      enable = lib.mkEnableOption (lib.mdDoc "Enables virtualization hosting tools on this host.");
       user = lib.mkOption {
         default = "";
         type = lib.types.str;