From f5d2dbcbf2bfe215540d8b9523dc290808243ae6 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Tue, 18 Mar 2025 22:21:07 -0700 Subject: [PATCH] add base-plus construct --- provision/hosts/htpc/configuration.nix | 2 +- provision/hosts/kestrel/configuration.nix | 2 +- provision/hosts/osprey/configuration.nix | 2 +- provision/hosts/shivan/configuration.nix | 2 +- provision/hosts/torus/configuration.nix | 2 +- provision/modules/base/default.nix | 1 + provision/modules/base/plus/default.nix | 9 +++++++++ provision/modules/default.nix | 1 - provision/modules/extra/default.nix | 9 --------- provision/modules/programs/beancount.nix | 2 +- provision/modules/programs/borg.nix | 2 +- provision/modules/programs/yt-dlp.nix | 24 +++++++++++++---------- 12 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 provision/modules/base/plus/default.nix delete mode 100644 provision/modules/extra/default.nix diff --git a/provision/hosts/htpc/configuration.nix b/provision/hosts/htpc/configuration.nix index 141b4628..4f5357e1 100644 --- a/provision/hosts/htpc/configuration.nix +++ b/provision/hosts/htpc/configuration.nix @@ -10,7 +10,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 6edd08d4..5a323653 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -32,7 +32,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/osprey/configuration.nix b/provision/hosts/osprey/configuration.nix index d0934344..d8e94ab5 100644 --- a/provision/hosts/osprey/configuration.nix +++ b/provision/hosts/osprey/configuration.nix @@ -28,7 +28,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix index 3ee8460d..437b524b 100644 --- a/provision/hosts/shivan/configuration.nix +++ b/provision/hosts/shivan/configuration.nix @@ -14,7 +14,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix index a927c220..73618939 100644 --- a/provision/hosts/torus/configuration.nix +++ b/provision/hosts/torus/configuration.nix @@ -92,7 +92,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; services = { ssh.enable = true; syncthing = { diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix index 75d00620..aa064c8e 100644 --- a/provision/modules/base/default.nix +++ b/provision/modules/base/default.nix @@ -2,6 +2,7 @@ { imports = [ ./terminal.nix + ./plus ../programs/chezmoi.nix ../programs/git.nix ../programs/nvim.nix diff --git a/provision/modules/base/plus/default.nix b/provision/modules/base/plus/default.nix new file mode 100644 index 00000000..2afac545 --- /dev/null +++ b/provision/modules/base/plus/default.nix @@ -0,0 +1,9 @@ +{ lib, ... }: +{ + imports = [ + ../../programs/beancount.nix + ../../programs/borg.nix + ../../programs/yt-dlp.nix + ]; + options.modules.base-plus.enable = lib.mkEnableOption "base-plus"; +} diff --git a/provision/modules/default.nix b/provision/modules/default.nix index c2f34063..ffdbcc6e 100644 --- a/provision/modules/default.nix +++ b/provision/modules/default.nix @@ -4,7 +4,6 @@ ./base ./desktop ./devel - ./extra ./gaming ./programs ./services diff --git a/provision/modules/extra/default.nix b/provision/modules/extra/default.nix deleted file mode 100644 index 0bea0035..00000000 --- a/provision/modules/extra/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: -{ - imports = [ - ../programs/beancount.nix - ../programs/borg.nix - ../programs/yt-dlp.nix - ]; - options.modules.extra.enable = lib.mkEnableOption "extra"; -} diff --git a/provision/modules/programs/beancount.nix b/provision/modules/programs/beancount.nix index 504ed13f..8f55ff43 100644 --- a/provision/modules/programs/beancount.nix +++ b/provision/modules/programs/beancount.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, user, ... }: -let cfg = config.modules.extra; +let cfg = config.modules.base-plus; in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/provision/modules/programs/borg.nix b/provision/modules/programs/borg.nix index 7cedea8b..94a9693d 100644 --- a/provision/modules/programs/borg.nix +++ b/provision/modules/programs/borg.nix @@ -1,6 +1,6 @@ { config, pkgs, user, lib, ... }: -let cfg = config.modules.extra; +let cfg = config.modules.base-plus; in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/provision/modules/programs/yt-dlp.nix b/provision/modules/programs/yt-dlp.nix index 82595713..dd6ca632 100644 --- a/provision/modules/programs/yt-dlp.nix +++ b/provision/modules/programs/yt-dlp.nix @@ -1,12 +1,16 @@ { config, lib, pkgs, user, ... }: -{ - environment.systemPackages = with pkgs; [ - yt-dlp # Command-line tool to download videos - (pkgs.writeScriptBin "ytd_audio" '' - #!/usr/bin/env bash - yt-dlp -x \ - -ciw -o "%(title)s.%(ext)s" \ - --embed-thumbnail -S acodec:m4a "$1" - '') - ]; + +let cfg = config.modules.base-plus; +in { + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + yt-dlp # Command-line tool to download videos + (pkgs.writeScriptBin "ytd_audio" '' + #!/usr/bin/env bash + yt-dlp -x \ + -ciw -o "%(title)s.%(ext)s" \ + --embed-thumbnail -S acodec:m4a "$1" + '') + ]; + }; }