dotfiles

Merge branch 'main' of getsh.org:dotfiles

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
@@ -1,14 +1,19 @@
-mouse:
-  hide_when_typing: true
-
 import:
-  - ~/.config/alacritty/hyper-dark.yml
-  - ~/.config/alacritty/font.yml
-  - ~/.config/alacritty/windows.yml
   - ~/.config/alacritty/mac.yml
-  - ~/.config/alacritty/bindings.yml
+  - ~/.config/alacritty/windows.yml
   - ~/.config/alacritty/unstaged.yml
 
+key_bindings:
+  - { key: N, mods: Control|Shift, action: CreateNewWindow}
+
+colors:
+  primary:
+    background: '0x000000'
+    foreground: '0xffffff'
+  cursor:
+    text: '0xF81CE5'
+    cursor: '0xffffff'
+
 live_config_reload: true
 
 bell:

@@ -16,3 +21,7 @@ bell:
 
 selection:
   save_to_clipboard: true
+
+# No title bar, use shortcuts
+window:
+   decorations: none

diff --git a/.config/alacritty/bindings.yml b/.config/alacritty/bindings.yml
@@ -1,2 +0,0 @@
-key_bindings:
-  - { key: N, mods: Control|Shift, action: CreateNewWindow}

diff --git a/.config/alacritty/font.yml b/.config/alacritty/font.yml
@@ -1,17 +0,0 @@
-font:
-  normal:
-    family: Fira Mono
-    style: Regular
-
-  bold:
-    family: Fira Mono
-
-    style: Bold
-
-  italic:
-    family: Fira Mono
-    style: Oblique
-
-  bold_italic:
-    family: Fira Mono
-    style: Bold Oblique

diff --git a/.config/alacritty/hyper-light.yml b/.config/alacritty/hyper-light.yml
@@ -1,25 +1,32 @@
+# github Alacritty Colors
 colors:
+  # Default colors
   primary:
     background: '0xffffff'
     foreground: '0x000000'
 
+  # Normal colors
   normal:
-    black:   '0x000000'
-    red:     '0xff0000'
-    green:   '0xff00ff'
-    yellow:  '0xaaaa10'
-    blue:    '0x0000ff'
-    magenta: '0xa00095'
-    cyan:    '0x3e953a'
-    white:   '0xa5a5a5'
+    black:   '0x24292f'
+    red:     '0xcf222e'
+    green:   '0x116329'
+    yellow:  '0x4d2d00'
+    blue:    '0x0969da'
+    magenta: '0x8250df'
+    cyan:    '0x1b7c83'
+    white:   '0x6e7781'
 
+  # Bright colors
   bright:
-    black:   '0x000000'
-    red:     '0xff0000'
-    green:   '0x3e953a'
-    yellow:  '0xcccc10'
-    blue:    '0x0000aa'
-    magenta: '0xa00095'
-    cyan:    '0x3e953a'
-    white:   '0xffffff'
+    black:   '0x57606a'
+    red:     '0xa40e26'
+    green:   '0x1a7f37'
+    yellow:  '0x633c01'
+    blue:    '0x218bff'
+    magenta: '0xa475f9'
+    cyan:    '0x3192aa'
+    white:   '0x8c959f'
 
+  indexed_colors:
+    - { index: 16, color: '0xd18616' }
+    - { index: 17, color: '0xa40e26' }

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
@@ -29,17 +29,15 @@ set.shortmess="Iat"
 g.netrw_banner = 0
 g.netrw_liststyle = 3
 
-require'nvim_comment'.setup()
-
 vim.cmd([[
 " TODO use lua api
 source $XDG_DATA_HOME/vim/vimrc
 
 function! s:load_plugins(t) abort
 	packadd fzf.vim
-	packadd gruvbox-material
 	packadd nvim-dap
 	packadd nvim-dap-ui
+	packadd nvim-lspconfig
 	packadd vim-fugitive
 	packadd vim-ninja-feet
 	packadd vim-surround

@@ -48,6 +46,7 @@ function! s:load_plugins(t) abort
 	packadd vim-xcode
 
 	lua require"dapui".setup()
+	lua require"lspconfig".clangd.setup{}
 	lua require"unstaged"
 endfunction
 

diff --git a/.config/sh/functions b/.config/sh/functions
@@ -58,3 +58,15 @@ download() {
 find_() {
 	find . -name "*$**"
 }
+
+vim_plug() {
+	export VIM_PLUGINS_DIR="$XDG_DATA_HOME"/vim/pack/voom/opt
+	export VIM_DIR="$XDG_DATA_HOME"/vim
+	voom $@
+}
+
+nvim_plug() {
+	export VIM_PLUGINS_DIR="$XDG_DATA_HOME"/nvim/pack/voom/opt
+	export VIM_DIR="$XDG_DATA_HOME"/nvim
+	voom $@
+}

diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
@@ -44,7 +44,7 @@ bind P paste-buffer
 # Themes
 set-option -g status-style "bg=default"
 set -g status-fg default
-set -g window-status-current-style "fg=red,bold"
+set -g window-status-current-style "fg=default,bold"
 set -g pane-active-border-style "bg=default,fg=red"
 set -g pane-border-lines single
 set -g pane-border-status off

diff --git a/.config/vim/vimrc b/.config/vim/vimrc
@@ -11,7 +11,9 @@ endif
 set nocompatible
 set mouse=
 set cursorline
-set cursorlineopt=number
+if has('cursorlineopt')
+	set cursorlineopt=number
+endif
 set exrc
 
 " Turn backup off

@@ -90,7 +92,6 @@ function! s:load_plugins(t) abort
 	packadd vim-fugitive
 	packadd vim-unimpaired
 	packadd vim-better-whitespace
-	packadd gruvbox-material
 endfunction
 
 augroup user_cmds

diff --git a/.local/share/.gitignore b/.local/share/.gitignore
@@ -1,17 +1,5 @@
 !vim/
-!vim/pack/
-!vim/pack/*
 
 !nvim/
-!nvim/pack/
-!nvim/pack/**
-
-
-!vimcommon/
-!vimcommon/*
-!vimcommon/pack/
-!vimcommon/pack/**
-!vimcommon/minisnip/
-!vimcommon/minisnip/*
 
 tags

diff --git a/.local/share/nvim/plugins b/.local/share/nvim/plugins
@@ -0,0 +1,3 @@
+mfussenegger/nvim-dap
+rcarriga/nvim-dap-ui
+neovim/nvim-lspconfig

diff --git a/.local/share/vim/.gitignore b/.local/share/vim/.gitignore
@@ -1 +1,2 @@
 !pack/**/start/**
+pack/voom/

diff --git a/.local/share/vim/hyper-red.vim b/.local/share/vim/hyper-red.vim
@@ -21,8 +21,8 @@ if &background == "dark"
 	hi! PreProc ctermfg=DarkGray guifg=DarkGray
 	hi! MatchParen ctermbg=NONE cterm=underline ctermfg=LightMagenta
 else
-	hi! LineNr cterm=NONE gui=NONE guibg=NONE ctermbg=NONE guifg=LightGray ctermfg=LightGray
-	hi! StatusLineNC guibg=DarkGray ctermbg=DarkGray guifg=White ctermfg=White
+	hi! LineNr cterm=NONE gui=NONE guibg=NONE ctermbg=NONE guifg=DarkGray ctermfg=DarkGray
+	hi! StatusLineNC guibg=Black ctermbg=Black guifg=White ctermfg=White
 	hi! Statement ctermfg=Red guifg=Red
 	hi! Constant ctermfg=Green guifg=Green
 	hi! String ctermfg=DarkBlue guifg=DarkBlue

@@ -31,13 +31,15 @@ else
 	hi! IncSearch ctermbg=Black ctermfg=Yellow guibg=Black guifg=Yellow
 	hi! Search ctermbg=Blue ctermfg=White guibg=Blue guifg=White
 	hi! Todo cterm=underline,bold ctermbg=NONE ctermfg=Yellow guibg=NONE guifg=Yellow
-	hi! Comment ctermfg=LightGray guifg=LightGray
+	hi! Comment ctermfg=DarkGray guifg=DarkGray
 	hi! Visual ctermbg=Black ctermfg=white guibg=Black guifg=white
-	hi! Type ctermfg=DarkGray guifg=DarkGray
-	hi! PreProc ctermfg=LightGray guifg=LightGray
+	hi! Type ctermfg=Black guifg=Black
+	hi! PreProc ctermfg=DarkGray guifg=DarkGray
 	hi! MatchParen guibg=NONE ctermbg=NONE gui=underline cterm=underline guifg=DarkMagenta ctermfg=DarkMagenta
 endif
-set fillchars=vert:\│
+if has('fillchars')
+	set fillchars=vert:\│
+endif
 hi! VertSplit term=NONE cterm=NONE gui=NONE
 hi! SignColumn ctermbg=NONE guibg=NONE
 

diff --git a/.local/share/vim/plugins b/.local/share/vim/plugins
@@ -0,0 +1,33 @@
+ntpeters/vim-better-whitespace.git
+tpope/vim-commentary.git
+tpope/vim-surround.git
+tpope/vim-fugitive
+tommcdo/vim-ninja-feet.git
+tpope/vim-unimpaired
+pope/vim-repeat.git
+christoomey/vim-tmux-navigator
+tpope/vim-dispatch
+yegappan/mru
+radenling/vim-dispatch-neovim
+evansalter/vim-checklist
+tpope/vim-vinegar
+tpope/vim-vinegar
+ferranpm/vim-maildir
+joereynolds/vim-minisnip/
+keith/swift.vim
+preservim/tagbar
+cfdrake/vim-pbxproj
+kana/vim-submode
+jerrymarino/xcodebuild.vim
+gfontenot/vim-xcode
+junegunn/fzf.vim
+vim-scripts/gitignore
+OmniSharp/omnisharp-vim
+
+
+# https://git.sr.ht/~torresjrjr/birck.vim
+# rcarriga/nvim-dap-ui
+# mfussenegger/nvim-dap
+# terrortylor/nvim-comment
+# neovim/nvim-lspconfig
+# puremourning/vimspector

diff --git a/.profile b/.profile
@@ -97,8 +97,8 @@ chance "${XDG_CONFIG_HOME}/sh/unstaged"
 
 # Theme
 # Hyper Red
-export LESS_TERMCAP_us=$'\E[0;31m'
-export LESS_TERMCAP_ue=$'\E[0m'
+export LESS_TERMCAP_so=$'\e[31m'
+export LESS_TERMCAP_se=$'\e[0m'
 export CLICOLOR=1
 export LSCOLORS="xxexcxdxbxegxdxbagxcxd"
 export LS_COLORS="di=0:ln=34:so=32:pi=33:ex=31:bd=34;46:cd=0;43:su=0;41:sg=30;46:tw=0;42:ow=0;43"