removed ssh-agent calls

heywoodlh · Jan 16, 2025 · b09b04f · b09b04f
1 parent 5503e9d
commit b09b04f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
@@ -269,13 +269,6 @@ in {
       home.packages = [
         myFlakes.packages.${system}.git
       ];
-      home.file.".config/fish/machine.fish" = {
-        enable = true;
-        text = ''
-          # Always set 1password agent on NixOS desktops
-          test -e ~/.1password/agent.sock && export SSH_AUTH_SOCK="$HOME/.1password/agent.sock"
-        '';
-      };
       dconf.settings = {
         "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4" = {
           command = lib.mkForce "${pkgs.gnome-screenshot}/bin/gnome-screenshot -acf";

diff --git a/nixos/roles/remote-access/sshd.nix b/nixos/roles/remote-access/sshd.nix
@@ -53,11 +53,4 @@ in {
   programs.bash.interactiveShellInit = ''
     [ -z $TMUX ] && { ${tmux}/bin/tmux new-session \; send-keys "tmux Space set Space -g Space status Space off Space && Space clear" C-m && exit;}
   '';
-
-  # Start ssh-agent manually if on ssh
-  home-manager.users.heywoodlh.home.file.".config/fish/machine.fish" = {
-    text = ''
-      test -n $SSH_CONNECTION && eval (ssh-agent -c) &> /dev/null
-    '';
-  };
 }
diff --git a/nixos/roles/security/sshd-monitor.nix b/nixos/roles/security/sshd-monitor.nix
@@ -7,7 +7,7 @@ let
     service="sshd.service"
 
     ### Pattern to match with `grep -E ...`
-    grep_regex_pattern='Failed password|Invalid verification code|Invalid user|Accepted publickey|Accepted password|Accepted keyboard-interactive'
+    grep_regex_pattern='Failed password|Invalid verification code|Invalid user|Accepted publickey|Accepted password|Accepted keyboard-interactive|Failed keyboard-interactive'
 
     ### Pattern to exclude with `grep -v -E ...`
     grep_exclude_regex_pattern='root from 100.126.114.23|root from 100.98.176.50|backups from 100.108.106.50'