From e3b7fe55cfd924c98b7a204d31f00ee8b11419d8 Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 24 Jun 2024 14:31:13 -0400 Subject: [PATCH] Clean up unused modules --- modules/apps/kdeconnect.nix | 35 ----------------- modules/services/k3s.nix | 60 ----------------------------- modules/services/virtualization.nix | 2 +- 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 modules/apps/kdeconnect.nix delete mode 100644 modules/services/k3s.nix diff --git a/modules/apps/kdeconnect.nix b/modules/apps/kdeconnect.nix deleted file mode 100644 index 5d50efa..0000000 --- a/modules/apps/kdeconnect.nix +++ /dev/null @@ -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; - } - ]; - }; - }; -} diff --git a/modules/services/k3s.nix b/modules/services/k3s.nix deleted file mode 100644 index 7388792..0000000 --- a/modules/services/k3s.nix +++ /dev/null @@ -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 - ''; - }; -} diff --git a/modules/services/virtualization.nix b/modules/services/virtualization.nix index a82690e..1488382 100644 --- a/modules/services/virtualization.nix +++ b/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;