Merge branch 'nod'

home-modules/bash.nix

@@ -1,6 +1,10 @@
-{ ... }: 
+{ pkgs, ... }: 
 {
-  programs.bash = {
+  programs.bash = let
+    init = /* bash */ ''
+      source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    '';
+  in {
     enable = true;
     shellAliases = {
       ll = "ls -l"; 
@@ -15,5 +19,10 @@
       "checkjobs"
     ];
     enableCompletion = false;
-  }; 
+    
+  } //  pkgs.lib.mkIf (pkgs.version != "24.05") {
+    shellInit = init;
+  } //  pkgs.lib.mkIf (pkgs.version != "25.05") {
+    profileExtra = init; 
+  };
 }

home-modules/fish.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
-    fish
     any-nix-shell
 
     (writeShellScriptBin "nxfetch" /* bash */ ''
@@ -40,6 +39,7 @@
 
   programs.fish = {
     enable = true;
+    package = pkgs.fish;
     shellAliases = let
       base-eza = "eza --icons --git --smart-group --group-directories-first";
     in {
@@ -115,7 +115,7 @@
       '';
       nx_backup = let
         destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
-      in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxDCS") ''
+      in pkgs.lib.mkIf (hyper.host == "NxXPS" || hyper.host == "NxNORTH") ''
         set RPATH (curl -s https://${hyper.domain}/latest-backup)
         rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
       '';

home-modules/gpg.nix

@@ -39,10 +39,6 @@
     enableFishIntegration = true;
     defaultCacheTtlSsh = min2sec 60;
     defaultCacheTtl = min2sec 30;
-    pinentry = {
-      package = pkgs.pinentry;
-      program = "pinentry";
-    };
     extraConfig = ''
       allow-loopback-pinentry
     '';

home-modules/hyprland.nix

@@ -41,7 +41,7 @@ in {
       # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
       # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
       # inputs.hycov.packages.${pkgs.system}.hycov
-      pkgs.hyprlandPlugins.hyprspace
+      # pkgs.hyprlandPlugins.hyprspace
       # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
     ];
 

home-modules/pkgs-list/shell.nix

@@ -34,6 +34,7 @@
     systemctl-tui
     tldr
     w3m
+    which
     yt-dlp
   ];
 }

home-modules/ssh.nix

@@ -8,7 +8,7 @@
       nxace = name: {
         host = name;
         hostname = "ssh.${hyper.domain}";
-        user = hyper.user;
+        user = "nx2";
         port = 50022;
         identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}";
       };

home-modules/yazi.nix

@@ -1,39 +1,17 @@
 { pkgs, ... }@all: with all; let
+  nox-var = (pkgs.version != "24.05");
   tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
 in {
   home.packages = [
     pkgs.unar
     tfc
   ];
-  
   programs.yazi = {
     enable = true;
     # package = pkgs.yazi;
     package = inputs.yazi.packages.${hyper.system}.default;
     enableFishIntegration = true;
-    shellWrapperName = "ya";
-    initLua = /* lua */ ''
-      require("zoxide"):setup {
-      	update_db = true,
-      }
-      Status:children_add(function()
-      	local h = cx.active.current.hovered
-      	if not h or ya.target_family() ~= "unix" then
-      		return ""
-      	end
-
-      	return ui.Line {
-      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
-      		":",
-      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
-      		" ",
-      	}
-      end, 500, Status.RIGHT)
-    '';
-    plugins = with pkgs; {
-      inherit glow git;
-    };
-    # initLua = /* lua */  '' '';
+    # initLua = /* lua */  '' ''; # down
     keymap = {
       mgr.keymap = [
       	{ on = "<Esc>"; run = "escape";             desc = "Exit visual mode, clear selected, or cancel search"; }
@@ -403,7 +381,31 @@ in {
         ];
       };
     };
-  };
+  } // (if nox-var then {
+    shellWrapperName = "ya";
+    initLua = /* lua */ ''
+      require("zoxide"):setup {
+      	update_db = true,
+      }
+      Status:children_add(function()
+      	local h = cx.active.current.hovered
+      	if not h or ya.target_family() ~= "unix" then
+      		return ""
+      	end
+
+      	return ui.Line {
+      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+      		":",
+      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+      		" ",
+      	}
+      end, 500, Status.RIGHT)
+    '';
+    plugins = with pkgs; {
+      inherit glow git;
+    };
+  } else {});
+  
   xdg = {
     configFile."xdg-desktop-portal-termfilechooser/config" = {
       force = true;