From 662cf1bcdce707d981e1eff7764c82c5492e6cb6 Mon Sep 17 00:00:00 2001 From: mitchell Date: Mon, 13 Dec 2021 00:16:38 -0500 Subject: [PATCH] Set umask, update aliases, and convert some to binds --- .config/fish/config.fish | 3 ++ .config/fish/functions/define_aliases.fish | 31 +++++++++---------- .config/fish/functions/do.fish | 9 ++++++ .../functions/fish_user_key_bindings.fish | 7 ++++- .config/fish/functions/redisco.fish | 8 +++++ .config/fish/functions/ssh_a.fish | 11 ------- .config/fish/functions/ssh_add.fish | 14 +++++++++ 7 files changed, 55 insertions(+), 28 deletions(-) create mode 100644 .config/fish/functions/do.fish create mode 100644 .config/fish/functions/redisco.fish delete mode 100644 .config/fish/functions/ssh_a.fish create mode 100644 .config/fish/functions/ssh_add.fish diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3ecc33b..59984c7 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -2,6 +2,9 @@ function configure_fish # Determine OS set uname (uname) + # Set umask + umask 077 + # Begin profile init # (These functions are defined in the functions/ directory.) define_global_variables diff --git a/.config/fish/functions/define_aliases.fish b/.config/fish/functions/define_aliases.fish index cae0c96..0d9e75d 100644 --- a/.config/fish/functions/define_aliases.fish +++ b/.config/fish/functions/define_aliases.fish @@ -1,14 +1,10 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands' alias rcp 'rsync -aP' - alias dm 'docker-machine' - alias v 'nvim +FZF' - alias j 'joplin' alias vg 'vagrant' alias tf 'terraform' alias tocb 'xclip -in -selection clipboard' alias fromcb 'xclip -out -selection clipboard' alias ssh-rm 'ssh-keygen -f ~/.ssh/known_hosts -R' - alias wiki 'nvim +VimwikiIndex' alias age-p 'age --armor --passphrase' alias age-d 'age --decrypt --identity ~/.secrets/id_ed25519' alias age-e 'age --armor --recipient (cat ~/.secrets/id_ed25519.pub)' @@ -27,10 +23,11 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands' alias rider 'open -a Rider' alias webstorm 'open -a Webstorm' - alias get 'brew install' - alias getu 'brew upgrade' - alias gets 'brew search' - alias getr 'brew uninstall' + alias pkm 'brew search' + alias pkmi 'brew install' + alias pkmf 'brew update' + alias pkmu 'brew upgrade' + alias pkmr 'brew uninstall' end # Linux distro specific aliases below @@ -47,16 +44,18 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands' switch "$distro" case 'arch' - alias get 'pikaur -S' - alias getu 'pikaur -Syu' - alias gets 'pikaur' - alias getr 'pikaur -Rsu' + alias pkm 'pikaur' + alias pkmi 'pikaur --sync' + alias pkmf 'pikaur --sync --refresh' + alias pkmu 'pikaur --sync --sysupgrade' + alias pkmr 'pikaur -Rsu' case 'debian' - alias get 'sudo apt update; and sudo apt install' - alias getu 'sudo apt update; and sudo apt upgrade; and sudo apt autoremove; and sudo apt autoclean' - alias gets 'sudo apt update; and apt search' + alias pkm 'apt search' + alias pkmi 'sudo apt install' + alias pkmf 'sudo apt update' + alias pkmu 'sudo apt upgrade; and sudo apt autoremove; and sudo apt autoclean' - function getr -d 'Alias for apt uninstall and autoremove' + function pkmr -d 'Alias for apt uninstall and autoremove' sudo apt purge $argv; and sudo apt autoremove end end diff --git a/.config/fish/functions/do.fish b/.config/fish/functions/do.fish new file mode 100644 index 0000000..843c01d --- /dev/null +++ b/.config/fish/functions/do.fish @@ -0,0 +1,9 @@ +function do -d 'Repeat the command for each given argument' + set command (string split ' ' $argv[1]) + and set args $argv[2..] + or return 1 + + for arg in $args + $command $arg + end +end diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish index 90a9a82..0f1f5d6 100644 --- a/.config/fish/functions/fish_user_key_bindings.fish +++ b/.config/fish/functions/fish_user_key_bindings.fish @@ -1,3 +1,8 @@ function fish_user_key_bindings - bind -s --preset -M insert jj "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char repaint-mode; end" + bind --mode insert jj "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char repaint-mode; end" + bind --mode insert ,a 'ssh_add; commandline -f repaint' + bind --mode insert ,j 'joplin; commandline -f repaint' + bind --mode insert ,p 'nvim +FZF; commandline -f repaint' + bind --mode insert ,w 'nvim +VimwikiIndex; commandline -f repaint' + bind --mode insert ,n 'n; commandline -f repaint' end diff --git a/.config/fish/functions/redisco.fish b/.config/fish/functions/redisco.fish new file mode 100644 index 0000000..ec7d0d0 --- /dev/null +++ b/.config/fish/functions/redisco.fish @@ -0,0 +1,8 @@ +function redisco + while pgrep Discord >/dev/null 2>&1 + pkill Discord + sleep 1 + end + + discord >/dev/null 2>&1 & disown +end diff --git a/.config/fish/functions/ssh_a.fish b/.config/fish/functions/ssh_a.fish deleted file mode 100644 index 1f8e281..0000000 --- a/.config/fish/functions/ssh_a.fish +++ /dev/null @@ -1,11 +0,0 @@ -function ssh_a -d 'Shortcut for adding keys to ssh agent' - argparse --max-args 1 's/seedly' 'r/rsa' -- $argv - - if test -n "$_flag_s" - ssh-add ~/.secrets/seedly_ed25519 - else if test -n "$_flag_r" - ssh-add ~/.secrets/id_rsa - else - ssh-add ~/.secrets/id_ed25519 - end -end diff --git a/.config/fish/functions/ssh_add.fish b/.config/fish/functions/ssh_add.fish new file mode 100644 index 0000000..2b5c033 --- /dev/null +++ b/.config/fish/functions/ssh_add.fish @@ -0,0 +1,14 @@ +function ssh_add -d 'Shortcut for adding keys to ssh agent' + read --prompt-str='e/r/s? ' args + + argparse --max-args 1 's/seedly' 'r/rsa' -- $args + + switch $args + case s seedly + ssh-add ~/.secrets/seedly_ed25519 + case r rsa + ssh-add ~/.secrets/id_rsa + case '*' + ssh-add ~/.secrets/id_ed25519 + end +end