aboutsummaryrefslogtreecommitdiff
path: root/.config/fish
diff options
context:
space:
mode:
Diffstat (limited to '.config/fish')
-rw-r--r--.config/fish/config.fish4
-rw-r--r--.config/fish/fish_variables1
-rw-r--r--.config/fish/functions/fish_ssh_agent.fish32
3 files changed, 36 insertions, 1 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0ec137c..8bb596e 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -15,6 +15,7 @@ if status is-interactive
abbr --add --global rM 'rm -f'
abbr --add --global rf 'rm -r'
abbr --add --global x 'chmod +x'
+ abbr -a gitssh 'ssh-add /home/zt/.ssh/MikunoNaka-GitHub'
# general PATH
fish_add_path $HOME/.scripts
@@ -40,5 +41,6 @@ if status is-interactive
set -x PAGER "bat"
# disable greeting
- set fish_greeting
+ set fish_greeting
+ fish_ssh_agent
end
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index b9c7ac6..5d819a0 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -6,6 +6,7 @@ SETUVAR _fish_abbr_ga:git\x20add
SETUVAR _fish_abbr_gc:git\x20commit
SETUVAR _fish_abbr_gcl:git\x20clone
SETUVAR _fish_abbr_gcm:git\x20commit\x20\x2dm
+SETUVAR _fish_abbr_gitssh:ssh\x2dadd\x20/home/zt/\x2essh/MikunoNaka\x2dGitHub
SETUVAR _fish_abbr_gp:git\x20push
SETUVAR _fish_abbr_gs:git\x20status
SETUVAR _fish_abbr_rF:rm\x20\x2drf
diff --git a/.config/fish/functions/fish_ssh_agent.fish b/.config/fish/functions/fish_ssh_agent.fish
new file mode 100644
index 0000000..5960b75
--- /dev/null
+++ b/.config/fish/functions/fish_ssh_agent.fish
@@ -0,0 +1,32 @@
+function __ssh_agent_is_started -d "check if ssh agent is already started"
+ if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
+ source $SSH_ENV > /dev/null
+ end
+
+ if test -z "$SSH_AGENT_PID"
+ return 1
+ end
+
+ ps -ef | grep $SSH_AGENT_PID | grep -v grep | grep -q ssh-agent
+ #pgrep ssh-agent
+ return $status
+end
+
+
+function __ssh_agent_start -d "start a new ssh agent"
+ ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV
+ chmod 600 $SSH_ENV
+ source $SSH_ENV > /dev/null
+ true # suppress errors from setenv, i.e. set -gx
+end
+
+
+function fish_ssh_agent --description "Start ssh-agent if not started yet, or uses already started ssh-agent."
+ if test -z "$SSH_ENV"
+ set -xg SSH_ENV $HOME/.ssh/environment
+ end
+
+ if not __ssh_agent_is_started
+ __ssh_agent_start
+ end
+end