From 50d5b541509affff6723e2ab2c1a4c87354a1d44 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Mon, 31 Mar 2025 23:08:07 +0300
Subject: [PATCH] modules/home/programs/shell/fish.nix: add joshuto alias
 hosts/dunamis/users.nix: concat in the function

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 hosts/dunamis/users.nix              | 3 ++-
 modules/home/programs/shell/fish.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosts/dunamis/users.nix b/hosts/dunamis/users.nix
index 0b563ad..a5a4cbb 100644
--- a/hosts/dunamis/users.nix
+++ b/hosts/dunamis/users.nix
@@ -5,6 +5,7 @@
   ...
 }: let
   sopSec = config.sops.secrets;
+  s = inputs.mysecrets;
 in {
   nix.settings.trusted-users = ["user" "nix-ssh"];
   users.mutableUsers = false;
@@ -14,7 +15,7 @@ in {
       extraGroups = ["wheel" "video" "libvirtd" "dialout"];
       isNormalUser = true;
       shell = pkgs.fish;
-      openssh.authorizedKeys.keyFiles = map (f: "${inputs.mysecrets}/ssh/" + f) [
+      openssh.authorizedKeys.keyFiles = map (f: s + "/ssh/" + f) [
         "id_ed25519_sarien_user.pub"
         "id_ed25519_eldrid_user.pub"
       ];
diff --git a/modules/home/programs/shell/fish.nix b/modules/home/programs/shell/fish.nix
index e031b90..71ef765 100644
--- a/modules/home/programs/shell/fish.nix
+++ b/modules/home/programs/shell/fish.nix
@@ -36,11 +36,12 @@ in {
           cd = "z";
           ed = "$EDITOR";
           jf = "jj-fzf"; # think of jeff
+          jo = "joshuto"; # think of josh
           l = "ls -lah";
           la = "ls -ah";
           ll = "ls -lh";
-          s = "systemctl";
           p = "pueue";
+          s = "systemctl";
         };
         shellAbbrs = {
           pa = "pueue add --";