7 files changed, 52 insertions, 8 deletions

diff --git a/.config/fish/completions/nvm.fish b/.config/fish/completions/nvm.fish
new file mode 100644
index 0000000..14be1b7
--- /dev/null
+++ b/.config/fish/completions/nvm.fish
@@ -0,0 +1,21 @@
+complete --command nvm --exclusive
+complete --command nvm --exclusive --long version --description "Print version"
+complete --command nvm --exclusive --long help --description "Print help"
+complete --command nvm --long silent --description "Suppress standard output"
+
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments install --description "Download and activate the specified Node version"
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments use --description "Activate the specified Node version in the current shell"
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments list --description "List installed Node versions"
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments list-remote --description "List available Node versions to install"
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments current --description "Print the currently-active Node version"
+complete --command nvm --exclusive --condition "__fish_seen_subcommand_from install" --arguments "(
+    test -e $nvm_data && string split ' ' <$nvm_data/.index
+)"
+complete --command nvm --exclusive --condition "__fish_seen_subcommand_from use" --arguments "(_nvm_list | string split ' ')"
+complete --command nvm --exclusive --condition __fish_use_subcommand --arguments uninstall --description "Uninstall the specified Node version"
+complete --command nvm --exclusive --condition "__fish_seen_subcommand_from uninstall" --arguments "(
+    _nvm_list | string split ' ' | string replace system ''
+)"
+complete --command nvm --exclusive --condition "__fish_seen_subcommand_from use uninstall" --arguments "(
+    set --query nvm_default_version && echo default
+)"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index adcbe4a..4f7aab8 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -23,6 +23,7 @@ set --global --export WECHALLTOKEN "35624-0D38B-A2F16-A98B0-5963D-6DF19"
 set --global --export RUST_SRC_PATH (rustc --print sysroot)/lib/rustlib/src/rust/library/
 set --global --export NLTK_DATA "$HOME/.local/share/nltk_data"
 set --global --export VIRTUALFISH_HOME "$HOME/.local/share/venvs/"
+set --global --export STARDICT_DATA_DIR "$HOME/.local/share/dict/"
 
 
 if status is-interactive
@@ -31,21 +32,17 @@ if status is-interactive
     abbr --add --global bc 'bc -l'
     abbr --add --global bo 'bukuopener'
     abbr --add --global cp 'cp -i'
-    abbr --add --global C 'xsel -b' # Copy to clipboard
     abbr --add --global df 'df -h'
     abbr --add --global free 'free -m'
     abbr --add --global gst 'git status'
     abbr --add --global guno 'git status -uno'
     abbr --add --global inc 'task +in +PENDING count'
     abbr --add --global in 'task add +in'
-    abbr --add --global ledger "ledger -f ~/nextcloud/virtuals/ledger.ledger"
-    abbr --add --global lim 'nvim /home/yigit/nextcloud/virtuals/ledger.ledger'
     abbr --add --global ls 'exa'
     abbr --add --global maybe 'task due:someday list'
     abbr --add --global music 'mpv --no-vid'
     abbr --add --global mv 'mv -i'
     abbr --add --global nt 'neomutt'
-    abbr --add --global report "report -f ~/nextcloud/virtuals/ledger.ledger"
     abbr --add --global re 'remi -gaad -@2'
     abbr --add --global rm 'rm -i'
     abbr --add --global s "du -hs * | sort -rh | head -5"
@@ -60,9 +57,19 @@ if status is-interactive
     abbr --add --global wim 'nvim /home/yigit/nextcloud/personal_wiki/text/index.wiki'
     abbr --add --global yst 'yadm status'
     abbr --add --global dr 'dragon-drop'
+    abbr --add --global ddg 'surfraw duckduckgo -j'
+    abbr --add --global lu 'sdcv'
+
+    if test "$WAYLAND_DISPLAY" = "wayland-1"
+        abbr --add --global C 'wl-copy' # Wayland
+    else
+        abbr --add --global C 'xsel -b' # X11
+    end
 
     zoxide init fish | source
     direnv hook fish | source
+    fzf --fish | source
+    atuin init fish --disable-up-arrow | source
 
     fish_ssh_agent
 end
diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins
new file mode 100644
index 0000000..49bfe20
--- /dev/null
+++ b/.config/fish/fish_plugins
@@ -0,0 +1,2 @@
+jorgebucaran/nvm.fish
+franciscolourenco/done
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index e8b58fb..b32dfe3 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -2,6 +2,10 @@
 # VERSION: 3.0
 SETUVAR __fish_initialized:3400
 SETUVAR _fish_abbr_dr:dragon\x2ddrop
+SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish
+SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish
+SETUVAR _fisher_plugins:jorgebucaran/nvm\x2efish\x1efranciscolourenco/done
+SETUVAR _fisher_upgraded_to_4_4:\x1d
 SETUVAR fish_color_autosuggestion:6c7086
 SETUVAR fish_color_cancel:f38ba8
 SETUVAR fish_color_command:89b4fa
diff --git a/.config/fish/functions/fish_right_prompt.fish b/.config/fish/functions/fish_right_prompt.fish
index 5963ed9..1e28dfc 100644
--- a/.config/fish/functions/fish_right_prompt.fish
+++ b/.config/fish/functions/fish_right_prompt.fish
@@ -76,6 +76,11 @@ function fish_right_prompt --description 'Write out the right prompt'
         set virtualenv "$green 🐍 " (basename "$VIRTUAL_ENV")
     end
 
+    set -l node_version
+    if set -q nvm_current_version
+        set node_version "$red  " "$nvm_current_version"
+    end
+
     set hour $blue(date '+%R')
-    echo -n -s $virtualenv ' ' $repo_info ' ' $hour
+    echo -n -s $node_version ' ' $virtualenv ' ' $repo_info ' ' $hour
 end
diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish
deleted file mode 100644
index ff0d9f3..0000000
--- a/.config/fish/functions/fish_user_key_bindings.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function fish_user_key_bindings
-        fzf_key_bindings
-end
diff --git a/.config/fish/functions/sessiontype.fish b/.config/fish/functions/sessiontype.fish
new file mode 100644
index 0000000..33830ca
--- /dev/null
+++ b/.config/fish/functions/sessiontype.fish
@@ -0,0 +1,8 @@
+# https://unix.stackexchange.com/questions/202891/how-to-know-whether-wayland-or-x11-is-being-used/371164#comment573431_325972
+
+function sessiontype
+    # https://unix.stackexchange.com/questions/202891/how-to-know-whether-wayland-or-x11-is-being-used/371164#comment573431_325972
+    # have to run it first?
+    loginctl > /dev/null
+    loginctl show-session (loginctl | awk '/tty/ {print $1}') -p Type | awk -F= '{print $2}'
+end