Merge remote-tracking branch 'refs/remotes/origin/master'

diohabara · Mar 8, 2024 · 9505f86 · 9505f86
2 parents 815a4d5 + 54c5a01
commit 9505f86
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 42 deletions.
diff --git a/dot_config/git/config b/dot_config/git/config
@@ -6,7 +6,7 @@
 
 [core]
   # Repo: https://github.com/neovim/neovim
-  editor = nvim
+  editor = vim
   quotepath = false
   # Repo: https://github.com/dandavison/delta
   pager = delta --dark

diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv
@@ -1,2 +1,3 @@
 #!/usr/bin/env sh
 export LANG=en_US.UTF-8
+source ~/.zshrc
diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
@@ -56,7 +56,6 @@ fi
 # zplug
 # shellcheck source=/dev/null
 . "${HOME}/.zplug/init.zsh"
-zplug "sobolevn/wakatime-zsh-plugin", from:github
 zplug load
 
 # for direnv
@@ -80,3 +79,9 @@ fi
 # linker
 FLAG_OPTION="-L$(which lld)"
 export LDFLAGS="$FLAG_OPTION"
+
+# sdk
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+source ~/.zshrc