Merge branch 'main' of db:dotfiles

9 files changed, 45 insertions, 31 deletions

diff --git a/bin/extra/supd b/bin/extra/supd
index 48638bd..61ea144 100755
--- a/bin/extra/supd
+++ b/bin/extra/supd
@@ -7,7 +7,7 @@ then
 	>&2 cat <<-EOF
 	usage:
 	    supd                              Update dirs in current dir
-	    ls ~/projects | supd              Update dirs read from stdin
+	    ... | supd                        Update dirs read from stdin
 	    supd -h                           Show help
 	EOF
 	exit
@@ -17,9 +17,10 @@ fi
 
 for dir in $dirs
 do
-	printf '%s:' "$dir" | >&2 sed "s#$HOME#~#"
 	(
 	cd "$dir" || return
+    git rev-parse > /dev/null 2>&1 || return
+	printf '%s:' "$dir" | >&2 sed "s#$HOME#~#"
     git "${1:-fetch}" > /dev/null 2>&1 &&
         printf ' o' ||
         printf ' x'
diff --git a/bin/guiscripts/clipo b/bin/guiscripts/clipo
new file mode 100755
index 0000000..e3ae714
--- /dev/null
+++ b/bin/guiscripts/clipo
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ "$WAYLAND_DISPLAY" ] &&
+    wl-paste -n ||
+    xclip -o -selection clipboard -r
diff --git a/bin/guiscripts/clipp b/bin/guiscripts/clipp
new file mode 100755
index 0000000..538f69b
--- /dev/null
+++ b/bin/guiscripts/clipp
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ "$WAYLAND_DISPLAY" ] &&
+    wl-copy -n ||
+    xclip -selection clipboard -r
diff --git a/bin/menuscripts/memoji b/bin/menuscripts/memoji
index 9c45950..45a74f1 100755
--- a/bin/menuscripts/memoji
+++ b/bin/menuscripts/memoji
@@ -5,30 +5,19 @@
 # If this file includes emojis below "__DATA__" it is generated.
 # This file was generated: 2022-04-21 12:38:03+00:00
 
-if [ "$WAYLAND_DISPLAY" ]
-then
-	alias copycmd="wl-copy"
-else
-	alias copycmd="xclip -sel c"
-fi
 set -e
 
 case "$1" in
-	"list")
-		data=$(sed '0,/^__DATA__$/d' "$0")
-		printf "%s" "$data"
-		;;
+	"list") printf "%s" "$(sed '0,/^__DATA__$/d' "$0")" ;;
 	"copy")
 		input=$(tee | cut -f 1 -d ' ')
 		if [ "$input" ]
 		then
 			notify-send "dmemoji" "$input <b>copied!</b>"
-			printf "%s" "$input" | copycmd
+			printf "%s" "$input" | clipp
 		fi
 		;;
-	"")
-		sh "$0" list | commander -p "Emoji:" -l -x | sh "$0" copy
-		;;
+	"") sh "$0" list | commander -p "Emoji:" -x -w 44 -y 10 -c | sh "$0" copy ;;
 esac
 
 exit
diff --git a/config/essentials/nvim/after/plugin/plantuml.lua b/config/essentials/nvim/after/plugin/plantuml.lua
new file mode 100644
index 0000000..da14862
--- /dev/null
+++ b/config/essentials/nvim/after/plugin/plantuml.lua
@@ -0,0 +1,10 @@
+require('plantuml').setup
+{
+  renderer = {
+    type = 'text',
+    options = {
+      split_cmd = 'split', -- Allowed values: `split`, `vsplit`.
+    }
+  },
+  render_on_write = true, -- Set to false to disable auto-rendering.
+}
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 36f9ec0..ed2bbf1 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -45,13 +45,20 @@ return require('packer').startup(function(use)
 
 	use('christoomey/vim-tmux-navigator')
 
-	-- utils
-	use('godlygeek/tabular')
-	use('renerocksai/calendar-vim')
-	use('ojroques/vim-oscyank', {branch = "main"})
-	use("potamides/pantran.nvim")
-	use('alx741/vinfo')
-	-- use('github/copilot.vim')
+    -- utils
+    use('godlygeek/tabular')
+    use('renerocksai/calendar-vim')
+    use('ojroques/vim-oscyank', {branch = "main"})
+    use("potamides/pantran.nvim")
+    use('alx741/vinfo')
+    use('sheerun/vim-polyglot')
+    -- use('github/copilot.vim')
+    --
+    use {
+        'https://gitlab.com/itaranto/plantuml.nvim',
+        tag = '*',
+        config = function() require('plantuml').setup() end
+    }
 
 	-- objects
 	use('michaeljsmith/vim-indent-object')
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index e9c7e2f..575502c 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -17,18 +17,13 @@ then
 
 	alias calc='bc <<<'
 
-	if [ "$WAYLAND_DISPLAY" ]
-	then
-		alias -g clipp='wl-copy -n'
-		alias -g clipo='wl-paste -n'
-	else
+	if [ -z "$WAYLAND_DISPLAY" ]
+    then
 		if which devour > /dev/null 2>&1  
 		then
 			alias mpv='devour mpv'
 			alias zathura='devour zathura'
 		fi
-		alias -g clipp='xclip -selection clipboard -r'
-		alias -g clipo='xclip -o -selection clipboard -r'
 	fi
 	alias clipic='clipo > /tmp/pic.png'
 
diff --git a/config/extra/tridactyl/tridactylrc b/config/extra/tridactyl/tridactylrc
index d9cab9e..977578b 100644
--- a/config/extra/tridactyl/tridactylrc
+++ b/config/extra/tridactyl/tridactylrc
@@ -1,5 +1,5 @@
 set newtab http://localhost:28669
-set searchengine qwant
+set searchengine duckduckgo
 
 " Searchurls
 set searchurls.1x https://www.1377x.to/search/%s/1
diff --git a/config/wayland/mako/config b/config/wayland/mako/config
index 2df4b1d..4380506 100644
--- a/config/wayland/mako/config
+++ b/config/wayland/mako/config
@@ -23,3 +23,7 @@ default-timeout=0
 [category=mpd]
 default-timeout=2000
 group-by=category
+
+[app-name=gurk]
+# 45887 = 70%
+on-notify=exec paplay --volume=45887 ~/.local/share/sounds/ring1.ogg