Merge branch 'main' of db:dotfiles

12 files changed, 170 insertions, 47 deletions

diff --git a/config/essentials/nvim/after/plugin/colors.lua b/config/essentials/nvim/after/plugin/colors.lua
index a7dc515..048f60d 100644
--- a/config/essentials/nvim/after/plugin/colors.lua
+++ b/config/essentials/nvim/after/plugin/colors.lua
@@ -1,19 +1,21 @@
--- function ColorMyPencils(color)
--- 	color = color or "pywal"
--- 	vim.cmd.colorscheme(color)
--- 	-- vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
--- 	-- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
--- 	-- vim.cmd.highlight("SignColumn guibg=none")
-
--- 	-- vim.g.nord_uniform_diff_background = true
--- 	-- vim.g.nord_contrast = true
--- 	-- vim.g.nord_borders = true
--- 	-- local highlights = require("nord").bufferline.highlights({
--- 	-- 	italic = true,
--- 	-- 	bold = true,
--- 	-- })
--- end
--- ColorMyPencils()
---
-local pywal16 = require('pywal16')
-pywal16.setup()
+ function ColorMyPencils(color)
+	if color == "nord" then
+		vim.cmd.colorscheme(color)
+		vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+		vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+		vim.cmd.highlight("SignColumn guibg=none")
+		vim.g.nord_uniform_diff_background = true
+		vim.g.nord_contrast = true
+		vim.g.nord_borders = true
+		local highlights = require("nord").bufferline.highlights({
+			italic = true,
+			bold = true,
+		})
+	elseif color == "pywal" then
+		local pywal16 = require('pywal16')
+		pywal16.setup()
+	else
+		vim.cmd("colorscheme " .. color)
+	end
+end
+ColorMyPencils("nord")
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index e692d37..d1da9b3 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -72,6 +72,11 @@ ls.add_snippets("html", {
 	</html>
 	]],
 	{i(1, "title"), i(2), i(3, "Header"), i(0)})),
+	s("sty", fmt(
+	[[
+	<link rel="stylesheet" type="text/css" href="{}">{}
+	]],
+	{ i(1), i(0) })),
 })
 
 ls.add_snippets("java", {
@@ -137,6 +142,7 @@ ls.add_snippets("java", {
 })
 
 ls.add_snippets("sh", {
+	s("TD", t "THISDIR=$(dirname $(readlink -f \"$0\"))"),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	parse("fdie",
 	[[
@@ -161,7 +167,32 @@ ls.add_snippets("sh", {
 
 ls.add_snippets("javascript", {
 	-- print
-	s("pt", fmt("console.log({}){}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("pt", fmt("console.log({});{}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("rq", fmt("const {} = require('{}');", { i(1), rep(1) })),
+	s("dbconn", fmt(
+	[[
+		let conn = null;
+		try {{
+			conn = await dbConnect();{}
+			conn.end()
+		}} catch(err) {{
+			console.error('Error:', err);
+		}}
+	]],
+	{ i(0) })),
+	s("apr", fmt(
+	[[
+	app.get('{}', (req, res) => {{
+		{}
+	}});{}
+	]],
+	{ i(1), i(2, "res.send(\"Hello world!\")"), i(0) })),
+	s("cerr", t "console.error('Error:', err);"),
+	s("gel", fmt(
+	[[
+	let {} = document.getElementById('{}');{}
+	]],
+	{ i(1), rep(1), i(0) })),
 })
 
 ls.add_snippets("telekasten", {
diff --git a/config/essentials/nvim/ftplugin/javascript.lua b/config/essentials/nvim/ftplugin/javascript.lua
index c6869e1..3a52ffb 100644
--- a/config/essentials/nvim/ftplugin/javascript.lua
+++ b/config/essentials/nvim/ftplugin/javascript.lua
@@ -1,4 +1,4 @@
 vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>")
+vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>")
 vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr><esc>A")
-vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>A")
+vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>A")
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index c920492..622972f 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -10,9 +10,6 @@ vim.cmd("hi link CalNavi CalRuler")
 vim.cmd("hi tkTagSep ctermfg=gray guifg=gray")
 vim.cmd("hi tkTag ctermfg=175 guifg=#d3869B")
 
-vim.keymap.set("i", "(", "()<Left>")
-vim.keymap.set("i", "[", "[]<Left>")
-
 vim.keymap.set("n", "<LocalLeader>a", "<cmd>Telekasten show_tags<cr>")
 vim.keymap.set("n", "<LocalLeader>b", "<cmd>Telekasten show_backlinks<cr>")
 vim.keymap.set("n", "<LocalLeader>c", "<cmd>Telekasten show_calendar<cr>")
diff --git a/config/essentials/nvim/lua/user/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim
index 79ffc36..873f9c9 100644
--- a/config/essentials/nvim/lua/user/aucommands.vim
+++ b/config/essentials/nvim/lua/user/aucommands.vim
@@ -21,3 +21,15 @@ autocmd BufReadPost *
 
 " Makes vim-commentary work
 autocmd FileType dosini setlocal commentstring=#\ %s
+
+funct! Filter(command)
+    redir =>output
+    silent exec a:command
+    redir END
+    let @o = output
+    execute "put o"
+	redraw!
+    return ''
+endfunct!
+
+nnoremap <Leader>F :silent call Filter('g/')<left><Left>
diff --git a/config/essentials/nvim/lua/user/cmp/sql.lua b/config/essentials/nvim/lua/user/cmp/sql.lua
new file mode 100644
index 0000000..71f6bdf
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/sql.lua
@@ -0,0 +1 @@
+require'lspconfig'.sqlls.setup{}
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index a38dcd9..c9e27a2 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -13,7 +13,7 @@ return require('packer').startup(function(use)
 	use('theprimeagen/harpoon')
 
 	-- colors
-	-- use('shaunsingh/nord.nvim')
+	use('shaunsingh/nord.nvim')
 	use { 'uZer/pywal16.nvim', as = 'pywal16' }
 	use('norcalli/nvim-colorizer.lua')
 
@@ -39,6 +39,8 @@ return require('packer').startup(function(use)
 	use('renerocksai/calendar-vim')
 	use('ojroques/vim-oscyank', {branch = "main"})
 	use("potamides/pantran.nvim")
+	use('alx741/vinfo')
+	use('github/copilot.vim')
 
 	-- objects
 	use('michaeljsmith/vim-indent-object')
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 25052f7..0fe4164 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -64,6 +64,7 @@ vim.keymap.set("n", "<Leader>x", "<cmd>!chmod +x %<cr>", { noremap = true, silen
 -- replace
 vim.keymap.set("n", "<Leader>sf", [[:%s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
 vim.keymap.set("n", "<Leader>sl", [[:s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<LocalLeader>f", "<cmd>.!fold -w 80 -s<cr>")
 
 -- write
 vim.keymap.set("n", "<LocalLeader>w", "<cmd>write<cr>", { noremap = true })
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 9de8b87..e1c9bcc 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -39,6 +39,18 @@ require('telekasten').setup({
 	rename_update_links = true,
 	media_previewer = "telescope-media-files",
 	follow_url_fallback = nil,
+	vaults = {
+		SoftwareDesign = {
+			home = home .. "/" .. "SoftwareDesign",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
+		businessIT = {
+			home = home .. "/" .. "businessIT",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		}
+	}
 })
 
 vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>")
@@ -53,5 +65,6 @@ vim.keymap.set("n", "<leader>zm", "<cmd>Telekasten browse_media<cr>")
 vim.keymap.set("n", "<leader>zn", "<cmd>Telekasten new_note<cr>")
 vim.keymap.set("n", "<leader>zp", "<cmd>Telekasten preview_img<cr>")
 vim.keymap.set("n", "<leader>zs", "<cmd>Telekasten switch_vault<cr>")
+vim.keymap.set("n", "<leader>zt", "<cmd>Telekasten panel<cr>")
 vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<cr>")
 vim.keymap.set("n", "<leader>#", "<cmd>Telekasten show_tags<cr>")
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 96ec100..83da0f6 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -65,6 +65,21 @@ bindkey "^Xe" edit-command-line
 bindkey "^[." insert-last-word
 bindkey "^['" quote-line
 
+isTextFile()
+{
+	if [ ! -f "$1" ]
+	then
+		return 1
+	fi
+
+	file_type=$(file -b --mime-type "$1")
+	if [[ "$file_type" == text/* ]]
+	then
+		return
+	fi
+	return 1
+}
+
 # rehash hook
 zshcache_time="$(date +%s%N)"
 autoload -Uz add-zsh-hook
@@ -80,14 +95,35 @@ rehash_precmd() {
 # window title hooks
 add-zsh-hook -Uz precmd rehash_precmd
 set_wt_action () {
-	print -Pn "\e]0;$1\a"
+	print -Pn '\e]0;$1\a'
 }
 add-zsh-hook -Uz preexec set_wt_action
 set_wt () {
 	print -Pn "\e]0;%n@%m on %~\a"
 }
 add-zsh-hook -Uz precmd set_wt
+function osc7 {
+    local LC_ALL=C
+    export LC_ALL
 
+    setopt localoptions extendedglob
+    input=( ${(s::)PWD} )
+    uri=${(j::)input/(#b)([^A-Za-z0-9_.\!~*\'\(\)-\/])/%${(l:2::0:)$(([##16]#match))}}
+    print -n "\e]7;file://${HOSTNAME}${uri}\e\\"
+}
+add-zsh-hook -Uz chpwd osc7
+command_not_found_handler () {
+	isTextFile "$1" || 
+		echo "zsh: command not found: $1" >&2
+}
+# open file with file name
+open_file() {
+	if [ ${1:0:2} != "./" ] && isTextFile "$1"
+	then
+		"$EDITOR" "$1"
+	fi
+}
+add-zsh-hook -Uz preexec open_file
 
 # prompt
 PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ '
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index c7894e3..c9fa4dc 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -8,8 +8,8 @@ fi
 
 if [ "$WAYLAND_DISPLAY" ]
 then
-	alias -g clipp='wl-copy'
-	alias -g clipo='wl-paste'
+	alias -g clipp='wl-copy -n'
+	alias -g clipo='wl-paste -n'
 else
 	if which devour > /dev/null 2>&1  
 	then
@@ -21,7 +21,7 @@ else
 fi
 
 # Programs
-alias nv='nvim'
+alias vi='nvim'
 alias nb='newsboat'
 alias sr='surfraw'
 alias ccu='calcurse'
@@ -89,8 +89,8 @@ alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch'
 alias vimp="vim '+PlugInstall'"
 alias nvimp="nvim '+PackerSync'"
-alias nvg='git status > /dev/null 2>&1 && nv "+Git"'
-alias nvn='nv "+Telekasten panel"'
+alias nvg='git status > /dev/null 2>&1 && nvim "+Git"'
+alias nvn='nvim "+Telekasten panel"'
  
 alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HDMI-1 && ~/.fehbg'
 alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
@@ -106,6 +106,9 @@ alias fif='find . -type "f" | grep'
 alias fid='find . -type "d" | grep'
 alias sxt='sxiv -t'
 alias wgsh='wget --quiet --show-progress'
+alias ss4='ss -tln4p | cut -f1 -d,'
+alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
+alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
 
 # ssh
 alias sha='ssh-add'
@@ -115,6 +118,8 @@ alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
 alias whatsmyip='curl -s "ifconfig.co"'
 alias icognito='unset HISTFILE'
 alias webcam='v4l2-ctl --set-fmt-video=width=1280,height=720; mpv --demuxer-lavf-format=video4linux2 --demuxer-lavf-o-set=input_format=mjpeg av://v4l2:/dev/video0 --profile=low-latency --untimed --no-resume-playback'
+alias capture='echo "Y" | wf-recorder -o "$(hyprctl -j monitors | jq -r '\''.[].name'\'' | fzf)" --codec=vp8_vaapi --device=/dev/dri/renderD128 -f output.webm -D'
+alias qrclipo='qrencode -s 16 "$(clipo)" -o - | imv -w "imv - $(clipo)" -'
 alias airpods='bluetoothctl connect 60:93:16:24:00:10'
 alias hotpsot='nmcli dev wifi hotspot ifname wlan0 ssid wiefie password "peepeepoopoo"'
 alias wtip='wt ip -c -brief addr'
@@ -123,6 +128,11 @@ ls $HOME/.config/mutt/configs |
 fzf |
 tee /dev/stderr |
 xargs -I {} ln -sf "$HOME/.config/mutt/configs/{}" $HOME/.config/mutt/muttrc'
+alias fusephone='sshfs myphone: /media/phone'
+alias ttyper='ttyper -l english1000 -w 100'
+
+# NPM
+alias npi="npm init --yes"
 
 # Python
 alias penv='python3 -m venv env'
@@ -138,12 +148,14 @@ alias kll='killall'
 alias pi='ping archlinux.org -c4'
 alias -g sba='source env/bin/activate || source bin/activate'
 alias -g smc='systemctl'
-alias smcu='systemctl --user'
+alias ssc='doas smc'
+alias smcu='smc --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
 alias rh='rehash'
 alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
+alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite'
 
 alias vbm='vboxmanage'
 alias vbls='vbm list vms'
@@ -158,7 +170,7 @@ alias eto='$EDITOR ~/sync/TODO'
 alias edw='$EDITOR ~/src/dwm/config.def.h'
 alias edm='$EDITOR ~/src/dmenu/config.def.h'
 alias ehst='$EDITOR $ZDOTDIR/histfile'
-alias ezh=' $EDITOR $HOME/.config/hypr/hyprland.conf'
+alias ezh=' $EDITOR $HISTFILE'
 alias est='$EDITOR ~/src/st/config.def.h'
 alias esl='$EDITOR ~/src/slock/config.def.h'
 alias esls='$EDITOR ~/src/slstatus/config.def.h'
@@ -167,6 +179,7 @@ alias cfd='$EDITOR config.def.h'
 # quick cd
 alias cda='cd $HOME/docs/android/projects'
 alias cds='cd $HOME/src/'
+alias cdsw='cd $HOME/src/WheelAdvisor'
 alias cdw='cd $HOME/src/dwm'
 alias cddm='cd $HOME/src/dmenu'
 alias cdslo='cd $HOME/src/slock'
@@ -184,6 +197,7 @@ alias cdd='cd $HOME/dl'
 alias cdp='cd $HOME/pics'
 alias cdrs='cd /srv/'
 alias cdng='cd /etc/nginx'
+alias czo='cd $HOME/zot/'
 
 # googoo aliases
 alias o.='o .'
@@ -203,14 +217,16 @@ alias fzps='ps aux | tail +2 | fzf --bind \
 4:execute(echo -n {} | awk '\''{print \$9}'\'' | xclip -sel c -r),\
 5:execute(echo -n {} | tr -s '\'' '\'' | cut -f 11- -d '\'' '\'' | xclip -sel c -r)"'
 alias asf='alias | fzf'
+alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp"
 
-alias -s conf="$EDITOR"
-alias -s txt="$EDITOR"
-alias -s c="$EDITOR"
-alias -s z80="$EDITOR"
 alias -s zip='unzip -l'
 alias -s tar='tar tf'
 
+alias dcb='docker build'
+alias dcbt='docker build -t'
+alias dce='docker exec'
+alias dcet='docker exec -it'
+
 alias cfg='git --git-dir=$HOME/src/dotfiles/.git --work-tree=$HOME/src/dotfiles'
 # oh-my-zsh git aliases
 alias g='git'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 8b7dbef..3243750 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -86,13 +86,6 @@ clip () {
 	fi
 }
 
-fzh () {
-    choice="$(tac $HOME/.config/zsh/histfile | fzf)"
-    test -z "${choice}" && return
-    echo "${choice}" >> "${HOME}/.config/zsh/histfile"
-    eval "${choice}"
-}
-
 unzipp () {
     file=$1
     shift
@@ -110,10 +103,10 @@ esc () {
 }
 
 delfile () {
-	curl ${2:-"https://up.kallipso.be/delete/$1"}
+	curl "${2:-https://up.kallipso.be/delete/$1}"
 }
 upfile () {
-	curl -F "file=@\"$1\"" ${2:-"https://up.kallipso.be"}
+	curl -F "file=@\"$1\"" ${2:-http://0x0.st}
 }
 
 sgd () {
@@ -238,3 +231,22 @@ mime-default ()
 		xargs -I {} xdg-mime default "$1" "{}"
 	die "Done."
 }
+
+addedkeys () {
+	find ~/.ssh -iname "*.pub" | while read key
+	do 
+		local fingerprint="$(ssh-keygen -lf "$key" 2>/dev/null)" 
+		if ssh-add -l | grep -q "$fingerprint"
+		then
+		echo "$key"
+		fi
+	done | sed "s,$HOME/.ssh/,,"
+}
+
+fpass () {
+	find $HOME/.password-store -type f -not -path ".git" |
+		grep "\.gpg$" |
+		sed "s,$HOME/.password-store/,,;s,\.gpg$,," |
+		fzf |
+		xargs pass show -c
+}