Merge remote-tracking branch 'origin'

18 files changed, 78 insertions, 45 deletions

diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index f9e0566..d368349 100755
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,16 +1,19 @@
 [global]
     monitor = 0
     follow = keyboard
-    geometry = "248x64-32+48"
+    width=300
+    height=180
+    origin=top-right
+    offset=32x48
     indicate_hidden = yes
     shrink = no
     transparency = 00
-    separator_height = 2
+    separator_height = 20
     padding = 16
     horizontal_padding = 16
     frame_width = 0
     frame_color = "#79dac8"
-    separator_color = frame
+    separator_color = "#00000000"
     sort = yes
     idle_threshold = 120
     font = Iosevka Aile 9
@@ -25,24 +28,15 @@
     hide_duplicate_count = false
     show_indicators = true
     icon_position = left
-    max_icon_size = 64x64
     icon_path = "/usr/share/icons/Tela-pink/16/actions:/usr/share/icons/Tela-pink/16/apps:/usr/share/icons/Tela-pink-dark/16/devices:/usr/share/icons/Tela-pink/16/emblems:/usr/share/icons/Tela-pink/16/mimetypes:/usr/share/icons/Tela-pink/16/panel:/usr/share/icons/Tela-pink-dark/16/places:/usr/share/icons/Tela-pink/16/status"
     sticky_history = yes
     history_length = 20
-
-    corner_radius = 15
-
+    corner_radius = 0
     dmenu = /usr/bin/rofi -dmenu
     browser = /usr/bin/firefox
     title = Dunst
     class = Dunst
 
-[shortcuts]
-    close = ctrl+space
-    close_all = ctrl+shift+space
-    history = ctrl+0
-    context = ctrl+shift+BackSpace
-
 [urgency_low]
     background = "#9ccfd885"
     foreground = "#1f1d2e"
@@ -60,7 +54,7 @@
 
 [Spotify]
     appname = "Spotify"
-    format = "<b>now playing</b>\n%s\n%b"
+    format = "<b>now playing</b>\n🎤 %s\n🎶 %b"
     set_transient = true
 
 [ncmpcpp]
diff --git a/.config/i3/config##h.lowe b/.config/i3/config##h.lowe
index 0c517ea..ca32cf3 100644
--- a/.config/i3/config##h.lowe
+++ b/.config/i3/config##h.lowe
@@ -40,6 +40,17 @@ gaps inner 5
 gaps outer 0
 
 ## bindings
+### dunstctl - dunst shortcuts have been deprecated
+# close notifications with mod+x
+bindcode $mod+53 exec --no-startup-id dunstctl close
+bindcode $mod+shift+53 exec --no-startup-id dunstctl close-all
+
+# give context menu with mod+o
+bindcode $mod+47 exec --no-startup-id dunstctl context
+
+# show history items with mod+0 (like the old times)
+bindcode $mod+19 exec --no-startup-id dunstctl history-pop
+
 # done, {task,time}warrior control suite
 bindcode $mod+42 exec --no-startup-id ~/.local/bin/done
 
@@ -147,7 +158,6 @@ bindsym $mod+6 workspace $ws6
 bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $wssteam
-bindsym $mod+0 workspace $ws10
 bindsym $mod+m workspace $wsmusic
 bindcode $mod+49 workspace $wszotero
 bindcode $mod+60 workspace $wsdesktop
@@ -163,7 +173,6 @@ bindsym $mod+Shift+6 move container to workspace $ws6
 bindsym $mod+Shift+7 move container to workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $wssteam
-bindsym $mod+Shift+0 move container to workspace $ws10
 bindsym $mod+Shift+m move container to workspace $wsmusic
 bindcode $mod+Shift+49 move container to workspace $wszotero
 bindcode $mod+Shift+60 move container to workspace $wsdesktop
diff --git a/.config/i3/config##h.luchs b/.config/i3/config##h.luchs
index 319844a..081a614 100644
--- a/.config/i3/config##h.luchs
+++ b/.config/i3/config##h.luchs
@@ -46,6 +46,17 @@ gaps outer 2
 font pango:Iosevka 11
 
 ## bindings
+### dunstctl - dunst shortcuts have been deprecated
+# close notifications with mod+x
+bindcode $mod+53 exec --no-startup-id dunstctl close
+bindcode $mod+shift+53 exec --no-startup-id dunstctl close-all
+
+# give context menu with mod+o
+bindcode $mod+47 exec --no-startup-id dunstctl context
+
+# show history items with mod+0 (like the old times)
+bindcode $mod+19 exec --no-startup-id dunstctl history-pop
+
 # done, {task,time}warrior control suite
 bindcode $mod+42 exec --no-startup-id ~/.local/bin/done
 
@@ -169,7 +180,6 @@ bindsym $mod+6 workspace $ws6
 bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
 bindcode $mod+49 workspace $wszotero
 bindcode $mod+60 workspace $wsdesktop
 bindcode $mod+21 workspace $wsbrowser
@@ -184,7 +194,6 @@ bindsym $mod+Shift+6 move container to workspace $ws6
 bindsym $mod+Shift+7 move container to workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
 bindcode $mod+Shift+49 move container to workspace $wszotero
 bindcode $mod+Shift+60 move container to workspace $wsdesktop
 bindcode $mod+Shift+21 move container to workspace $wsbrowser
diff --git a/.config/i3/config##h.maus b/.config/i3/config##h.maus
index 29830c1..9b2c518 100644
--- a/.config/i3/config##h.maus
+++ b/.config/i3/config##h.maus
@@ -39,7 +39,18 @@ exec --no-startup-id ~/.fehbg
 font pango:Iosevka 11
 
 ## bindings
-# done, {task,time}warrior control suite
+### dunstctl - dunst shortcuts have been deprecated
+# close notifications with mod+x
+bindcode $mod+53 exec --no-startup-id dunstctl close
+bindcode $mod+shift+53 exec --no-startup-id dunstctl close-all
+
+# give context menu with mod+o
+bindcode $mod+47 exec --no-startup-id dunstctl context
+
+# show history items with mod+0 (like the old times)
+bindcode $mod+19 exec --no-startup-id dunstctl history-pop
+
+# done, {task,time}warrior control suite, mod+d
 bindcode $mod+42 exec --no-startup-id ~/.local/bin/done
 
 # type the contents of the clipboard with mod+p
@@ -69,10 +80,10 @@ bindsym XF86AudioPrev exec --no-startup-id playerctl previous
 bindsym XF86AudioNext exec --no-startup-id playerctl next
 bindsym XF86Tools exec --no-startup-id mpc toggle # for mpd/ncmpcpp
 
-# make the currently focused window a scratchpad
+# make the currently focused window a scratchpad, mod+shift+-
 bindcode $mod+Shift+20 move scratchpad
 
-# show the first scratchpad window
+# show the first scratchpad window, mod+-
 bindcode $mod+20 scratchpad show
 
 # pause notifications for a while with mod+shift+y
@@ -159,7 +170,6 @@ bindsym $mod+6 workspace $ws6
 bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $wssteam
-bindsym $mod+0 workspace $ws10
 bindsym $mod+m workspace $wsmusic
 bindcode $mod+49 workspace $wszotero
 bindcode $mod+60 workspace $wsdesktop
@@ -175,7 +185,6 @@ bindsym $mod+Shift+6 move container to workspace $ws6
 bindsym $mod+Shift+7 move container to workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $wssteam
-bindsym $mod+Shift+0 move container to workspace $ws10
 bindsym $mod+Shift+m move container to workspace $wsmusic
 bindcode $mod+Shift+49 move container to workspace $wszotero
 bindcode $mod+Shift+60 move container to workspace $wsdesktop
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua
index 0ca647a..8994763 100644
--- a/.config/nvim/lua/plugin_settings.lua
+++ b/.config/nvim/lua/plugin_settings.lua
@@ -336,7 +336,7 @@ local on_attach = function(client, bufnr)
     buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 end
 
-local servers = { 'rust_analyzer', 'jedi_language_server', 'texlab' }
+local servers = { 'rust_analyzer', 'jedi_language_server', 'texlab', 'clangd' }
 for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {
         on_attach = on_attach,
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index d8ef949..a122768 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -124,7 +124,7 @@ return require('packer').startup(function()
 
     -- cursorline of the $CURRENT_YEAR
     use {
-        'shadmansaleh/lualine.nvim',
+        'nvim-lualine/lualine.nvim',
         requires = {'kyazdani42/nvim-web-devicons', opt = true}
     }
     -- colour theme of the $CURRENT_YEAR
diff --git a/.config/polybar/focus b/.config/polybar/focus
index 42edffb..49d46d2 100755
--- a/.config/polybar/focus
+++ b/.config/polybar/focus
@@ -44,4 +44,3 @@ if ($task =~ m/^(.*)?\s(\d+\w+)$/g) {
         print "$1 | $2";
     }
 }
-# print $task;
diff --git a/.config/polybar/notification_pause.sh b/.config/polybar/notification_pause.sh
index 1df1bd6..9bf6724 100755
--- a/.config/polybar/notification_pause.sh
+++ b/.config/polybar/notification_pause.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-TOGGLE=$HOME/.local/share/.pause_notifications
-
-if [ ! -e $TOGGLE ]; then
+if ! $(dunstctl is-paused); then
     echo
 else
     printf ""
diff --git a/.config/polybar/stop b/.config/polybar/stop
index 58f8741..1efd193 100755
--- a/.config/polybar/stop
+++ b/.config/polybar/stop
@@ -44,4 +44,3 @@ if ($task =~ m/^(\d+)(.*)$/g) {
         exec(qq(dunstify --appname="task" --icon="kt-pause" "stopping" "$1"));
     }
 }
-
diff --git a/.config/yadm/encrypt b/.config/yadm/encrypt
index 0774b67..aaa502d 100644
--- a/.config/yadm/encrypt
+++ b/.config/yadm/encrypt
@@ -1,3 +1,5 @@
 .ssh/aur
 .ssh/aur.pub
 .ssh/config
+.ssh/gitolite
+.ssh/gitolite.pub
diff --git a/.gitconfig##h.lowe b/.gitconfig##h.lowe
index e66c268..d0026b7 100644
--- a/.gitconfig##h.lowe
+++ b/.gitconfig##h.lowe
@@ -12,10 +12,13 @@
     ci = commit
     st = status
     br = branch
-    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
     type = cat-file -t
     dump = cat-file -p
     adog = log --all --decorate --oneline --graph
+    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+    sl = log --oneline --decorate -20
+    sla = log --oneline --decorate --graph --all -20
+    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
 [credential]
     helper = cache --timeout=3600
 [color]
diff --git a/.gitconfig##h.luchs b/.gitconfig##h.luchs
index bd7343f..5ad9aeb 100644
--- a/.gitconfig##h.luchs
+++ b/.gitconfig##h.luchs
@@ -12,10 +12,13 @@
     ci = commit
     st = status
     br = branch
-    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
     type = cat-file -t
     dump = cat-file -p
     adog = log --all --decorate --oneline --graph
+    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+    sl = log --oneline --decorate -20
+    sla = log --oneline --decorate --graph --all -20
+    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
 [credential]
     helper = cache --timeout=3600
 [color]
diff --git a/.gitconfig##h.maus b/.gitconfig##h.maus
index 76c9a91..265ecb6 100644
--- a/.gitconfig##h.maus
+++ b/.gitconfig##h.maus
@@ -12,10 +12,13 @@
     ci = commit
     st = status
     br = branch
-    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
     type = cat-file -t
     dump = cat-file -p
     adog = log --all --decorate --oneline --graph
+    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+    sl = log --oneline --decorate -20
+    sla = log --oneline --decorate --graph --all -20
+    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
 [credential]
     helper = cache --timeout=3600
 [color]
diff --git a/.local/bin/app_populator b/.local/bin/app_populator
new file mode 100755
index 0000000..6182b98
--- /dev/null
+++ b/.local/bin/app_populator
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# https://www.reddit.com/r/commandline/comments/q9skbh/how_to_remember_what_applications_you_have/
+#< Populates the applist
+# cat ~/.local/share/applist | fzf
+
+ls /usr/share/man/man1 2> /dev/null |
+    sed -e 's/\.1.*//' |
+    xargs whatis 2> /dev/null |
+    sed -e '/unknown subject/d' -e 's/  *- / - /' > ~/.local/share/applist
diff --git a/.local/bin/notify_phone b/.local/bin/notify_phone
index 6228f73..adf1464 100755
--- a/.local/bin/notify_phone
+++ b/.local/bin/notify_phone
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TOKEN=795983515:AAHAPgakm-BbRKNodF9a0z_OH2VDsIxpm_Q
+TOKEN=$(pass telegram/notifier)
 CHAT_ID=4903620
 INPUT=$@
 MESSAGE=${INPUT:-"all done"}
diff --git a/.local/bin/td b/.local/bin/td
index f15c0c6..dad71f1 100755
--- a/.local/bin/td
+++ b/.local/bin/td
@@ -21,6 +21,6 @@ if [[ $? -ne 0 ]]; then
     exit 0
 fi
 
-echo REM "${task_date}" AT "${task_time}" +45 *15 MSG %\""${task_description}"%\" %c% >> "${HOME}/nextcloud/remind/050-events.rem"
+echo REM "${task_date}" AT "${task_time}" +45 *15 MSG %\""${task_description}"%\" %c% >> "${HOME}/nextcloud/virtuals/remind/050-events.rem"
 
 notify-send "notification set!" "${task_date} at ${task_time}" --app-name="remind" --icon="checkmark"
diff --git a/.local/bin/toggle_notifications.sh b/.local/bin/toggle_notifications.sh
index 9b700b5..6818728 100755
--- a/.local/bin/toggle_notifications.sh
+++ b/.local/bin/toggle_notifications.sh
@@ -1,14 +1,10 @@
 #!/usr/bin/env bash
 
-TOGGLE=$HOME/.local/share/.pause_notifications
-
-if [ ! -e $TOGGLE ]; then
-    touch $TOGGLE
-    dunstify --appname="notifications" --icon="chronometer-pause" "pausing" -u low
-    sleep 3
-    killall -SIGUSR1 dunst # pause
-else
-    rm $TOGGLE
-    killall -SIGUSR2 dunst # resume
+if $(dunstctl is-paused); then
     dunstify --appname="notifications" --icon="chronometer-start" "here's what happened" -u low
+    dunstctl set-paused false
+else
+    dunstify --appname="notifications" --icon="chronometer-pause" "pausing" -u low
+    sleep 2
+    dunstctl set-paused true
 fi
diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive
index b5ea7de..b68d190 100644
--- a/.local/share/yadm/archive
+++ b/.local/share/yadm/archive