Merge branch 'master' into car

4 files changed, 21 insertions, 4 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 0fc2b9e..3ff27e6 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -98,7 +98,7 @@ misc {
     disable_splash_rendering = true
     enable_swallow = true
     swallow_regex = ^(kitty)$
-    swallow_exception_regex = ^(.*ueberzug|vim .*)$
+    swallow_exception_regex = ^(.*ueberzug|n?vim .*)$
     vfr = true
     vrr = 1
 }
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 540419a..55b72c8 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -913,7 +913,7 @@ confirm_os_window_close 0
 #: The second number is the margin between the tab bar and the
 #: contents of the current tab.
 
-# tab_bar_style fade
+tab_bar_style powerline
 
 #: The tab bar style, can be one of:
 
diff --git a/nvim/init.vim b/nvim/init.vim
index d27d9d4..812bf3e 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,3 +1,20 @@
+set runtimepath^=$XDG_CONFIG_HOME/vim
+set runtimepath+=$XDG_DATA_HOME/vim
+set runtimepath+=$XDG_CONFIG_HOME/vim/after
+
+set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
+set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+
+let g:netrw_home = $XDG_DATA_HOME."/vim"
+call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
+
+set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')
+set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
+set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
+set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
+
+if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif
+
 " vimplugs {{{
 call plug#begin('~/.config/nvim/plugged')
 " colorschemes {{{
@@ -45,7 +62,7 @@ set showmatch " Highlight matching brace
 set number
 set relativenumber
 
-colorscheme 256-grayvim
+colorscheme Dark2
  
 set hlsearch                    " Highlight all search results
 set smartcase                   " Enable smart-case search
diff --git a/vim/vimrc b/vim/vimrc
index cdf9b33..812bf3e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -62,7 +62,7 @@ set showmatch " Highlight matching brace
 set number
 set relativenumber
 
-colorscheme 256-grayvim
+colorscheme Dark2
  
 set hlsearch                    " Highlight all search results
 set smartcase                   " Enable smart-case search