home: enable hm and fish program for root

Signed-off-by: Myned <dev@bjork.tech>

configuration.nix

@@ -157,26 +157,42 @@
       inherit inputs;
     };
 
-    users.${config.custom.username} = {
+    users = {
-      programs.home-manager.enable = true;
+      root = {
-      systemd.user.startServices = "sd-switch"; # Start/stop user services immediately
+        # Inherit from user
+        programs.home-manager.enable = config.home-manager.users.${config.custom.username}.programs.home-manager.enable;
+        systemd.user.startServices = config.home-manager.users.${config.custom.username}.systemd.user.startServices;
+        nixpkgs.config = config.home-manager.users.${config.custom.username}.nixpkgs.config;
+        nix.gc = config.home-manager.users.${config.custom.username}.nix.gc;
 
-      # Inherit configuration.nix
+        home = {
-      nixpkgs.config = config.nixpkgs.config;
+          username = "root";
-
+          homeDirectory = "/root";
-      nix.gc = {
+          stateVersion = config.home-manager.users.${config.custom.username}.home.stateVersion;
-        automatic = config.nix.gc.automatic;
+        };
-        frequency = config.nix.gc.dates;
-        options = config.nix.gc.options;
       };
 
-      home = {
+      ${config.custom.username} = {
-        username = config.custom.username;
+        programs.home-manager.enable = true;
-        homeDirectory = "/home/${config.custom.username}";
+        systemd.user.startServices = "sd-switch"; # Start/stop user services immediately
 
-        #!! DO NOT MODIFY ###
+        # Inherit configuration.nix
-        stateVersion = "23.11";
+        nixpkgs.config = config.nixpkgs.config;
-        #!! ############# ###
+
+        nix.gc = {
+          automatic = config.nix.gc.automatic;
+          frequency = config.nix.gc.dates;
+          options = config.nix.gc.options;
+        };
+
+        home = {
+          username = config.custom.username;
+          homeDirectory = "/home/${config.custom.username}";
+
+          #!! DO NOT MODIFY ###
+          stateVersion = "23.11";
+          #!! ############# ###
+        };
       };
     };
   };

options/custom/programs/fish.nix

@@ -14,112 +14,6 @@ in {
     programs.fish = {
       enable = true;
 
-      shellAbbrs = {
-        c = "clear";
-        e = "exit";
-        m = "mosh";
-        s = "ssh";
-        i = "tailscale ip --4";
-
-        "/h" = "cd ~";
-        "/hd" = "cd ~/.dev";
-        "/e" = "cd /etc";
-        "/en" = "cd /etc/nixos";
-        "/n" = "cd /nix";
-        "/nv" = "cd /nix/var";
-        "/nvn" = "cd /nix/var/nix";
-        "/nvnp" = "cd /nix/var/nix/profiles";
-        "/nvnps" = "cd /nix/var/nix/profiles/system";
-        "/r" = "cd /run";
-        "/rc" = "cd /run/current-system";
-
-        f = "flakegen";
-        r = "rebuild";
-        rb = "rebuild boot";
-        rbp = "rebuild boot && poweroff";
-        rbr = "rebuild boot && reboot";
-        rs = "rebuild switch";
-        rt = "rebuild test";
-        t = "target";
-        u = "upgrade";
-        ub = "upgrade boot";
-        ubp = "upgrade boot && poweroff";
-        ubr = "upgrade boot && reboot";
-
-        nd = "nvd diff /run/current-system /nix/var/nix/profiles/system";
-        no = "nh os";
-        nb = "flakegen && nh os boot";
-        nbr = "flakegen && nh os boot && reboot";
-        nbp = "flakegen && nh os boot && poweroff";
-        ns = "flakegen && nh os switch";
-        nt = "flakegen && nh os test";
-
-        jc = "journalctl";
-        sc = "systemctl";
-
-        d = "docker";
-        dc = "docker compose";
-        dcd = "docker compose down";
-        dce = "docker compose exec";
-        dcl = "docker compose logs";
-        dcp = "docker compose pull";
-        dcu = "docker compose up";
-        dcuf = "docker compose up --force-recreate";
-        ds = "docker system";
-
-        g = "git";
-        gb = "git bisect";
-        gbb = "git bisect bad";
-        gbg = "git bisect good";
-        gc = "git clone";
-        gs = "git status";
-
-        ta = "tmux attach";
-        td = "tmux detach";
-        tk = "tmux kill-session";
-        tl = "tmux list-sessions";
-
-        k = "kitten";
-        ks = "kitten ssh";
-      };
-
-      interactiveShellInit = ''
-        # Default is brblack (bright0)
-        set -g fish_color_autosuggestion brgreen
-
-        function exit -d 'Always exit successfully when interactive'
-          builtin exit 0
-        end
-
-        # TODO: Pass flags properly
-        # TODO: Convert to bash
-        function run -d 'Run packages via nixpkg flakes'
-          for i in (seq (count $argv))
-            if ! string match -r '^-' -- $argv[$i]
-              set argv[$i] (string replace -r ^ nixpkgs# $argv[$i])
-            end
-          end
-          nix run $argv
-        end
-
-        function shell -d 'Open packages in new shell via nixpkg flakes'
-          for i in (seq (count $argv))
-            if ! string match -r '^-' -- $argv[$i]
-              set argv[$i] (string replace -r ^ nixpkgs# $argv[$i])
-            end
-          end
-          nix shell $argv
-        end
-
-        function activate -d 'Activate Python venv'
-          source .venv/bin/activate.fish
-        end
-
-        function arknights -d 'Launch Arknights'
-          waydroid app launch com.YoStarEN.Arknights
-        end
-      '';
-
       promptInit = ''
         # Disable greeting
         set -g fish_greeting
@@ -157,5 +51,193 @@ in {
         end
       '';
     };
+
+    home-manager.users = {
+      # Inherit root abbreviations from user
+      root.programs.fish = {
+        enable = true;
+        shellAbbrs = config.home-manager.users.${config.custom.username}.programs.fish.shellAbbrs;
+      };
+
+      ${config.custom.username}.programs.fish = let
+        any = expansion: {
+          inherit expansion;
+          position = "anywhere";
+        };
+      in {
+        enable = true;
+
+        shellAbbrs = {
+          # Expand abbreviations anywhere in the shell
+          #?? sudo ABBREVIATION
+          "/e" = any "/etc";
+          "/en" = any "/etc/nixos";
+          "/h" = any "~";
+          "/hd" = any "~/.dev";
+          "/n" = any "/nix";
+          "/nv" = any "/nix/var";
+          "/nvn" = any "/nix/var/nix";
+          "/nvnp" = any "/nix/var/nix/profiles";
+          "/nvnps" = any "/nix/var/nix/profiles/system";
+          "/r" = any "/run";
+          "/rc" = any "/run/current-system";
+
+          reboot = any "systemctl reboot";
+          restart = any "systemctl reboot";
+          poweroff = any "systemctl poweroff";
+          shutdown = any "systemctl poweroff";
+
+          backup = any "borgmatic -v 1 create --progress --stats";
+          extract = any "borgmatic -v 1 extract --progress";
+          init = any "borgmatic init -e repokey-blake2";
+          key = any "borgmatic key export";
+          list = any "borgmatic -v 1 list";
+          restore = any "borgmatic -v 1 restore";
+
+          rsync = any "rsync --info=progress2";
+
+          jc = any "journalctl";
+          jcs = any "journalctl --system";
+          jcse = any "journalctl --system --pager-end";
+          jcseu = any "journalctl --system --pager-end --unit";
+          jcsf = any "journalctl --system --follow";
+          jcsfu = any "journalctl --system --follow --unit";
+          jcsi = any "journalctl --system --identifier";
+          jcst = any "journalctl --system --target";
+          jcsu = any "journalctl --system --unit";
+          jcu = any "journalctl --user";
+          jcue = any "journalctl --user --pager-end";
+          jcueu = any "journalctl --user --pager-end --unit";
+          jcuf = any "journalctl --user --follow";
+          jcufu = any "journalctl --user --follow --unit";
+          jcui = any "journalctl --user --identifier";
+          jcut = any "journalctl --user --target";
+          jcuu = any "journalctl --user --unit";
+
+          sc = any "systemctl";
+          scp = any "systemctl poweroff";
+          scr = any "systemctl reboot";
+          scs = any "systemctl --system";
+          scsd = any "systemctl --system disable";
+          scsdn = any "systemctl --system disable --now";
+          scse = any "systemctl --system reenable";
+          scsen = any "systemctl --system reenable --now";
+          scsh = any "systemctl --system show";
+          scsl = any "systemctl --system list-unit-files";
+          scsm = any "systemctl --system mask";
+          scsr = any "systemctl --system restart";
+          scsrr = any "systemctl --system reload-or-restart";
+          scss = any "systemctl --system status";
+          scst = any "systemctl --system stop";
+          scsu = any "systemctl --system unmask";
+          scu = any "systemctl --user";
+          scud = any "systemctl --user disable";
+          scudn = any "systemctl --user disable --now";
+          scue = any "systemctl --user reenable";
+          scuen = any "systemctl --user reenable --now";
+          scuh = any "systemctl --user show";
+          scul = any "systemctl --user list-unit-files";
+          scum = any "systemctl --user mask";
+          scur = any "systemctl --user restart";
+          scurr = any "systemctl --user reload-or-restart";
+          scus = any "systemctl --user status";
+          scut = any "systemctl --user stop";
+          scuu = any "systemctl --user unmask";
+
+          d = any "docker";
+          dc = any "docker compose";
+          dcd = any "docker compose down";
+          dce = any "docker compose exec";
+          dcl = any "docker compose logs";
+          dcp = any "docker compose pull";
+          dcu = any "docker compose up";
+          dcuf = any "docker compose up --force-recreate";
+          de = any "docker exec";
+          dei = any "docker exec --interactive";
+          deit = any "docker exec --interactive --tty";
+          det = any "docker exec --tty";
+          di = any "docker images";
+          dk = any "docker kill";
+          dn = any "docker network";
+          dnl = any "docker network ls";
+          dp = any "docker pull";
+          dps = any "docker ps";
+          dpsa = any "docker ps --all --size";
+          dr = any "docker rm";
+          ds = any "docker system";
+          dsp = any "docker system prune";
+          dspav = any "docker system prune --all --volumes";
+
+          c = "clear";
+          e = "exit";
+          m = "mosh";
+          s = "ssh";
+
+          ip = "tailscale ip --4";
+
+          n = "nixos";
+          nb = "nixos build";
+          nbb = "nixos build boot";
+          nbs = "nixos build switch";
+          nbt = "nixos build test";
+          nd = "nixos diff";
+          ng = "nixos generate";
+          nl = "nixos list";
+          nr = "nixos repl";
+
+          g = "git";
+          gb = "git bisect";
+          gbb = "git bisect bad";
+          gbg = "git bisect good";
+          gc = "git clone";
+          gs = "git status";
+
+          ta = "tmux attach";
+          td = "tmux detach";
+          tk = "tmux kill-session";
+          tl = "tmux list-sessions";
+
+          k = "kitten";
+          ks = "kitten ssh";
+        };
+
+        interactiveShellInit = ''
+          # Default is brblack (bright0)
+          set -g fish_color_autosuggestion brgreen
+
+          function exit -d 'Always exit successfully when interactive'
+            builtin exit 0
+          end
+
+          # TODO: Pass flags properly
+          # TODO: Convert to bash
+          function run -d 'Run packages via nixpkg flakes'
+            for i in (seq (count $argv))
+              if ! string match -r '^-' -- $argv[$i]
+                set argv[$i] (string replace -r ^ nixpkgs# $argv[$i])
+              end
+            end
+            nix run $argv
+          end
+
+          function shell -d 'Open packages in new shell via nixpkg flakes'
+            for i in (seq (count $argv))
+              if ! string match -r '^-' -- $argv[$i]
+                set argv[$i] (string replace -r ^ nixpkgs# $argv[$i])
+              end
+            end
+            nix shell $argv
+          end
+
+          function activate -d 'Activate Python venv'
+            source .venv/bin/activate.fish
+          end
+
+          function arknights -d 'Launch Arknights'
+            waydroid app launch com.YoStarEN.Arknights
+          end
+        '';
+      };
+    };
   };
 }

options/custom/settings/environment.nix

@@ -35,20 +35,6 @@ in {
       };
 
       shellAliases = {
-        backup = "sudo borgmatic -v 1 create --progress --stats";
-        extract = "sudo borgmatic -v 1 extract --progress";
-        restore = "sudo borgmatic -v 1 restore";
-        list = "sudo borgmatic -v 1 list";
-        init = "sudo borgmatic init -e repokey-blake2";
-        key = "sudo borgmatic key export";
-
-        reboot = "sudo systemctl reboot";
-        restart = "sudo systemctl reboot";
-        poweroff = "sudo systemctl poweroff";
-        shutdown = "sudo systemctl poweroff";
-
-        rsync = "rsync --info=progress2";
-
         # https://github.com/aksiksi/compose2nix?tab=readme-ov-file#usage
         # https://github.com/aksiksi/compose2nix?tab=readme-ov-file#agenix
         compose2nix = concatStringsSep " " [