From 4d7f3000cd378a8ac951e9e6dca3608fb7bfe308 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 22:06:53 -0700
Subject: [PATCH] Move shell aliases to appropriate modules

---
 flake.nix                            |  3 +--
 hosts/cap-nr200p/configuration.nix   | 14 ++------------
 hosts/cap-slim7/configuration.nix    | 12 ++----------
 modules/application-groups/media.nix |  4 ++++
 modules/system/nix-settings.nix      |  7 +++++++
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/flake.nix b/flake.nix
index 481e20b..e5701f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,6 @@
           username = "caperren";
           homeDirectory = "/home/caperren";
         };
-    };
-
+      };
     };
 }
diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index 45d2ce9..1be80a6 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -11,7 +11,7 @@
 
 {
   imports = [
-    # Include the results of the hardware scan.
+    # Hardware Scan
     ./hardware-configuration.nix
 
     # Users
@@ -46,21 +46,11 @@
     ../../modules/application-groups/web.nix
   ];
 
-  networking.hostName = "cap-nr200p"; # Define your hostname.  #-#
+  networking.hostName = "cap-nr200p"; # Define your hostname.
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  programs.bash.shellAliases = {
-    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
-    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
-    nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
-
-    nixlimitfive = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | head -n -5 | cut -d ' ' -f2 | xargs -I {} sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system {}";
-
-    scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/cap-slim7/configuration.nix b/hosts/cap-slim7/configuration.nix
index 99d6a26..8ba226b 100644
--- a/hosts/cap-slim7/configuration.nix
+++ b/hosts/cap-slim7/configuration.nix
@@ -6,7 +6,7 @@
 
 {
   imports = [
-    # Include the results of the hardware scan.
+    # Hardware Scan
     ./hardware-configuration.nix
 
     # Users
@@ -42,20 +42,12 @@
     ../../modules/application-groups/web.nix
   ];
 
-  networking.hostName = "cap-slim7"; # Define your hostname.  #-#
+  networking.hostName = "cap-slim7";
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
   # time.timeZone = "Pacific/Honolulu";
 
-  programs.bash.shellAliases = {
-    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
-    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
-    nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
-
-    nixlimitfive = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | head -n -5 | cut -d ' ' -f2 | xargs -I {} sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system {}";
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/application-groups/media.nix b/modules/application-groups/media.nix
index 437cbc2..e15ce8a 100644
--- a/modules/application-groups/media.nix
+++ b/modules/application-groups/media.nix
@@ -21,6 +21,10 @@
     options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
   '';
 
+  programs.bash.shellAliases = {
+    scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
+  };
+
   environment.systemPackages = with pkgs; [
     deadbeef
     vlc
diff --git a/modules/system/nix-settings.nix b/modules/system/nix-settings.nix
index 63b2989..e327172 100644
--- a/modules/system/nix-settings.nix
+++ b/modules/system/nix-settings.nix
@@ -12,4 +12,11 @@
   # Generally want a larger download buffer
   nix.settings.download-buffer-size = 524288000;
 
+  programs.bash.shellAliases = {
+    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
+    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
+    nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
+
+    nixlimitfive = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | head -n -5 | cut -d ' ' -f2 | xargs -I {} sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system {}";
+  };
 }