From f67982c55ba18c456dcad1e28790cb7178c3733a Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Tue, 27 Feb 2024 02:48:17 -0500
Subject: [PATCH] global/shell: refactor to only use sudo where applicable

---
 modules/global/shell.nix | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/global/shell.nix b/modules/global/shell.nix
index 5b91b8a..c2ef22f 100644
--- a/modules/global/shell.nix
+++ b/modules/global/shell.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   ifSudo = lib.mkIf config.security.sudo.enable;
+  ifSudo' = text: if config.security.sudo.enable then "sudo ${text}" else text;
 in
 {
   programs = {
@@ -52,7 +53,22 @@ in
     # internet ip
     myip = "echo $(curl -s ipecho.net/plain)";
 
+    # systemd
+    ctl = "systemctl";
+    stl = ifSudo' "systemctl";
+    utl = "systemctl --user";
+    ut = "utl start";
+    un = "utl stop";
+    ur = "utl restart";
+    up = "stl start";
+    dn = "stl stop";
+    rt = "stl restart";
+    jtl = "journalctl";
+
     # Miscellaneous
+    mnt = ifSudo' "mount";
+    umnt = ifSudo' "umount";
+
     dd = "dd status=progress";
 
     cat = "bat --paging=never";
@@ -75,18 +91,6 @@ in
     si = ifSudo "sudo -i";
     se = ifSudo "sudoedit";
 
-    # systemd
-    ctl = "systemctl";
-    stl = ifSudo "s systemctl";
-    utl = "systemctl --user";
-    ut = "utl start";
-    un = "utl stop";
-    ur = "utl restart";
-    up = ifSudo "stl start";
-    dn = ifSudo "stl stop";
-    rt = ifSudo "stl restart";
-    jtl = "journalctl";
-
     # Miscellaneous
     acat = "mpv --no-audio-display";
     vcat = "mpv";
@@ -94,9 +98,6 @@ in
     lsdisk = "lsblk -o name,size,mountpoints,fstype,label,uuid,fsavail,fsuse%";
     lsdiskw = "while true; do clear; lsdisk; sleep 1; done";
 
-    mnt = ifSudo "s mount";
-    umnt = ifSudo "s umount";
-
     # yt-dlp
     yt-m4a = ''yt-dlp -f "bestaudio[ext=m4a]" -o "%(title)s.%(ext)s"'';
     yt-mp4 = ''yt-dlp -f "best[ext=mp4]" -o "%(title)s.%(ext)s"'';