add colored notifications for mako and rely on systemd service instead of sway starting mako

11 files changed, 51 insertions, 21 deletions

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 61c90c7..2bbad0d 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -10,5 +10,5 @@ cursor_shape block
 text_fg_override_threshold 10
 
 include ~/.cache/wal/colors-kitty.conf
-background_opacity 0.8
+background_opacity 0.6
 background_blur 16
diff --git a/.config/mako/config b/.config/mako/config
index ca722c8..b428c62 100644
--- a/.config/mako/config
+++ b/.config/mako/config
@@ -1,15 +1,20 @@
-background-color=#000000
-border-color=#ffffff
+font=Ubuntu Sans
+background-color=#3e3b37
+border-color=#1e1b19
+text-color=#ded5c8
 text-alignment=left
-icon-location=left
+icon-location=right
 anchor=bottom-left
 outer-margin=10,0
 layer=overlay
-format=<b> %a </b> %s\n%b
+format=<b>%a </b> %s\n%b
 max-icon-size=64
-padding=0,5,0,0
+padding=0,8,0,0
 group-by=summary
 
+# include the non-tracked host.config
+include=~/.config/mako/host.config
+
 [app-name="uwupass"]
 group-by=none
 
@@ -20,7 +25,18 @@ on-notify=exec play -v 0.3 /home/ewout/.config/mako/Magic_Dart.mp3
 group-by=app-name
 
 [app-icon=]
-padding=5
+padding=0,8
 
 [mode=do-not-disturb]
 invisible=1
+on-notify=none
+
+[urgency=low]
+background-color=#bad1f9
+border-color=#e6fcf6
+text-color=#1e1b19
+
+[urgency=critical]
+background-color=#f2cae2
+border-color=#edadad
+text-color=#1e1b19
diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index 0b5b5da..13f0267 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -15,6 +15,7 @@ input {
 
     mouse {
         accel-profile "flat"
+	accel-speed 0.5
     }
 
     warp-mouse-to-focus
@@ -190,8 +191,8 @@ binds {
     // Note: the entire command goes as a single argument in the end.
     // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
 
-    XF86AudioRaiseVolume	allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIOSINK@" "0.1+"; }
-    XF86AudioLowerVolume	allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
+    XF86AudioRaiseVolume	allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"; }
+    XF86AudioLowerVolume	allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-"; }
     XF86AudioMute       	allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
     XF86AudioMicMute     	allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
     XF86AudioPlay		allow-when-locked=true { spawn "playerctl" "play-pause"; }
@@ -381,6 +382,7 @@ binds {
     // Mod+Shift+Space { switch-layout "prev"; }
 
     Print { screenshot; }
+    Super+Print { screenshot; }
     Ctrl+Print { screenshot-screen; }
     Alt+Print { screenshot-window; }
 
@@ -402,3 +404,17 @@ binds {
     // moving the mouse or pressing any other key.
     Mod+Shift+P { power-off-monitors; }
 }
+
+window-rule {
+	match app-id="kitty"
+	default-window-height { fixed 400; }
+}
+
+window-rule {
+	match app-id="firefox"
+	open-maximized true
+}
+
+output "LG Electronics LG ULTRAGEAR+ 303NTZN3Z085" {
+	variable-refresh-rate
+}
diff --git a/.config/sway/config.d/windows b/.config/sway/config.d/windows
index ad2d004..309b7c4 100644
--- a/.config/sway/config.d/windows
+++ b/.config/sway/config.d/windows
@@ -7,6 +7,7 @@ for_window [title="Picture-in-Picture"] {
 }
 
 for_window [app_id="pavucontrol"] {
+	border normal
 	floating enable
 	move position cursor
 	resize set 800 600
@@ -17,3 +18,5 @@ for_window [class="feh"] {
 	floating enable
 	focus
 }
+
+bindsym --release --border button2 kill
diff --git a/.config/sway/hosts/wit/outputs b/.config/sway/hosts/wit/outputs
index eebd642..2687eae 100644
--- a/.config/sway/hosts/wit/outputs
+++ b/.config/sway/hosts/wit/outputs
@@ -16,7 +16,3 @@ output $right {
 }
 workspace 9 output $right
 
-#set $wallpaper ls "$HOME/.steam/root/steamapps/workshop/content/431960" | shuf -n 1
-#exec linux-wallpaperengine  --output DP-2 $wallpaper --output HDMI-A-2 $wallpaper
-
-exec mako --output "HDMI-A-2"
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index d0e7c9a..d2e5c0d 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -11,11 +11,9 @@
         "sway/workspaces",
         "sway/mode",
         "sway/scratchpad",
-	"niri/workspaces"
     ],
     "modules-center": [
         "sway/window",
-	"niri/window"
     ],
     "modules-right": [
 	"mpris",
diff --git a/.local/bin/dotfiles b/.local/bin/dotfiles
deleted file mode 100755
index 193a019..0000000
--- a/.local/bin/dotfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME" $@
diff --git a/.local/bin/pik b/.local/bin/pik
new file mode 100755
index 0000000..1663b8d
--- /dev/null
+++ b/.local/bin/pik
diff --git a/.local/bin/uwuload b/.local/bin/uwuload
index 7589958..effdb39 100755
--- a/.local/bin/uwuload
+++ b/.local/bin/uwuload
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -euox pipefail
-filename="$1"
-input='$(abs "$1")'
-rsync -r --progress --stats $1 "ewout@ewy.one:/srv/uwu/$filename"
+file=$1
+filename="$(basename $1)"
+rsync -r --progress --stats "$file" "ewout@ewy.one:/srv/uwu/$filename"
 url="https://uwu.ewy.one/$filename"
 echo "$url" | wl-copy
 message="Uploaded $filename to uwu; copied result URL to clipboard."
diff --git a/.local/bin/uwushot b/.local/bin/uwushot
index 59aed24..625c4d5 100755
--- a/.local/bin/uwushot
+++ b/.local/bin/uwushot
@@ -5,4 +5,4 @@ path="$HOME/Pictures/Screenshots/"
 filename="satty-$DATE.png"
 grim -g "$(slurp -o -r -c '#ff0000ff')" -t ppm - | satty --actions-on-right-click=save-to-file --filename - --disable-notifications --corner-roundness 12 --output-filename "$path$filename"
 cd "$path"
-uwuload "$filename"
+uwuload "$path/$filename"
diff --git a/.zshrc b/.zshrc
index f554b65..537a5ad 100644
--- a/.zshrc
+++ b/.zshrc
@@ -30,3 +30,6 @@ plugins=(
 . $HOME/.zsh_profile
 
 . /usr/share/oh-my-zsh/oh-my-zsh.sh
+
+# pik completion (installed by `pik --install-completion`)
+autoload -Uz compinit && compinit && source <(pik --completion)