swaylock and swayidle

10 files changed, 61 insertions, 205 deletions

diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
deleted file mode 100644
index 7f9a435..0000000
--- a/hypr/hypridle.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-general {
-  lock_cmd = pidof hyprlock || hyprlock
-  before_sleep_cmd = loginctl lock-session && niri msg action power-off-monitors
-  inhibit_sleep = 1
-}
-
-listener {
-  timeout = 300
-  on-timeout = brightnessctl -se set 10%
-  on-resume = brightnessctl -r
-}
-
-listener {
-  timeout = 360
-  on-timeout = systemctl suspend
-}
diff --git a/scripts/set_background b/scripts/set_background
index f9465ce..161a272 100755
--- a/scripts/set_background
+++ b/scripts/set_background
@@ -7,13 +7,15 @@ end
 
 set -x SWWW_TRANSITION "any"
 set -x SWWW_TRANSITION_FPS 60
-set -x SWWW_TRANSITION_DURATION 2
-set -U img $argv[1]
+set -x SWWW_TRANSITION_DURATION 1.5
 
-wallust run $img; and begin
-	niri msg action do-screen-transition 
-	swww img $img
+niri msg action do-screen-transition 
+wallust run $argv[1]; and begin
+	set -U img $argv[1]
+	swww img $argv[1]
 	makoctl reload
-	notify-send -i $img "Wallust" "Changed wallpaper and palette."
+	notify-send -i $argv[1] "Wallust" "Changed wallpaper and palette."
+end; or begin
+	notify-send -u critical "Wallust" "Failed to change palette"
 end;
 
diff --git a/scripts/wallpapermenu b/scripts/wallpapermenu
index 7f436ac..789dd1c 100755
--- a/scripts/wallpapermenu
+++ b/scripts/wallpapermenu
@@ -1,6 +1,6 @@
 #!/usr/bin/fish
 
-set dir "/home/eric.marin/Pictures/Backgrounds/"
+set dir "$HOME/Pictures/Backgrounds/"
 set chosen (
   for file in (find $dir -type f)
     if test -z $img; or test $file != $img
diff --git a/swayidle/config b/swayidle/config
new file mode 100644
index 0000000..bd1d8a0
--- /dev/null
+++ b/swayidle/config
@@ -0,0 +1,5 @@
+lock 'swaylock -fe'
+before-sleep 'loginctl lock-session ; niri msg eDP-1 off'
+after-resume 'niri msg eDP-1 on'
+timeout 300 'brightnessctl -se set 10%' resume 'brightnessctl -r'
+timeout 360 'systemctl suspend'
diff --git a/wallust/templates/fuzzel b/wallust/templates/fuzzel
deleted file mode 100644
index 5d388ee..0000000
--- a/wallust/templates/fuzzel
+++ /dev/null
@@ -1,116 +0,0 @@
-output=eDP-1
-font=Hack Nerd Font
-dpi-aware=yes
-use-bold=yes
-prompt=" "
-placeholder="..."
-icon-theme=Papirus
-# icons-enabled=yes
-# hide-before-typing=no
-# fields=filename,name,generic
-# password-character=*
-# filter-desktop=no
-# match-mode=fzf
-# sort-result=yes
-# match-counter=no
-# delayed-filter-ms=300
-# delayed-filter-limit=20000
-# show-actions=no
-terminal=foot -o pad=0x0
-# launch-prefix=<not set>
-# list-executables-in-path=no
-
-# anchor=center
-# x-margin=0
-# y-margin=0
-lines=10
-width=35
-# tabs=8
-horizontal-pad=10
-vertical-pad=6
-inner-pad=5
-
-image-size-ratio=0
-
-# line-height=<use font metrics>
-# letter-spacing=0
-
-# layer=overlay
-# exit-on-keyboard-focus-loss=yes
-
-# cache=<not set>
-
-# render-workers=<number of logical CPUs>
-# match-workers=<number of logical CPUs>
-
-[colors]
-background=      {{background | strip}}FF
-text=            {{foreground | strip}}FF
-prompt=          {{color4 | strip}}FF
-placeholder=     {{color2 | strip}}FF
-input=           {{foreground | strip}}FF
-match=           {{color4 | strip}}FF
-selection=       {{color0 | strip}}FF
-selection-text=  {{color5 | strip}}FF
-selection-match= {{color5 | strip}}FF
-counter=         {{color1 | strip}}FF
-border=          {{color1 | strip}}FF
-
-[border]
-width=2
-radius=0
-
-[dmenu]
-# mode=text  # text|index
-# exit-immediately-if-empty=no
-
-[key-bindings]
-# cancel=Escape Control+g Control+c Control+bracketleft
-# execute=Return KP_Enter Control+y
-# execute-or-next=Tab
-# execute-input=Shift+Return Shift+KP_Enter
-# cursor-left=Left Control+b
-# cursor-left-word=Control+Left Mod1+b
-# cursor-right=Right Control+f
-# cursor-right-word=Control+Right Mod1+f
-# cursor-home=Home Control+a
-# cursor-end=End Control+e
-# delete-prev=BackSpace Control+h
-# delete-prev-word=Mod1+BackSpace Control+BackSpace Control+w
-# delete-line-backward=Control+u
-# delete-next=Delete KP_Delete Control+d
-# delete-next-word=Mod1+d Control+Delete Control+KP_Delete
-# delete-line-forward=Control+k
-# prev=Up Control+p
-# prev-with-wrap=ISO_Left_Tab
-# prev-page=Page_Up KP_Page_Up
-# next=Down Control+n
-# next-with-wrap=none
-# next-page=Page_Down KP_Page_Down
-# expunge=Shift+Delete
-# clipboard-paste=Control+v XF86Paste
-# primary-paste=Shift+Insert Shift+KP_Insert
-
-# custom-N: *dmenu mode only*. Like execute, but with a non-zero
-# exit-code; custom-1 exits with code 10, custom-2 with 11, custom-3
-# with 12, and so on.
-
-# custom-1=Mod1+1
-# custom-2=Mod1+2
-# custom-3=Mod1+3
-# custom-4=Mod1+4
-# custom-5=Mod1+5
-# custom-6=Mod1+6
-# custom-7=Mod1+7
-# custom-8=Mod1+8
-# custom-9=Mod1+9
-# custom-10=Mod1+0
-# custom-11=Mod1+exclam
-# custom-12=Mod1+at
-# custom-13=Mod1+numbersign
-# custom-14=Mod1+dollar
-# custom-15=Mod1+percent
-# custom-16=Mod1+dead_circumflex
-# custom-17=Mod1+ampersand
-# custom-18=Mod1+asterix
-# custom-19=Mod1+parentleft
diff --git a/wallust/templates/hyprlock b/wallust/templates/hyprlock
deleted file mode 100644
index 9c37a34..0000000
--- a/wallust/templates/hyprlock
+++ /dev/null
@@ -1,48 +0,0 @@
-general {
-    hide_cursor = true
-    ignore_empty_input = true
-    immediate_render = true
-    disable_loading_bar = true
-}
-
-background {
-    monitor = eDP-1
-    path = {{wallpaper}}
-    blur_passes = 2
-    blur_size = 1
-}
-input-field {
-    monitor = eDP-1
-    size = 500, 100
-    outline_thickness = 2
-    dots_size = 0.3 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center = false
-    outer_color = rgb({{color1 | rgb}})
-    inner_color = rgb({{background | rgb}})
-    font_color = rgb({{foreground | rgb}})
-    fade_on_empty = true
-
-    placeholder_text = <i></i>
-    fail_text = <i>Wrong Password...</i>
-    fail_color = rgb({{color6 | rgb}})
-
-    position = 0, -300
-    halign = center
-    valign = center
-}
-label {
-    monitor = eDP-1
-    text = cmd[update:1000] date +"%H:%M:%S"
-    color = rgb({{foreground | rgb}})
-    font_size = 100
-    font_family = Hack Nerd Font
-
-    position = 0, 300
-    halign = center
-    valign = center
-
-    shadow_passes = 1
-    shadow_color = rgb({{background | rgb}})
-}
-
diff --git a/wallust/templates/niri b/wallust/templates/niri
index efbc8f3..45e952d 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -120,10 +120,6 @@ layer-rule {
 }
 
 window-rule {
-  match app-id=r#"^org\.wezfurlong\.wezterm$"#
-  default-column-width {}
-}
-window-rule {
   match title="btop"
   match title="nmtui"
   default-column-width { proportion 1.0; }
@@ -207,7 +203,7 @@ binds {
   Mod+Ctrl+8 { move-column-to-workspace 8; }
   Mod+Ctrl+9 { move-column-to-workspace 9; }
 
-  Mod+Tab { focus-workspace-previous; }
+  Mod+Z { focus-workspace-previous; }
 
   Mod+Comma  { consume-window-into-column; }
   Mod+Period { expel-window-from-column; }
@@ -236,7 +232,7 @@ binds {
 
   Mod+T { toggle-column-tabbed-display; }
 
-  Mod+Z { toggle-overview; }
+  Mod+Tab { toggle-overview; }
 
   Mod+Shift+E { quit; }
 }
diff --git a/wallust/templates/rofi-applauncher b/wallust/templates/rofi-applauncher
index 4851d6b..a1ab13d 100644
--- a/wallust/templates/rofi-applauncher
+++ b/wallust/templates/rofi-applauncher
@@ -22,24 +22,18 @@ mainbox {
 	orientation: horizontal;
 }
 inputbar {
-	children: [ prompt, entry ];
-	spacing: 5;
-}
-prompt {
-	font: "Hack Nerd Font Mono 10";
+	children: [ entry ];
 }
 entry {
-	font: "Hack Nerd Font 10";
-	placeholder: "...";
-	width: 50;
+	enabled: false;
 }
 listview {
-	spacing: 10;
+	spacing: 5;
 	layout: horizontal;
 }
 element-text {
 	font: "Hack Nerd Font 10";
-	text-color: inherit;
+	color: inherit;
 }
 element selected {
 	color: {{color4}};
diff --git a/wallust/templates/swaylock b/wallust/templates/swaylock
new file mode 100644
index 0000000..e17ce46
--- /dev/null
+++ b/wallust/templates/swaylock
@@ -0,0 +1,36 @@
+indicator-caps-lock
+indicator-idle-visible
+indicator-radius=100
+
+font=Hack Nerd Font
+font-size=50
+
+clock
+timestr=%H:%M:%S
+datestr=%a %D
+
+image={{wallpaper}}
+effect-blur=5x2
+
+key-hl-color={{color6 | strip}}
+caps-lock-key-hl-color={{color6 | strip}}
+bs-hl-color={{color5 | strip}}
+caps-lock-bs-hl-color={{color5 | strip}}
+
+inside-color={{background}}
+inside-clear-color={{background}}
+inside-caps-lock-color={{background}}
+inside-ver-color={{background}}
+inside-wrong-color={{background}}
+
+ring-color={{color0 | strip}}
+ring-clear-color={{color5 | strip}}
+ring-caps-lock-color={{color2 | strip}}
+ring-ver-color={{color4 | strip}}
+ring-wrong-color={{color3 | strip}}
+
+text-color={{foreground | strip}}
+text-clear-color={{color5 | strip}}
+text-caps-lock-color={{color2 | strip}}
+text-ver-color={{color4 | strip}}
+text-wrong-color={{color3 | strip}}
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
index 2ba5cc6..8b80868 100644
--- a/wallust/wallust.toml
+++ b/wallust/wallust.toml
@@ -17,8 +17,11 @@ nvim.target = "~/.cache/wal/colors-wal.vim"
 niri.template = "niri"
 niri.target = "~/.config/niri/config.kdl"
 
-hyprlock.template = "hyprlock"
-hyprlock.target = "~/.config/hypr/hyprlock.conf"
+# hyprlock.template = "hyprlock"
+# hyprlock.target = "~/.config/hypr/hyprlock.conf"
+
+swaylock.template = "swaylock"
+swaylock.target = "~/.config/swaylock/config"
 
 mako.template = "mako"
 mako.target = "~/.config/mako/config"