Merge remote-tracking branch 'refs/remotes/origin/main'

author: Raymaekers Luca <raymaekers.luca@gmail.com> 2023-04-05 14:30:21 +0200
committer: Raymaekers Luca <raymaekers.luca@gmail.com> 2023-04-05 14:30:21 +0200
commit: e4c833e535dcda3dd3145e06f2d7f187e2197efb (patch)
tree: 10be7ce47fd56cf3f8e694efe266c5c6e67f4b0c /config/essentials
parent: a86e7cfce4bc2167383a071856f5deba77f30a5b (diff)
parent: c41328bec94c2d3fe58b6cc0db7336702b054cb7 (diff)
7 files changed, 150 insertions, 55 deletions
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index b110322..2f3f620 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -39,19 +39,19 @@ ls.add_snippets("lua", {
 	s("pt", fmt("print({}){}", { i(1, "\"Hello World!\"") , i(0) })),
 	-- local function
 	parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}),
-	-- require
-	s("lrq", fmt("local {} = require('{}')", { i(1), rep(1) })),
-	parse("rq", "require('$1')$0", {}),
-	parse("rqs", "require('$1').setup {\n\t$2\n}$0", {}),
-	parse("use", "use('$1')$0", {}),
-	-- function
-	s("fn", fmt(
+		-- require
+		s("lrq", fmt("local {} = require('{}')", { i(1), rep(1) })),
+		parse("rq", "require('$1')$0", {}),
+		parse("rqs", "require('$1').setup {\n\t$2\n}$0", {}),
+		parse("use", "use('$1')$0", {}),
+		-- function
+		s("fn", fmt(
 		[[
 		function {}({})
-			{}
-		end{}
-		]],
-    { i(1), i(2), i(3), i(0) })),
+		{}
+	end{}
+	]],
+	{ i(1), i(2), i(3), i(0) })),
 	parse("sn", "s(\"$1\", fmt(\n[[\n$2\n]],\n{ $3 })),$0", {}),
 })
 
@@ -59,7 +59,7 @@ ls.add_snippets("html", {
 	s("<!DOCTYPE>", {
 		t({"<!DOCTYPE html>", "<html lang=\"en\">", "\t<head>", "\t\t<title>"}),
 		i(1, "title"),
-  		t("</title>"), i(2),
+		t("</title>"), i(2),
 		t({"", "\t</head>", "\t<body>", "\t\t<h1>"}),
 		i(3, "Header"),
 		t("</h1>"), i(0),
@@ -137,3 +137,19 @@ ls.add_snippets("javascript", {
 	-- print
 	s("pt", fmt("console.log({}){}", { i(1, "\"Hello World!\"") , i(0) })),
 })
+
+ls.add_snippets("telekasten", {
+	--link
+	s("ln", fmt(
+	[[
+	[{}]({}){}
+	]],
+	{
+		i(1),
+		f(function ()
+			return vim.fn.getreg('+')
+		end),
+		i(0)
+	}
+	)),
+})
diff --git a/config/essentials/nvim/ftplugin/lua.lua b/config/essentials/nvim/ftplugin/lua.lua
new file mode 100644
index 0000000..07538ed
--- /dev/null
+++ b/config/essentials/nvim/ftplugin/lua.lua
@@ -0,0 +1 @@
+vim.keymap.set("i", "{(<cr>", "{<cr>})<C-o>O", { noremap = true })
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index 5986ff6..99bb361 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -1,4 +1,4 @@
-vim.opt.spell = true
+-- vim.opt.spell = true
 vim.opt.textwidth = 65
 vim.opt.signcolumn = "no"
 
@@ -17,12 +17,13 @@ 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>")
 vim.keymap.set("n", "<LocalLeader>C", "<cmd>CalendarT<cr>")
-vim.keymap.set({"n", "i"}, "<LocalLeader>i", "<cmd>Telekasten insert_link<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>i", "<Esc><cmd>Telekasten insert_link<cr>")
 vim.keymap.set({"n", "i"}, "<LocalLeader>I", "<cmd>Telekasten insert_img_link<cr>")
 vim.keymap.set("n", "<LocalLeader>F", "<cmd>Telekasten find_friends<cr>")
 vim.keymap.set("n", "<LocalLeader>r", "<cmd>Telekasten rename_note<cr>")
-vim.keymap.set({"n", "i"}, "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr>")
+vim.keymap.set("n", "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr>")
+vim.keymap.set("i", "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr><Esc>A")
 vim.keymap.set("n", "<LocalLeader>y", "<cmd>Telekasten yank_notelink<cr>")
 vim.keymap.set("n", "<LocalLeader>z", "<cmd>Telekasten follow_link<cr>")
 
-vim.keymap.set("i", "<LocalLeader>l", "<esc>I![<esc>A]()<left><C-r>+<esc>")
+vim.keymap.set("i", "<LocalLeader>l", "<esc>![<esc>A]()<left><C-r>+<esc>A")
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index bc2646b..30e1e2d 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -57,7 +57,7 @@ end, { noremap = true })
 -- utils
 vim.keymap.set("i", "<LocalLeader>r", "<cmd>r!echo -n $RANDOM<cr><esc>kJA", { noremap = true })
 -- ordered list
-vim.keymap.set("n", "<LocalLeader>n", "0vap<C-v>I0. <esc>gvg<C-a>", { noremap = true })
+vim.keymap.set("n", "<LocalLeader>n", "<C-v>I0. <esc>gvg<C-a>", { noremap = true })
 vim.keymap.set("v", "<Leader>u", "<cmd>'<,'>s/^[0-9]\\+\\. //<cr><esc>", { noremap = true })
 -- scripts
 vim.keymap.set("n", "<Leader>x", "<cmd>!chmod +x %<cr>", { noremap = true, silent = true})
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 2d3f30d..617cd00 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -23,13 +23,23 @@ zle -N add-surround surround
 zle -N change-surround surround
 compinit
 
-for f in \
-	/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \
-	/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-	~/.config/zsh/functions.zsh \
-	~/.config/zsh/aliases.zsh
-do
-	test -f $f && source $f
+if grep -qi "debian\|ubuntu" /etc/os-release; then
+    sfiles=(
+        /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+        /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+    )
+else
+    sfiles=(
+        /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+        /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+    )
+fi
+sfiles+=(
+		~/.config/zsh/functions.zsh
+		~/.config/zsh/aliases.zsh
+)
+for f in "${sfiles[@]}"; do
+    test -f "$f" && source "$f"
 done
 
 bindkey -v
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index 58ffae1..79a35e0 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -1,11 +1,16 @@
 #!/bin/zsh
 # s/alias \([^-]\)/alias -g \1
 
+if grep -qi "debian\|ubuntu" /etc/os-release
+then
+	alias aptup='apt update && apt upgrade -y'
+fi
+
 # Programs
 alias nv='nvim'
-alias -g nb='newsboat'
-alias -g sr='surfraw'
-alias -g ccu='calcurse'
+alias nb='newsboat'
+alias sr='surfraw'
+alias ccu='calcurse'
 
 alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml'
 
@@ -63,43 +68,46 @@ alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 
 # vim
 alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch'
-alias -g vimp="vim '+PlugInstall'"
-alias -g nvimp="nvim '+PackerSync'"
-alias -g nvg='git status > /dev/null 2>&1 && nv "+Git"'
+alias vimp="vim '+PlugInstall'"
+alias nvimp="nvim '+PackerSync'"
+alias nvg='git status > /dev/null 2>&1 && nv "+Git"'
+alias nvn='nv "+Telekasten panel"'
  
 alias -g xclipp='xclip -selection clipboard -r'
 alias -g xclipo='xclip -o -selection clipboard -r'
 alias -g xclippc='xclip -o -selection primary | xclip -selection clipboard -r'
 alias -g xclipcp='xclip -o -selection clipboard | xclip'
  
-alias -g xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HDMI-1 && ~/.fehbg'
-alias -g xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
+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'
  
-alias mv='mv -i'
-alias df='df -h'
-alias -g dud='du -d 1 -h 2>/dev/null | sort -h'
+alias dud='du * -d 0 -h 2>/dev/null | sort -h'
 alias df='df -h'
 alias shred='shred -uz'
 alias lsblk='lsblk -o name,type,fsused,size,fstype,label,mountpoint'
-alias -g floc='doas find / -type "f" 2> /dev/null | grep'
-alias -g dloc='doas find / -type "d" 2> /dev/null | grep'
-alias lsblk='lsblk -o name,type,fsused,size,fstype,label,mountpoint'
-alias -g fif='find . -type "f" | grep'
-alias -g fid='find . -type "d" | grep'
-alias -g sha 'ssh-add'
+alias floc='doas find / -type "f" 2> /dev/null | grep'
+alias dloc='doas find / -type "d" 2> /dev/null | grep'
+alias fif='find . -type "f" | grep'
+alias fid='find . -type "d" | grep'
+
+# ssh
+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 icognito='unset HISTFILE'
-alias sgd='
-for dir in ~/src/* 
-do 
-	cd $dir 
-	test "$(git status --short 2>/dev/null | grep -v "??" | head -1)" && echo "$PWD \e[1;31m*changes\e[0m"
-	test "$(parse_git_remote)" && echo "$PWD \e[0;32m*push/pull\e[0m" ;
-done'
+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'
+# swallow gui
+if which devour > /dev/null
+then
+	alias mpv='devour mpv'
+	alias zathura='devour zathura'
+fi
 
 # Python
-alias penv='python -m venv env'
+alias penv='python3 -m venv env'
 alias pipreq='pip install -r requirements.txt'
 
 alias -g '...'='../..'
@@ -115,10 +123,12 @@ alias -g smcu='systemctl --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
 alias -g wf='doas wipefs -a'
 alias -g dmci="doas make clean install"
+alias rmd='rm -f *.{orig,rej}'
 
 # quick config
 alias -g ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
 alias -g eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
+alias -g ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
 alias -g eto='$EDITOR ~/sync/TODO'
 alias -g edw='$EDITOR ~/src/dwm/config.def.h'
 alias -g edm='$EDITOR ~/src/dmenu/config.def.h'
@@ -126,18 +136,24 @@ alias -g ehist='$EDITOR $ZDOTDIR/histfile'
 alias -g est='$EDITOR ~/src/st/config.def.h'
 alias -g esl='$EDITOR ~/src/slock/config.def.h'
 alias -g esls='$EDITOR ~/src/slstatus/config.def.h'
-alias -g cfdef='$EDITOR config.def.h'
+alias -g cfd='$EDITOR config.def.h'
 alias -g cdo='$HOME/src/dotfiles'
 
-alias -g ff='"`fzffile`"'
-alias -g fd='"`fzfdir`"'
-alias -g fdf='"`fzfdirfile`"'
+# googoo aliases
+alias o.='o .'
+alias go.='go .'
+alias ogo.='ogo .'
+alias o/='o /'
+alias go/='go /'
+alias ogo/='ogo /'
+
 alias fzps='ps aux | tail +2 | fzf --bind \
 "1:execute(echo -n {} | awk '\''{print \$1}'\'' | xclip -sel c -r),\
 2:execute(echo -n {} | awk '\''{print \$2}'\'' | xclip -sel c -r),\
 3:execute(echo -n {} | awk '\''{print \$7}'\'' | xclip -sel c -r),\
 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 -s conf="$EDITOR"
 alias -s txt="$EDITOR"
@@ -190,6 +206,7 @@ alias gclr='git clone --recurse-submodules'
 alias gc1='git clone --depth 1'
 alias gclean='git clean --interactive -d'
 alias gpristine='git reset --hard && git clean --force -dfx'
+alias grsf='git reset --soft HEAD~'
 alias gcm='git checkout $(git_main_branch)'
 alias gcd='git checkout $(git_develop_branch)'
 alias gcmsg='git commit --message'
@@ -210,6 +227,7 @@ alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdup='git diff @{upstream}'
 alias gdw='git diff --word-diff'
+alias gdl='git diff HEAD^ HEAD'
 alias gf='git fetch'
 alias gfo='git fetch origin'
 alias gfg='git ls-files | grep'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 637df07..9ee4b93 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -72,8 +72,57 @@ esc () {
 }
 
 delfile () {
-	curl "https://upfast.craftmenners.men/delete/$1"
+	curl ${2:-"https://upfast.craftmenners.men/delete/$1"}
 }
 upfile () {
-	curl -F "file=@\"$1\"" "https://upfast.craftmenners.men"
+	curl -F "file=@\"$1\"" ${2:-"https://upfast.craftmenners.men"}
+}
+
+sgd () {
+	for dir in ${1:-$HOME/src/*} 
+	do 
+		cd $dir 
+		if [ "$(git status --short 2>/dev/null | grep -v "??" | head -1)" ]
+		then
+			# There are changes, and this is a git repo
+			echo "$PWD \e[1;31m*changes\e[0m"
+			git fetch > /dev/null 2>&1
+		fi
+		test "$(parse_git_remote)" && 
+			echo "$PWD \e[0;32m*push/pull\e[0m"
+		done
+}
+
+# Git functions
+# Returns current branch
+function git_current_branch()
+{
+	command git rev-parse --git-dir &>/dev/null || return
+	git branch --show-current
+}
+
+# Check if main exists and use instead of master
+function git_main_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local ref
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do
+    if command git show-ref -q --verify $ref; then
+      echo ${ref:t}
+      return
+    fi
+  done
+  echo master
+}
+
+# Check for develop and similarly named branches
+function git_develop_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local branch
+  for branch in dev devel development; do
+    if command git show-ref -q --verify refs/heads/$branch; then
+      echo $branch
+      return
+    fi
+  done
+  echo develop
 }
author	Raymaekers Luca <raymaekers.luca@gmail.com>	2023-04-05 14:30:21 +0200
committer	Raymaekers Luca <raymaekers.luca@gmail.com>	2023-04-05 14:30:21 +0200
commit	e4c833e535dcda3dd3145e06f2d7f187e2197efb (patch)
tree	10be7ce47fd56cf3f8e694efe266c5c6e67f4b0c /config/essentials
parent	a86e7cfce4bc2167383a071856f5deba77f30a5b (diff)
parent	c41328bec94c2d3fe58b6cc0db7336702b054cb7 (diff)