Use nvim for mergetool

[rbdr/dotfiles] / install

diff --git a/install b/install
index 64a3131d228717643af396c3a400412f2c2e44c2..957e29456dbb94381bee51bf6431891bd7ab3565 100755 (executable)
--- a/install
+++ b/install
@@ -23,10 +23,6 @@ ln -fns .dotfiles/runcoms/zlogin ~/.zlogin
 # Weechat
 ln -fns .dotfiles/weechat ~/.weechat
 
 # Weechat
 ln -fns .dotfiles/weechat ~/.weechat
 

-# VIM
-ln -fns .dotfiles/vim ~/.vim
-ln -fns .dotfiles/vimrc ~/.vimrc
-

 # TMUX
 ln -fns .dotfiles/tmux.conf ~/.tmux.conf
 
 # TMUX
 ln -fns .dotfiles/tmux.conf ~/.tmux.conf
 


@@ -36,15 +32,15 @@ ln -fns .dotfiles/nethackrc ~/.nethackrc
 # Git
 ln -fns .dotfiles/gitconfig ~/.gitconfig
 
 # Git
 ln -fns .dotfiles/gitconfig ~/.gitconfig
 

-# Ctags
-ln -fns .dotfiles/ctags.d ~/.ctags.d
-
-# XDefaults
-ln -fns .dotfiles/XDefaults ~/.XDefaults
-

 # ripgrep
 ln -fns .dotfiles/rgignore ~/.rgignore
 
 # ripgrep
 ln -fns .dotfiles/rgignore ~/.rgignore
 

+# yabai
+ln -fns .dotfiles/yabairc ~/.yabairc
+
+# skhdc
+ln -fns .dotfiles/skhdrc ~/.skhdrc
+

 # tmuxp
 ln -fns .dotfiles/tmuxp ~/.tmuxp
 
 # tmuxp
 ln -fns .dotfiles/tmuxp ~/.tmuxp
 


@@ -57,9 +53,15 @@ ln -fns ../.dotfiles/config/kitty ~/.config/kitty
 # nvim
 ln -fns ../.dotfiles/config/nvim ~/.config/nvim
 
 # nvim
 ln -fns ../.dotfiles/config/nvim ~/.config/nvim
 

-# config
+# karabiner

 ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner
 
 ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner
 

+# sway
+ln -fns ../.dotfiles/config/sway ~/.config/sway
+
+# sway
+ln -fns ../.dotfiles/config/qutebrowser ~/.config/qutebrowser
+

 touch ~/.tool-versions
 
 # Italics setup
 touch ~/.tool-versions
 
 # Italics setup