From b033a752ae9340a9680fcc14b44b88f2916f14d6 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Wed, 12 Mar 2025 22:22:49 -0700
Subject: [PATCH] migrate to base as part of modules

---
 provision/modules/base/default.nix           |  6 ++++
 provision/modules/base/terminal.nix          | 23 +++++++++++++
 provision/modules/default.nix                |  1 +
 provision/modules/programs/base-terminal.nix | 34 --------------------
 provision/modules/programs/default.nix       |  1 -
 5 files changed, 30 insertions(+), 35 deletions(-)
 create mode 100644 provision/modules/base/default.nix
 create mode 100644 provision/modules/base/terminal.nix
 delete mode 100644 provision/modules/programs/base-terminal.nix

diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix
new file mode 100644
index 00000000..6160470a
--- /dev/null
+++ b/provision/modules/base/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./terminal.nix
+  ];
+}
diff --git a/provision/modules/base/terminal.nix b/provision/modules/base/terminal.nix
new file mode 100644
index 00000000..d38d52f8
--- /dev/null
+++ b/provision/modules/base/terminal.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, user, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    killall # Command-line utility to terminate processes by name
+    pciutils # Utilities for inspecting and manipulating devices connected to the PCI bus
+    btop # Terminal-based resource monitor, providing an interactive view of system resources
+    nix-search-cli # Command-line utility for searching the Nix package repository
+    rbw # Command-line interface to the Bitwarden password manager
+    pinentry-curses # Simple curses-based passphrase entry dialog for GnuPG
+    bash # GNU Bourne-Again SHell, a command language interpreter for Unix-like operating systems
+    bash-completion # Provides programmable completion for the bash shell
+    tmux # Terminal multiplexer, allowing multiple terminal sessions within a single window
+    nnn # Terminal file manager with a focus on performance and ease of use
+    advcpmv # Advanced version of the Unix utilities cp and mv
+    unzip # Command-line utility for extracting files from ZIP archives
+    trash-cli # Command-line interface to the freedesktop.org Trash
+    vim # Text editor that is highly configurable and widely used, especially in the Unix environment
+    ripgrep # Line-oriented search tool that recursively searches directories for a regex pattern
+    sesh # Smart session manager for the terminal
+    zoxide # Fast cd command that learns your habits
+    fzf # Command-line fuzzy finder for Unix-like operating systems
+  ];
+}
diff --git a/provision/modules/default.nix b/provision/modules/default.nix
index 0490f1a8..ffdbcc6e 100644
--- a/provision/modules/default.nix
+++ b/provision/modules/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [ 
+    ./base
     ./desktop 
     ./devel 
     ./gaming 
diff --git a/provision/modules/programs/base-terminal.nix b/provision/modules/programs/base-terminal.nix
deleted file mode 100644
index 340e9c7d..00000000
--- a/provision/modules/programs/base-terminal.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.programs.base-terminal;
-in {
-  options.modules.programs.base-terminal = with lib; {
-    enable = lib.mkOption {
-      type = with types; bool;
-      default = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      killall # Command-line utility to terminate processes by name
-      pciutils # Utilities for inspecting and manipulating devices connected to the PCI bus
-      btop # Terminal-based resource monitor, providing an interactive view of system resources
-      nix-search-cli # Command-line utility for searching the Nix package repository
-      rbw # Command-line interface to the Bitwarden password manager
-      pinentry-curses # Simple curses-based passphrase entry dialog for GnuPG
-      bash # GNU Bourne-Again SHell, a command language interpreter for Unix-like operating systems
-      bash-completion # Provides programmable completion for the bash shell
-      tmux # Terminal multiplexer, allowing multiple terminal sessions within a single window
-      nnn # Terminal file manager with a focus on performance and ease of use
-      advcpmv # Advanced version of the Unix utilities cp and mv
-      unzip # Command-line utility for extracting files from ZIP archives
-      trash-cli # Command-line interface to the freedesktop.org Trash
-      vim # Text editor that is highly configurable and widely used, especially in the Unix environment
-      ripgrep # Line-oriented search tool that recursively searches directories for a regex pattern
-      sesh # Smart session manager for the terminal
-      zoxide # Fast cd command that learns your habits
-      fzf # Command-line fuzzy finder for Unix-like operating systems
-    ];
-  };
-}
diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix
index 1b42752f..87a20657 100644
--- a/provision/modules/programs/default.nix
+++ b/provision/modules/programs/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./appgate-sdp.nix
-    ./base-terminal.nix
     ./beancount.nix
     ./borg.nix
     ./chrome.nix