Some shitHEADmaster

19 files changed, 78 insertions, 25 deletions

diff --git a/bin/exit-menu-sway.sh b/bin/exit-menu-sway.sh
index bd48e92..658fa1e 100755
--- a/bin/exit-menu-sway.sh
+++ b/bin/exit-menu-sway.sh
@@ -7,11 +7,13 @@ selected=$(echo -e $entries|wofi --width 100 --height 212 --dmenu --cache-file /
 
 case $selected in
   lock)
-    hyprlock;;
+    loginctl lock-session;;
   logout)
-    hyprctl dispatch exit;;
+    swaymsg exit;;
+#  suspend-then-hibernate)
+#    exec systemctl suspend-then-hibernate;;
   suspend)
-    exec systemctl suspend-then-hibernate;;
+    exec systemctl suspend;;
   hibernate)
     exec systemctl hibernate;;
   reboot)
diff --git a/hyprland/hyprlock.conf b/hyprland/hyprlock.conf
index 575a504..8778198 100644
--- a/hyprland/hyprlock.conf
+++ b/hyprland/hyprlock.conf
@@ -20,12 +20,12 @@ general {
 
 auth {
     fingerprint:enabled = true
-    fingerprint:ready_message = <i>Enter password or scan fingerprint</i>
+    fingerprint:ready_message = Enter password or scan fingerprint
 }
 
 # INPUT FIELD
 label {
-    text = $FPRINTPROMPT
+    text = cmd[update:100] [ ! -z "$FPRINTPROMPT" ] && echo "<i>$FPRINTPROMPT</i>" || echo "<i>Enter password (fingerprint unavailable)</i>"
     color = rgba(255, 255, 255, 0.8)
     font_size = 20
     font_family = Iosevka Nerd Font 
diff --git a/mako/config b/mako/config
index 59ee32c..eeaacba 100644
--- a/mako/config
+++ b/mako/config
@@ -11,8 +11,16 @@ max-icon-size=64
 default-timeout=5000
 ignore-timeout=0
 font=Iosevka Nerd Font 12
+on-button-left=exec makoctl menu -n $id -- wofi --width 200 --height 200 -d -p 'Choose action' && makoctl dismiss -n $id
 
 [urgency=critical]
 background-color=#eb4d4bf0
 border-color=#d63134
 
+[actionable]
+border-color=#ffffff
+
+[actionable expiring]
+border-color=#434e59
+on-button-left=invoke-default-action
+
diff --git a/sway/conf.d/00-theme-vars.conf b/sway/conf.d/00-theme-vars.conf
index c8139fa..73eecfe 100644
--- a/sway/conf.d/00-theme-vars.conf
+++ b/sway/conf.d/00-theme-vars.conf
@@ -3,7 +3,7 @@ set $left  h
 set $down  j
 set $up    k
 set $right l
-set $term kitty
+set $term alacritty
 set $menu wofi
 
 # Colours
diff --git a/sway/conf.d/10-environment.conf b/sway/conf.d/10-environment.conf
index 758d3a8..7a76cd1 100644
--- a/sway/conf.d/10-environment.conf
+++ b/sway/conf.d/10-environment.conf
@@ -4,6 +4,6 @@ exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.t
 exec wl-paste --type text --watch cliphist store
 exec wl-paste --type image --watch cliphist store
 
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 #exec --no-startup-id /usr/lib/polkit-kde-authentication-agent-1
 
diff --git a/sway/conf.d/20-binds.conf b/sway/conf.d/20-binds.conf
index f4a4246..8a374c9 100644
--- a/sway/conf.d/20-binds.conf
+++ b/sway/conf.d/20-binds.conf
@@ -110,13 +110,13 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && $s
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && $sink_volume > $wob_socket
 
 # Playback
-# bindsym XF86AudioPrev exec playerctl --player=spotify,%any previous
-# bindsym XF86AudioNext exec playerctl --player=spotify,%any next
-# bindsym XF86AudioPlay exec playerctl --player=spotify,%any play-pause
+bindsym XF86AudioPrev exec sh -c "playerctl --player=spotify,strawberry,%any previous"
+bindsym XF86AudioNext exec sh -c "playerctl --player=spotify,strawberry,%any next"
+bindsym XF86AudioPlay exec sh -c "playerctl --player=spotify,strawberry,%any play-pause"
 # gross workaround
-bindsym XF86AudioPrev exec notify-send "$(playerctl --player=spotify,%any previous)"
-bindsym XF86AudioNext exec notify-send "$(playerctl --player=spotify,%any next)"
-bindsym XF86AudioPlay exec notify-send "$(playerctl --player=spotify,%any play-pause)"
+#bindsym XF86AudioPrev exec notify-send "$(playerctl --player=spotify,%any previous)"
+#bindsym XF86AudioNext exec notify-send "$(playerctl --player=spotify,%any next)"
+#bindsym XF86AudioPlay exec notify-send "$(playerctl --player=spotify,%any play-pause)"
 
 # Brightness
 bindsym XF86MonBrightnessDown exec brightnessctl set 5- && $brightness > $wob_socket
diff --git a/sway/conf.d/21-rules.conf b/sway/conf.d/21-rules.conf
index 8397f09..2e93154 100644
--- a/sway/conf.d/21-rules.conf
+++ b/sway/conf.d/21-rules.conf
@@ -18,6 +18,9 @@ for_window [window_role="About"] floating enable
 
 for_window [app_id="(?i)Thunderbird" title=".*Reminder"] floating enable
 
+for_window [app_id="com.nextcloud.desktopclient.nextcloud" title="^Nextcloud$"] floating enable
+for_window [app_id="com.nextcloud.desktopclient.nextcloud" title="^Nextcloud$"] move position cursor 
+
 for_window [app_id="Zoom Workplace" title="^zoom$"] border none, floating enable
 for_window [app_id="Zoom Workplace" title="^(Zoom|About)$"] border pixel, floating enable
 
diff --git a/sway/conf.d/22-theme.conf b/sway/conf.d/22-theme.conf
index ec55641..52e8673 100644
--- a/sway/conf.d/22-theme.conf
+++ b/sway/conf.d/22-theme.conf
@@ -17,3 +17,7 @@ default_border normal 3
 hide_edge_borders smart
 
 default_floating_border normal 3
+
+focus_follows_mouse always
+#mouse_warping container
+#seat seat0 hide_cursor 2000
diff --git a/systemd/system-user/swayidle.service b/systemd/system-user/swayidle.service
index f5d223a..9757f0b 100644
--- a/systemd/system-user/swayidle.service
+++ b/systemd/system-user/swayidle.service
@@ -7,9 +7,10 @@ PartOf=graphical-session.target
 Type=simple
 ExecStart=/usr/bin/swayidle -w \
             timeout 300 "notify-send 'Power' 'System will suspend very soon due to inactivity.'" \
-            timeout 315 "hyprlock" \
-            timeout 320 "sytemctl suspend && swaymsg 'output * power off'" resume "swaymsg 'output * power on'" \
-            before-sleep "hyprlock"
+            timeout 310 "systemctl suspend-then-hibernate" \
+            before-sleep "loginctl lock-session" \
+            lock "hyprlock" \
+            unlock "pkill -USR1 hyprlock"
 
 
 [Install]
diff --git a/vim/.vimrc b/vim/.vimrc
index 470ad2a..9b1b45b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -3,10 +3,10 @@ syntax on
 set number
 highlight LineNr ctermfg=darkgrey
 
-filetype plugin indent on
+" filetype plugin indent on
 set tabstop=4
 set shiftwidth=4
-set expandtab
+set smarttab
 
 nnoremap <leader>n :NERDTreeFocus<CR>
 nnoremap <C-n> :NERDTree<CR>
diff --git a/vim/nvim/init.lua b/vim/nvim/init.lua
index fe378f0..8940414 100644
--- a/vim/nvim/init.lua
+++ b/vim/nvim/init.lua
@@ -19,7 +19,7 @@ highlight NormalFloat ctermbg=NONE
 filetype plugin indent on
 set tabstop=4
 set shiftwidth=4
-set expandtab
+set smarttab
 
 set signcolumn=number
 let g:airline_theme='lucius'
diff --git a/vim/nvim/lua/config/diagnostic.lua b/vim/nvim/lua/config/diagnostic.lua
index 9a534b5..afb0da2 100644
--- a/vim/nvim/lua/config/diagnostic.lua
+++ b/vim/nvim/lua/config/diagnostic.lua
@@ -22,7 +22,7 @@ vim.lsp.handlers['textDocument/publishDiagnostics'] = vim.lsp.with(
   }
 )
 
-local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
+local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
 for type, icon in pairs(signs) do
   local hl = "DiagnosticSign" .. type
   vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
diff --git a/vim/nvim/lua/config/lsp.lua b/vim/nvim/lua/config/lsp.lua
index 81d4572..9da3375 100644
--- a/vim/nvim/lua/config/lsp.lua
+++ b/vim/nvim/lua/config/lsp.lua
@@ -43,6 +43,9 @@ require('lspconfig')['pylsp'].setup{
     on_attach = on_attach,
     flags = lsp_flags,
     capabilities = capabilities,
+    settings = {
+        pylsp_mypy = { enabled = true },
+    }
 }
 
 require('lspconfig')['yamlls'].setup{
diff --git a/waybar/config b/waybar/config
index 8feb749..dbb1830 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "height": 30, 
     "spacing": 0, 
     "layer": "top",
-    "modules-left": ["sway/workspaces", "sway/mode", "hyprland/workspaces", "hyprland/window"],
+    "modules-left": ["sway/workspaces", "sway/mode", "hyprland/workspaces", "hyprland/window", "mpris"],
     "modules-center": [],
     "modules-right": ["tray", "idle_inhibitor", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "pulseaudio", "battery", "power-profiles-daemon", "clock"],
     "sway/workspaces": {
@@ -80,7 +80,7 @@
     },
     "network#e": {
         "interface": "e*",
-        "format-ethernet": "󰛳  {ipaddr}",
+        "format": "󰛳  {ipaddr}",
         "tooltip-format": "{ipaddr}: {ifname} via {gwaddr}",
         "format-linked": "󰲛  {ifname} (No IP)",
         "format-alt": "󰛳  {ifname}: {ipaddr}/{cidr}",
@@ -89,12 +89,13 @@
     },
     "network#wl": {
         "interface": "wlp1s0",
-        "format-wifi": "󰖩  {essid} ({signalStrength}%)",
+        "format": "󰖩  {essid} ({signalStrength}%)",
         "tooltip-format": "{ipaddr}: {ifname} via {gwaddr}",
         "format-linked": "󰖪  {ifname} (No IP)",
         "format-alt": "󰖩  {ifname}: {ipaddr}/{cidr}",
         "on-click-right": "alacritty -e /bin/bash -c \"/usr/bin/sleep 0.5 && /usr/bin/nmtui\"",
         "format-disconnected": "",
+        "format-disabled": "",
     },
     "network#vpnovpn": {
         "interface": "tun0",
@@ -102,6 +103,7 @@
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
         "format-linked": "",
         "format-disconnected": "",
+        "format-disabled": "",
     },
     "network#vpnwg": {
         "interface": "wg*",
@@ -109,6 +111,7 @@
         "format-alt": "󰟥  {ifname}: {ipaddr}/{cidr}",
         "format-linked": "",
         "format-disconnected": "",
+        "format-disabled": "",
     },
     "pulseaudio": {
         "format": "{icon} {volume}%",
@@ -139,6 +142,18 @@
         "ignored-sinks": ["Easy Effects Sink"],
         "scroll-step": 0.5
     },
+	"mpris": {
+		"format": " {player_icon} {artist} - {title} ",
+		"format-paused": " {status_icon}{player_icon} <i>{artist} - {title}</i> ",
+		"player-icons": {
+			"default": "󰝚 ",
+			"spotify": "󰓇 ",
+		},
+		"status-icons": {
+			"paused": "⏸ "
+		},
+		"ignored-players": ["firefox"]
+	},
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
diff --git a/waybar/style.css b/waybar/style.css
index 065056d..ec56d36 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -131,6 +131,12 @@ button {
     }
 }
 
+@keyframes blink {
+    50% {
+        color: #434e59;
+    }
+}
+
 label:focus {
     background-color: #000000;
 }
diff --git a/wofi/style.css b/wofi/style.css
index 72681a7..746edaf 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -5,7 +5,7 @@
 
 window {
     margin: 5px;
-    font-family: Iosevka Term SS08, Iosevka Nerd Font Mono;
+    font-family: Iosevka SS08, Iosevka Nerd Font;
     background-color: transparent;
 } 
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4d6f37d..cbfd6c1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -22,3 +22,4 @@ end
 for file in $ZSH_CONFIG/other/*; do
     source "$file"
 done
+
diff --git a/zsh/config/aliases.zsh b/zsh/config/aliases.zsh
index bd1f175..89e9bee 100644
--- a/zsh/config/aliases.zsh
+++ b/zsh/config/aliases.zsh
@@ -16,8 +16,15 @@ alias lx="exa -lbhHigUmuSa@ --icons --time-style=long-iso --git --color-scale"
 alias lS="exa -1"                                                             
 alias lt="exa --tree --level=2"                                        
 
+# iproute2 colours
+alias ip="ip -c"
+
 # ParUI
 alias pi="parui -p=yay"
 
 # Zsh
 alias cathex="while read -r line; do echo -e $line; done"
+
+# man
+alias man='MANWIDTH=$((COLUMNS > 80 ? 80 : COLUMNS)) man'
+
diff --git a/zsh/config/environment.zsh b/zsh/config/environment.zsh
index d7d1611..c291d03 100644
--- a/zsh/config/environment.zsh
+++ b/zsh/config/environment.zsh
@@ -6,7 +6,7 @@ ZSH_CONFIG=$HOME/.config/zsh
 export ZSH="$HOME/.oh-my-zsh"
 
 # User /bin
-export PATH="$HOME/bin:$HOME/bin/compiled:$PATH:/home/leonardo/.local/bin:/home/leonardo/.local/share/gem/ruby/3.3.0/bin"
+export PATH="$HOME/bin:$HOME/bin/compiled:$PATH:/home/leonardo/.local/bin:/home/leonardo/.local/share/gem/ruby/3.3.0/bin:/home/leonardo/.cargo/bin:$HOME/go/bin"
 
 # Exa colours
 export EXA_COLORS="uu=37:un=37:gu=37:gn=37:da=37"
@@ -16,3 +16,6 @@ export MOZ_ENABLE_WAYLAND=1
 
 # bundle
 export GEM_HOME=$HOME/.gem
+
+export EDITOR="vim"
+