diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 946e8c6..e347acd 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,12 +1,12 @@ function configure_fish - # Determine OS - set uname (uname) + # Determine OS + set uname (uname) - # Begin profile init - # (These functions are defined in the functions/ directory.) - define_global_variables - import_sources $uname - define_aliases $uname + # Begin profile init + # (These functions are defined in the functions/ directory.) + define_global_variables + import_sources $uname + define_aliases $uname end configure_fish diff --git a/.config/fish/functions/back.fish b/.config/fish/functions/back.fish index b76f08c..5288b85 100644 --- a/.config/fish/functions/back.fish +++ b/.config/fish/functions/back.fish @@ -1,6 +1,6 @@ function back -d 'A shortcut for backgrounding a command using nohup and named log file' - set log_name (string join _ $argv) + set log_name (string join _ $argv) - echo "log file: $log_name.out" - nohup $argv > "$log_name.out" & + echo "log file: $log_name.out" + nohup $argv > "$log_name.out" & end diff --git a/.config/fish/functions/dm_env.fish b/.config/fish/functions/dm_env.fish index 1eeb7d6..2a026d6 100644 --- a/.config/fish/functions/dm_env.fish +++ b/.config/fish/functions/dm_env.fish @@ -1,3 +1,3 @@ function dm-env -d 'Shortcut for setting your shell env for a docker-machine' - eval (docker-machine env $argv) + eval (docker-machine env $argv) end diff --git a/.config/fish/functions/editcb.fish b/.config/fish/functions/editcb.fish index ecf0ccd..492fbee 100644 --- a/.config/fish/functions/editcb.fish +++ b/.config/fish/functions/editcb.fish @@ -1,24 +1,24 @@ function editcb -a ft -d 'Opens your editor to the cliboard\'s current contents.' - set uname (uname) - set file "._temp.$ft" + set uname (uname) + set file "._temp.$ft" - touch $file + touch $file - switch "$uname" - case 'Linux' - xclip -out -selection clipboard > $file - case 'Darwin' - pbpaste > $file - end + switch "$uname" + case 'Linux' + xclip -out -selection clipboard > $file + case 'Darwin' + pbpaste > $file + end - $EDITOR $file + $EDITOR $file - switch "$uname" - case 'Linux' - xclip -in -selection clipboard < $file - case 'Darwin' - pbcopy < $file - end + switch "$uname" + case 'Linux' + xclip -in -selection clipboard < $file + case 'Darwin' + pbcopy < $file + end - rm $file + rm $file end diff --git a/.config/fish/functions/push_tasks.fish b/.config/fish/functions/push_tasks.fish index b21fd93..09015b1 100644 --- a/.config/fish/functions/push_tasks.fish +++ b/.config/fish/functions/push_tasks.fish @@ -1,4 +1,8 @@ function push_tasks -d 'Push tasks as a notification to your phone' - set tasks (task +READY export | jq 'sort_by(.urgency) | reverse | map(@text "\(.description)\nLink: \(.link)") | join("\n\n")') - send_push $tasks + set tasks (task +READY export | + jq 'sort_by(.urgency) | + reverse | + map(@text "\(.description)\nLink: \(.link)") | + join("\n\n")') + send_push $tasks end diff --git a/.config/fish/functions/send_push.fish b/.config/fish/functions/send_push.fish index 43863de..a21de2f 100644 --- a/.config/fish/functions/send_push.fish +++ b/.config/fish/functions/send_push.fish @@ -1,7 +1,13 @@ function send_push -a message -d 'Send a push notification to your phone via pushover (optional delay as second arg)' if test -n "$argv[2]"; sleep $argv[2]; end - set payload "{\"token\":\"$pushover_token\",\"user\":\"$pushover_user\",\"title\":\"Tasks\",\"message\":$message}" + set payload \ +"{ + \"token\": \"$pushover_token\", + \"user\": \"$pushover_user\", + \"title\": \"Tasks\", + \"message\": $message +}" curl \ -X POST \ diff --git a/.config/fish/functions/tasko.fish b/.config/fish/functions/tasko.fish index e5b4061..2cd6fcc 100644 --- a/.config/fish/functions/tasko.fish +++ b/.config/fish/functions/tasko.fish @@ -1,4 +1,4 @@ function tasko -a id -d 'Open the link of a taskwarrior task by id' - set link (task _get $id.link) - if test -n $link; open $link; end + set link (task _get $id.link) + if test -n $link; open $link; end end diff --git a/.config/fish/functions/tasktime.fish b/.config/fish/functions/tasktime.fish index d995fd4..15814dc 100644 --- a/.config/fish/functions/tasktime.fish +++ b/.config/fish/functions/tasktime.fish @@ -1,9 +1,9 @@ function tasktime -a id time -d 'Set a time to check-in on task progress using pushover' - set half_time (math $time/2) - set desc (task _get $id.description) + set half_time (math $time/2) + set desc (task _get $id.description) - task $id start + task $id start - fish -c "send_push '\"Half-time: $desc\"' $half_time" > /dev/null & disown - fish -c "send_push '\"Timer over: $desc\"' $time" > /dev/null & disown + fish -c "send_push '\"Half-time: $desc\"' $half_time" > /dev/null & disown + fish -c "send_push '\"Timer over: $desc\"' $time" > /dev/null & disown end diff --git a/.config/fish/functions/taskwiki.fish b/.config/fish/functions/taskwiki.fish index 7df2ccb..30563d6 100644 --- a/.config/fish/functions/taskwiki.fish +++ b/.config/fish/functions/taskwiki.fish @@ -1,9 +1,9 @@ function taskwiki -a id - set page (task _get $id.wiki) + set page (task _get $id.wiki) - if test -n $page - $EDITOR +VimwikiIndex "+VimwikiGoto $page" - else - echo 'no wiki file specified' - end + if test -n $page + $EDITOR +VimwikiIndex "+VimwikiGoto $page" + else + echo 'no wiki file specified' + end end diff --git a/.config/fish/functions/temp.fish b/.config/fish/functions/temp.fish index 004d283..8c3808d 100644 --- a/.config/fish/functions/temp.fish +++ b/.config/fish/functions/temp.fish @@ -1,8 +1,8 @@ # temp creates a temporary file in your editor, with the given filetype. function temp -a ft - set file "._temp.$ft" + set file "._temp.$ft" - touch $file - $EDITOR $file - rm $file + touch $file + $EDITOR $file + rm $file end diff --git a/sync b/sync index e2d6536..f2e4e4d 100755 --- a/sync +++ b/sync @@ -1,97 +1,97 @@ #!/usr/bin/env fish function main - set start_dir (pwd) - set cwd (string match -r '\w+$' $start_dir) - set uname (uname) + set start_dir (pwd) + set cwd (string match -r '\w+$' $start_dir) + set uname (uname) - echo 'Syncing configuration files to your home dir...' - set_color grey + echo 'Syncing configuration files to your home dir...' + set_color grey - setup_tmp_space $cwd + setup_tmp_space $cwd - sync_files + sync_files - set_kitty_font_size $uname + set_kitty_font_size $uname - install_fisher_packages + install_fisher_packages - set_color normal + set_color normal - set_git_user + set_git_user - set_fish_universal_vars + set_fish_universal_vars - clean_up_tmp_space $cwd $start_dir + clean_up_tmp_space $cwd $start_dir - echo -s \n 'Done syncing.' + echo -s \n 'Done syncing.' end function setup_tmp_space -a cwd - if test ! "$cwd" = 'dotfiles' - cd /var/tmp - git clone --recurse-submodules https://github.com/mitchell/dotfiles.git - cd ./dotfiles - end + if test ! "$cwd" = 'dotfiles' + cd /var/tmp + git clone --recurse-submodules https://github.com/mitchell/dotfiles.git + cd ./dotfiles + end end function sync_files - if ! test -e ~/.config; mkdir ~/.config; end + if ! test -e ~/.config; mkdir ~/.config; end - rsync -aP ./.config/fish ~/.config/ - rsync -aP ./.config/kitty ~/.config/ - rsync -aP ./.config/nvim ~/.config/ - rsync -aP ./.config/bspwm ~/.config/ - rsync -aP ./.config/sxhkd ~/.config/ - rsync -aP ./.config/picom ~/.config/ - rsync -aP ./.gitconfig ~/ - rsync -aP ./.tmux-line.conf ~/ - rsync -aP ./.tmux.conf ~/ - rsync -aP ./.vim ~/ - rsync -aP ./.vimrc ~/ - rsync -aP ./.ideavimrc ~/ - rsync -aP ./.yabairc ~/ - rsync -aP ./.skhdrc ~/ - rsync -aP ./.taskrc ~/ + rsync -aP ./.config/fish ~/.config/ + rsync -aP ./.config/kitty ~/.config/ + rsync -aP ./.config/nvim ~/.config/ + rsync -aP ./.config/bspwm ~/.config/ + rsync -aP ./.config/sxhkd ~/.config/ + rsync -aP ./.config/picom ~/.config/ + rsync -aP ./.gitconfig ~/ + rsync -aP ./.tmux-line.conf ~/ + rsync -aP ./.tmux.conf ~/ + rsync -aP ./.vim ~/ + rsync -aP ./.vimrc ~/ + rsync -aP ./.ideavimrc ~/ + rsync -aP ./.yabairc ~/ + rsync -aP ./.skhdrc ~/ + rsync -aP ./.taskrc ~/ end function set_kitty_font_size -a uname - if test "$uname" = 'Darwin' - sed -i '' -e 's/font_size 11\.0/font_size 13\.0/' ~/.config/kitty/kitty.conf - end + if test "$uname" = 'Darwin' + sed -i '' -e 's/font_size 11\.0/font_size 13\.0/' ~/.config/kitty/kitty.conf + end end function install_fisher_packages - eval fisher + eval fisher end function install_nvim_plugins - command -q nvim; and nvim +PlugUpgrade +PlugUpdate +qa + command -q nvim; and nvim +PlugUpgrade +PlugUpdate +qa end function set_git_user - set prompt 'Would you like to set your git user name and email?' - read -p "set_color red; printf '\n$prompt (Y/n) '; set_color normal" set_git_user + set prompt 'Would you like to set your git user name and email?' + read -p "set_color red; printf '\n$prompt (Y/n) '; set_color normal" set_git_user - if test -z "$set_git_user"; or test "$set_git_user" = 'y'; or test "$set_git_user" = 'Y' - read -P 'name: ' name - read -P 'email: ' email + if test -z "$set_git_user"; or test "$set_git_user" = 'y'; or test "$set_git_user" = 'Y' + read -P 'name: ' name + read -P 'email: ' email - git config --global user.name $name - git config --global user.email $email - end + git config --global user.name $name + git config --global user.email $email + end end function set_fish_universal_vars - source ./fish_universal_vars.fish + source ./fish_universal_vars.fish end function clean_up_tmp_space -a cwd start_dir - if test ! "$cwd" = 'dotfiles' - cd .. - rm -rf ./dotfiles - cd $start_dir - end + if test ! "$cwd" = 'dotfiles' + cd .. + rm -rf ./dotfiles + cd $start_dir + end end main