add base-plus construct

provision/hosts/htpc/configuration.nix

@@ -10,7 +10,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/kestrel/configuration.nix

@@ -32,7 +32,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/osprey/configuration.nix

@@ -28,7 +28,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/shivan/configuration.nix

@@ -14,7 +14,7 @@
   
   # Modules
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/torus/configuration.nix

@@ -92,7 +92,7 @@
 
   # Modules
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     services = {
       ssh.enable = true;
       syncthing = {

provision/modules/base/default.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     ./terminal.nix
+    ./plus
     ../programs/chezmoi.nix
     ../programs/git.nix
     ../programs/nvim.nix

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";
+}

provision/modules/default.nix

@@ -4,7 +4,6 @@
     ./base
     ./desktop 
     ./devel 
-    ./extra
     ./gaming 
     ./programs 
     ./services

provision/modules/extra/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports = [
-    ../programs/beancount.nix
-    ../programs/borg.nix
-    ../programs/yt-dlp.nix
-  ];
-  options.modules.extra.enable = lib.mkEnableOption "extra";
-}

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; [ 

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; [

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"
+      '')
+    ];
+  };
 }