Merge branch 'main' of https://git.kallipso.be/dotfiles

5 files changed, 43 insertions, 4 deletions

diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 2f3f620..75e139b 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -130,7 +130,15 @@ ls.add_snippets("java", {
 })
 
 ls.add_snippets("sh", {
-	parse("fn", "function $1 {\n\t$2\n}$0", {})
+	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
+	parse("fdie",
+	[[
+	die ()
+	{
+		echo "\$1" >&2
+	}
+	]], {}),
+	parse("die", "die \"$1\"$0", {}),
 })
 
 ls.add_snippets("javascript", {
diff --git a/config/essentials/nvim/after/plugin/treesitter.lua b/config/essentials/nvim/after/plugin/treesitter.lua
index 9b1a0a9..e18368e 100644
--- a/config/essentials/nvim/after/plugin/treesitter.lua
+++ b/config/essentials/nvim/after/plugin/treesitter.lua
@@ -1,5 +1,5 @@
 require'nvim-treesitter.configs'.setup {
-	ensure_installed = { "c", "lua", "vim", "help", "diff"},
+	ensure_installed = { "c", "lua", "vim", "diff"},
 
 	sync_install = false,
 	auto_install = true,
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index ed9c8ec..279c07b 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-if [ "/dev/tty1" = "$TTY" ] || [ "/dev/tty2" = "$TTY" ]
+if [[ "/dev/tty1" = "$TTY" || "/dev/tty2" = "$TTY" ]] && [[ "$(id -u)" -ne 0 ]]
 then
 	clear
 	eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index e6a368f..a632089 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -38,6 +38,7 @@ if [ -x /usr/bin/dircolors ]; then
     alias fgrep='fgrep --color=auto'
     alias egrep='egrep --color=auto'
     alias ip='ip -color=auto'
+    alias ipa='ip -br a'
 fi
 
 alias l='ls -l'
@@ -106,7 +107,7 @@ alias sha='ssh-add'
 alias ssh-start='eval "$(ssh-agent)" && ssh-add'
 
 alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
-alias whatsmyip='curl "ifconfig.me"'
+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 wtip='wt ip -c -brief addr'
@@ -146,7 +147,9 @@ alias esls='$EDITOR ~/src/slstatus/config.def.h'
 alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
 # quick cd
 alias cfd='$EDITOR config.def.h'
+alias cds='cd $HOME/src/'
 alias cdo='cd $HOME/src/dotfiles'
+alias cdi='cd $HOME/src/installdrier'
 alias cdm='cd $HOME/music'
 alias cdd='cd $HOME/dl'
 alias cdrs='cd /srv/'
@@ -157,8 +160,11 @@ alias o.='o .'
 alias go.='go .'
 alias ogo.='ogo .'
 alias o/='o /'
+alias o/s='o /srv'
 alias go/='go /'
+alias go/s='go /srv'
 alias ogo/='ogo /'
+alias ogo/s='ogo /srv'
 
 alias fzps='ps aux | tail +2 | fzf --bind \
 "1:execute(echo -n {} | awk '\''{print \$1}'\'' | xclip -sel c -r),\
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index abc2639..f21ce9b 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -86,6 +86,7 @@ upfile () {
 }
 
 sgd () {
+	d="$PWD"
 	for dir in ${1:-$HOME/src/*} 
 	do 
 		cd $dir 
@@ -98,6 +99,8 @@ sgd () {
 		test "$(parse_git_remote)" && 
 			echo "$PWD \e[0;32m*push/pull\e[0m"
 		done
+	cd "$d"
+	unset d
 }
 
 # Git functions
@@ -153,3 +156,25 @@ gpg_import ()
 	gpg --import private.asc
 	shred -uz {public,private,trust}.asc
 }
+
+ngenable ()
+{
+	ln -sf /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/
+}
+
+vbsr ()
+{
+	vboxmanage snapshot "$1" restore "$2" &&
+		vboxmanage startvm "$1" ||
+		vboxmanage controlvm "$1" poweroff
+}
+vbsrr ()
+{
+	vbsr "$1" "$2"
+	sleep 3
+	vbsr "$1" "$2"
+}
+vbst ()
+{
+	vboxmanage snapshot "$1" take "$2"
+}