fish: auto startx on tty1

- changed backend to mupdf because it seems more reliable
- make zathura shut up about warnings

.gitmodules

@@ -15,12 +15,6 @@
 ################
 
 # auto close brackets and quotes
-[submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_auto-pairs"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_auto-pairs
-	url = https://github.com/jiangmiao/auto-pairs
-
-# language smarts
-# coding.lua
 [submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-cmp"]
 	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-cmp
 	url = https://github.com/hrsh7th/nvim-cmp.git
@@ -67,48 +61,6 @@
 [submodule "src/dot_local/share/nvim/site/pack/3pp/start/external_cmp_luasnip"]
 	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_cmp_luasnip
 	url = https://github.com/saadparwaiz1/cmp_luasnip
-
-
-
-[submodule "submodule.src/dot_local/bin/external_pyinstantref.path"]
-	path = src/dot_local/bin/external_pyinstantref
-	url = https://github.com/dogeystamp/pyinstantref
-[submodule "submodule.src/dot_local/bin/external_inkscape-shortcut-manager.path"]
-	path = src/dot_local/bin/external_inkscape-shortcut-manager
-	url = https://github.com/dogeystamp/inkscape-shortcut-manager
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_auto-pairs.path"]
+[submodule "src/dot_local/share/nvim/site/pack/3pp/opt/external_auto-pairs"]
 	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_auto-pairs
 	url = https://github.com/jiangmiao/auto-pairs
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-cmp.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-cmp
-	url = https://github.com/hrsh7th/nvim-cmp.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_cmp-nvim-lsp.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_cmp-nvim-lsp
-	url = https://github.com/hrsh7th/cmp-nvim-lsp.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-treesitter.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-treesitter
-	url = https://github.com/nvim-treesitter/nvim-treesitter.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/start/external_vim-ledger
-	url = https://github.com/ledger/vim-ledger.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-noirbuddy.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-noirbuddy
-	url = https://github.com/jesseleite/nvim-noirbuddy.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_colorbuddy.nvim.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_colorbuddy.nvim
-	url = https://github.com/tjdevries/colorbuddy.nvim.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-dap.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-dap
-	url = https://github.com/mfussenegger/nvim-dap.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-dap-ui.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-dap-ui
-	url = https://github.com/rcarriga/nvim-dap-ui.git
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_nvim-nio.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_nvim-nio
-	url = https://github.com/nvim-neotest/nvim-nio
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_LuaSnip.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_LuaSnip
-	url = https://github.com/L3MON4D3/LuaSnip
-[submodule "submodule.src/dot_local/share/nvim/site/pack/3pp/start/external_cmp_luasnip.path"]
-	path = src/dot_local/share/nvim/site/pack/3pp/opt/external_cmp_luasnip
-	url = https://github.com/saadparwaiz1/cmp_luasnip

programs

@@ -12,7 +12,7 @@ git
 xwallpaper
 dunst
 zathura
-zathura-pdf-poppler
+zathura-pdf-mupdf
 libnotify
 libsecret
 xorg-setxkbmap

src/dot_config/bashrc.tmpl

@@ -8,4 +8,4 @@
 
 # Use fish in place of bash
 # keep this line at the bottom of ~/.bashrc
-[ -x {{ $fish_path }} ] && SHELL={{ $fish_path }} exec fish
+[ -x {{ $fish_path }} ] && SHELL={{ $fish_path }} exec fish -l

src/dot_config/dunst/dunstrc

@@ -27,7 +27,7 @@
 	gap_size = 5
 
 	frame_width = 2
-	corner_radius = 10
+	corner_radius = 0
 
 	origin = bottom-right
 	offset = 60x70

src/dot_config/fish/aliases.fish

@@ -31,6 +31,9 @@ function gpgt; export GPG_TTY=(tty); end
 # Private neovim
 function nvimp; nvim -u NONE -c "setlocal history=0 nobackup nomodeline noshelltemp noswapfile noundofile nowritebackup secure viminfo=\"\"" $argv; end
 
+# Edit configuration file
+alias nvic 'chezmoi edit -a'
+
 # Read pdf file as text
 function pdfr
 	pdftotext $argv - | nvim

src/dot_config/fish/config.fish

@@ -32,3 +32,9 @@ if status --is-interactive
 		zoxide init fish | source
 	end
 end
+
+if status is-login
+	if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
+		exec startx
+	end
+end

src/dot_config/nvim/init.vim

@@ -63,6 +63,7 @@ let maplocalleader = " "
 " easier binds to use system clipboard with
 nmap <C-S>y "+y
 nmap <C-S>Y "+Y
+nmap <C-S>D "+D
 vmap <C-S>y "+y
 nmap <C-S>d "+d
 vmap <C-S>d "+d
@@ -71,6 +72,14 @@ nmap <C-S>C "+C
 vmap <C-S>c "+c
 nmap <C-S>p "+p
 
+" faster indent binds
+" conflicts with motions, e.g. <ip
+nnoremap > >>
+nnoremap < <<
+" don't deselect after a visual indent
+vnoremap < <gv
+vnoremap > >gv
+
 " 0 is easier to reach so swap these binds
 nnoremap 0 ^
 nnoremap ^ 0
@@ -103,10 +112,6 @@ nnoremap <silent> ZF :qa<cr>
 " see .config/nvim/lua/init.lua
 lua require('init')
 
-" auto-pairs
-packadd auto-pairs
-let g:AutoPairsFlyMode = 0
-
 " disable warnings in health check
 let g:loaded_node_provider = 0
 let g:loaded_perl_provider = 0

src/dot_config/nvim/lua/coding.lua

@@ -68,6 +68,11 @@ vim.wo.foldmethod = 'expr'
 vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 vim.wo.foldlevel = 99 -- unfold by default
 
+--------
+-- auto-pairs for brackets
+--------
+vim.cmd.packadd("auto-pairs")
+
 ------
 -- diagnostics box
 ------

src/dot_config/nvim/lua/theme.lua

@@ -108,3 +108,11 @@ vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
 vim.diagnostic.config {
 	float = { border = _border }
 }
+
+-- git gutter
+Group.new("DiffChange", colors.secondary, nil, nil)
+Group.new("DiffAdd", colors.primary, nil, nil)
+Group.new("DiffDelete", colors.noir_2, nil, nil)
+Group.link("GitGutterChange", groups.DiffChange)
+Group.link("GitGutterAdd", groups.DiffAdd)
+Group.link("GitGutterDelete", groups.DiffDelete)

src/dot_config/picom/picom.conf.tmpl

@@ -22,7 +22,7 @@ shadow-offset-x = -7;
 shadow-offset-y = -7;
 
 # corner
-corner-radius = 10;
+corner-radius = 0;
 
 blur: {
 	method = "dual_kawase",
@@ -31,6 +31,7 @@ blur: {
 
 rules = (
 	{ match = "class_g = 'dwm'"; shadow = false; corner-radius = 0; blur-background = false },
+	{ match = "class_g = 'slock'"; shadow = false; corner-radius = 0; blur-background = false },
 	{ match = "class_i = 'qutebrowser' && ! name = 'discord'"; shader = "{{ env "HOME" }}/.config/picom/shaders/transparency.glsl" },
 	{ match = "class_i = 'neovide'"; shader = "{{ env "HOME" }}/.config/picom/shaders/transparency.glsl" },
 	{ match = "class_g = 'Zathura'"; shader = "/home/dogeystamp/.config/picom/shaders/transparency.glsl" },

src/dot_config/zathura/zathurarc.tmpl

@@ -7,7 +7,7 @@ set adjust-open width
 set font "JetBrains Mono 12"
 
 set recolor-darkcolor "#dddddd"
-set recolor-lightcolor rgba(0,0,0, {{ .opacity }})
+set recolor-lightcolor rgba(0,0,0,{{ .opacity }})
 set recolor true
 set recolor-keephue true
 set recolor-reverse-video true
@@ -16,7 +16,7 @@ set default-bg "#00000099"
 set index-bg "#000000"
 set index-active-bg "#111111"
 set index-active-fg "#FFFFFF"
-set inputbar-bg rgba(0,0,0, {{ .opacity }})
+set inputbar-bg rgba(0,0,0,{{ .opacity }})
 set inputbar-fg "#CCCCCC"
 set statusbar-bg rgba(0,0,0,1)
 set statusbar-fg "#CCCCCC"
@@ -25,6 +25,8 @@ set render-loading false
 
 set selection-clipboard clipboard
 
+set database sqlite
+
 map <C-l> exec copy_ref
 map <C-g> exec "copy_ref --section"
 map <C-k> exec "copy_ref --destination"

src/dot_local/bin/deskutils/executable_screenshot.sh

@@ -2,5 +2,5 @@
 
 # Screenshot to clipboard, and leave a copy at ~/med/screen/latest.png
 
-rm ~/med/screen/latest.png
-sleep 0.1 && scrot -fs "$HOME/med/screen/latest.png" -e 'xclip -selection clipboard -target image/png -i $f'
+rm ~/med/screen/latest.jpg
+scrot --freeze --select -l style=dash "$HOME/med/screen/latest.jpg" -e 'xclip -selection clipboard -target image/jpeg -i $f'