From 2cb639b95fc4d7834a092adf37c9ebec90fe7193 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylerm@tylerm.dev>
Date: Fri, 29 Sep 2023 10:36:21 -0400
Subject: update sway and waybar configuration, hanve around guix packages

---
 home-config/sway/auto.sh                           |  19 ------
 home-config/sway/config                            |   9 +--
 home-config/sway/config.d/idle                     |   4 +-
 home-config/sway/config.d/keybinds                 |   2 +-
 home-config/sway/config.d/scratch                  |   4 +-
 home-config/sway/config.d/theme                    |   5 +-
 home-config/sway/lock.sh                           |   3 -
 home-config/sway/logout.d/power/img/lock-hover.png | Bin 0 -> 6421 bytes
 home-config/sway/logout.d/power/img/lock.png       | Bin 0 -> 6692 bytes
 .../sway/logout.d/power/img/logout-hover.png       | Bin 0 -> 6076 bytes
 home-config/sway/logout.d/power/img/logout.png     | Bin 0 -> 6612 bytes
 .../sway/logout.d/power/img/power-hover.png        | Bin 0 -> 6995 bytes
 home-config/sway/logout.d/power/img/power.png      | Bin 0 -> 6996 bytes
 .../sway/logout.d/power/img/restart-hover.png      | Bin 0 -> 6846 bytes
 home-config/sway/logout.d/power/img/restart.png    | Bin 0 -> 7355 bytes
 .../sway/logout.d/power/img/sleep-hover.png        | Bin 0 -> 6094 bytes
 home-config/sway/logout.d/power/img/sleep.png      | Bin 0 -> 6683 bytes
 home-config/sway/logout.d/power/layout             |  30 ++++++++
 home-config/sway/logout.d/power/style.css          |  76 +++++++++++++++++++++
 home-config/sway/nya0.png                          | Bin 46891955 -> 0 bytes
 home-config/sway/power/img/lock-hover.png          | Bin 6421 -> 0 bytes
 home-config/sway/power/img/lock.png                | Bin 6692 -> 0 bytes
 home-config/sway/power/img/logout-hover.png        | Bin 6076 -> 0 bytes
 home-config/sway/power/img/logout.png              | Bin 6612 -> 0 bytes
 home-config/sway/power/img/power-hover.png         | Bin 6995 -> 0 bytes
 home-config/sway/power/img/power.png               | Bin 6996 -> 0 bytes
 home-config/sway/power/img/restart-hover.png       | Bin 6846 -> 0 bytes
 home-config/sway/power/img/restart.png             | Bin 7355 -> 0 bytes
 home-config/sway/power/img/sleep-hover.png         | Bin 6094 -> 0 bytes
 home-config/sway/power/img/sleep.png               | Bin 6683 -> 0 bytes
 home-config/sway/power/layout                      |  30 --------
 home-config/sway/power/style.css                   |  76 ---------------------
 home-config/sway/scratchpads.sh                    |   4 --
 home-config/sway/scripts.d/auto.sh                 |  19 ++++++
 home-config/sway/scripts.d/scratchpads.sh          |   4 ++
 home-config/sway/wallpapers/blue.jpg               | Bin 0 -> 1539393 bytes
 home-config/sway/wallpapers/nya0.png               | Bin 0 -> 46891955 bytes
 37 files changed, 143 insertions(+), 142 deletions(-)
 delete mode 100755 home-config/sway/auto.sh
 delete mode 100755 home-config/sway/lock.sh
 create mode 100644 home-config/sway/logout.d/power/img/lock-hover.png
 create mode 100644 home-config/sway/logout.d/power/img/lock.png
 create mode 100644 home-config/sway/logout.d/power/img/logout-hover.png
 create mode 100644 home-config/sway/logout.d/power/img/logout.png
 create mode 100644 home-config/sway/logout.d/power/img/power-hover.png
 create mode 100644 home-config/sway/logout.d/power/img/power.png
 create mode 100644 home-config/sway/logout.d/power/img/restart-hover.png
 create mode 100644 home-config/sway/logout.d/power/img/restart.png
 create mode 100644 home-config/sway/logout.d/power/img/sleep-hover.png
 create mode 100644 home-config/sway/logout.d/power/img/sleep.png
 create mode 100644 home-config/sway/logout.d/power/layout
 create mode 100644 home-config/sway/logout.d/power/style.css
 delete mode 100644 home-config/sway/nya0.png
 delete mode 100644 home-config/sway/power/img/lock-hover.png
 delete mode 100644 home-config/sway/power/img/lock.png
 delete mode 100644 home-config/sway/power/img/logout-hover.png
 delete mode 100644 home-config/sway/power/img/logout.png
 delete mode 100644 home-config/sway/power/img/power-hover.png
 delete mode 100644 home-config/sway/power/img/power.png
 delete mode 100644 home-config/sway/power/img/restart-hover.png
 delete mode 100644 home-config/sway/power/img/restart.png
 delete mode 100644 home-config/sway/power/img/sleep-hover.png
 delete mode 100644 home-config/sway/power/img/sleep.png
 delete mode 100644 home-config/sway/power/layout
 delete mode 100644 home-config/sway/power/style.css
 delete mode 100755 home-config/sway/scratchpads.sh
 create mode 100755 home-config/sway/scripts.d/auto.sh
 create mode 100755 home-config/sway/scripts.d/scratchpads.sh
 create mode 100755 home-config/sway/wallpapers/blue.jpg
 create mode 100644 home-config/sway/wallpapers/nya0.png

(limited to 'home-config/sway')

diff --git a/home-config/sway/auto.sh b/home-config/sway/auto.sh
deleted file mode 100755
index 68a28e2..0000000
--- a/home-config/sway/auto.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/lib/xdg-desktop-portal -r &
-/usr/lib/xdg-desktop-portal-wlr -r &
-
-mako &
-
-nm-applet --indicator &
-
-GTK_THEME= waybar &
-
-autotiling &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
-element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
-#thunderbird &
-
diff --git a/home-config/sway/config b/home-config/sway/config
index e5613cb..497b549 100755
--- a/home-config/sway/config
+++ b/home-config/sway/config
@@ -14,12 +14,13 @@ set $menu wofi --allow-images --show=drun --prompt "Search Program"
 set $scale 1.5
 
 # Set background
-set $bg ~/.config/sway/nya0.png
+set $bg ~/.config/sway/wallpapers/blue.jpg
 
 # Set Efects
-set $radius 5
+set $gaps 10
+set $radius 0
 set $shadows on
-set $shadow_blur 50
+set $shadow_blur 15
 set $blur enable
 set $blur_radius 4
 set $blur_passes 2
@@ -28,7 +29,7 @@ set $blur_passes 2
 set $browser firefox
 
 # Autostart apps
-exec $HOME/.config/sway/auto.sh
+exec $HOME/.config/sway/scripts.d/auto.sh
 
 # Local configs
 include $HOME/.config/sway/config.d/*
diff --git a/home-config/sway/config.d/idle b/home-config/sway/config.d/idle
index 7b94882..fb13083 100644
--- a/home-config/sway/config.d/idle
+++ b/home-config/sway/config.d/idle
@@ -1,5 +1,5 @@
 # Turn off display after tiemout
 exec swayidle -w \
-    timeout 300 '~/.config/sway/lock.sh' \
+    timeout 300 'swaylock -f -c 14171d' \
     timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep '~/.config/sway/lock.sh'
+    before-sleep 'swaylock -f -c 14171d'
diff --git a/home-config/sway/config.d/keybinds b/home-config/sway/config.d/keybinds
index d70cf82..7278d49 100644
--- a/home-config/sway/config.d/keybinds
+++ b/home-config/sway/config.d/keybinds
@@ -19,7 +19,7 @@ bindsym $mod+Shift+l exec $lock
 bindsym Ctrl+Alt+Delete exec killall sway
 
 # Power menu
-bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/power/style.css -l ~/.config/sway/power/layout
+bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
diff --git a/home-config/sway/config.d/scratch b/home-config/sway/config.d/scratch
index 4de2190..0337319 100644
--- a/home-config/sway/config.d/scratch
+++ b/home-config/sway/config.d/scratch
@@ -10,5 +10,5 @@ bindsym $mod+minus scratchpad show
 for_window [app_id="scratch_term"] move scratchpad, resize set 960 640
 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640
 
-bindsym $mod+y exec ~/.config/sway/scratchpads.sh scratch_term zsh
-bindsym $mod+h exec ~/.config/sway/scratchpads.sh scratch_htop htop
+bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh
+bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop
diff --git a/home-config/sway/config.d/theme b/home-config/sway/config.d/theme
index 43ebb81..e8d2822 100644
--- a/home-config/sway/config.d/theme
+++ b/home-config/sway/config.d/theme
@@ -1,5 +1,5 @@
 ### Set borders
-gaps inner 10
+gaps inner $gaps
 for_window [class="^.*"] border pixel 2
 default_border pixel 2
 default_floating_border pixel 2
@@ -21,9 +21,12 @@ smart_corner_radius $radius
 shadows $shadows
 shadows_on_csd $shadows
 shadow_blur_radius $shadow_blur
+shadow_color #14171dff
 blur $blur
 blur_radius $blur_radius
 blur_passes $blur_passes
+layer_effects "waybar" blur enable; shadows enable
+layer_effects "wofi" blur enable; shadows enable
 
 ### Output configuration
 output * bg $bg fill
diff --git a/home-config/sway/lock.sh b/home-config/sway/lock.sh
deleted file mode 100755
index b84e3d0..0000000
--- a/home-config/sway/lock.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-swaylock --indicator --clock -i ~/.config/sway/nya0.png --effect-blur 10x5
diff --git a/home-config/sway/logout.d/power/img/lock-hover.png b/home-config/sway/logout.d/power/img/lock-hover.png
new file mode 100644
index 0000000..46c51b0
Binary files /dev/null and b/home-config/sway/logout.d/power/img/lock-hover.png differ
diff --git a/home-config/sway/logout.d/power/img/lock.png b/home-config/sway/logout.d/power/img/lock.png
new file mode 100644
index 0000000..f1ec4a2
Binary files /dev/null and b/home-config/sway/logout.d/power/img/lock.png differ
diff --git a/home-config/sway/logout.d/power/img/logout-hover.png b/home-config/sway/logout.d/power/img/logout-hover.png
new file mode 100644
index 0000000..b34a150
Binary files /dev/null and b/home-config/sway/logout.d/power/img/logout-hover.png differ
diff --git a/home-config/sway/logout.d/power/img/logout.png b/home-config/sway/logout.d/power/img/logout.png
new file mode 100644
index 0000000..59a5aeb
Binary files /dev/null and b/home-config/sway/logout.d/power/img/logout.png differ
diff --git a/home-config/sway/logout.d/power/img/power-hover.png b/home-config/sway/logout.d/power/img/power-hover.png
new file mode 100644
index 0000000..a65e429
Binary files /dev/null and b/home-config/sway/logout.d/power/img/power-hover.png differ
diff --git a/home-config/sway/logout.d/power/img/power.png b/home-config/sway/logout.d/power/img/power.png
new file mode 100644
index 0000000..6aac455
Binary files /dev/null and b/home-config/sway/logout.d/power/img/power.png differ
diff --git a/home-config/sway/logout.d/power/img/restart-hover.png b/home-config/sway/logout.d/power/img/restart-hover.png
new file mode 100644
index 0000000..7921398
Binary files /dev/null and b/home-config/sway/logout.d/power/img/restart-hover.png differ
diff --git a/home-config/sway/logout.d/power/img/restart.png b/home-config/sway/logout.d/power/img/restart.png
new file mode 100644
index 0000000..5851243
Binary files /dev/null and b/home-config/sway/logout.d/power/img/restart.png differ
diff --git a/home-config/sway/logout.d/power/img/sleep-hover.png b/home-config/sway/logout.d/power/img/sleep-hover.png
new file mode 100644
index 0000000..7c9b6b3
Binary files /dev/null and b/home-config/sway/logout.d/power/img/sleep-hover.png differ
diff --git a/home-config/sway/logout.d/power/img/sleep.png b/home-config/sway/logout.d/power/img/sleep.png
new file mode 100644
index 0000000..164f5fb
Binary files /dev/null and b/home-config/sway/logout.d/power/img/sleep.png differ
diff --git a/home-config/sway/logout.d/power/layout b/home-config/sway/logout.d/power/layout
new file mode 100644
index 0000000..ecd4759
--- /dev/null
+++ b/home-config/sway/logout.d/power/layout
@@ -0,0 +1,30 @@
+{
+    "label" : "lock",
+    "action" : "swaylock -f -c 14171d",
+    "text" : "Lock",
+    "keybind" : "l"
+}
+{
+    "label" : "logout",
+    "action" : "loginctl terminate-user $USER",
+    "text" : "Logout",
+    "keybind" : "e"
+}
+{
+    "label" : "shutdown",
+    "action" : "loginctl poweroff",
+    "text" : "Shutdown",
+    "keybind" : "s"
+}
+{
+    "label" : "suspend",
+    "action" : "loginctl suspend",
+    "text" : "Suspend",
+    "keybind" : "u"
+}
+{
+    "label" : "reboot",
+    "action" : "loginctl reboot",
+    "text" : "Reboot",
+    "keybind" : "r"
+}
diff --git a/home-config/sway/logout.d/power/style.css b/home-config/sway/logout.d/power/style.css
new file mode 100644
index 0000000..e80dd33
--- /dev/null
+++ b/home-config/sway/logout.d/power/style.css
@@ -0,0 +1,76 @@
+nk* {
+    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+window {
+	background-color: rgba(0, 0, 0, 0);
+}
+
+button {
+	background-color: #242434;
+    background-image: none;
+    color: #89ADF8;
+	border: 1px solid rgba(0, 0, 0, 0);
+    margin: 5px;
+	border-radius: 10px;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 35%;
+}
+
+button:focus, button:active {
+	background-color: #89B4FA;
+    color: #242434;
+    font-weight: 500;
+	outline-style: none;
+}
+
+#lock {
+    background-image: image(url("img/lock.png"));
+}
+
+#logout {
+    background-image: image(url("img/logout.png"));
+}
+
+#suspend {
+    background-image: image(url("img/sleep.png"));
+}
+
+#hibernate {
+    background-image: image(url("img/hibernate.png"));
+}
+
+#shutdown {
+    background-image: image(url("img/power.png"));
+}
+
+#reboot {
+    background-image: image(url("img/restart.png"));
+}
+
+#lock:focus {
+    background-image: image(url("img/lock-hover.png"));
+}
+
+#logout:focus {
+    background-image: image(url("img/logout-hover.png"));
+}
+
+#suspend:focus {
+    background-image: image(url("img/sleep-hover.png"));
+}
+
+#hibernate:focus {
+    background-image: image(url("img/hibernate-hover.png"));
+}
+
+#shutdown:focus {
+    background-image: image(url("img/power-hover.png"));
+}
+
+#reboot:focus {
+    background-image: image(url("img/restart-hover.png"));
+}
diff --git a/home-config/sway/nya0.png b/home-config/sway/nya0.png
deleted file mode 100644
index e9da5d5..0000000
Binary files a/home-config/sway/nya0.png and /dev/null differ
diff --git a/home-config/sway/power/img/lock-hover.png b/home-config/sway/power/img/lock-hover.png
deleted file mode 100644
index 46c51b0..0000000
Binary files a/home-config/sway/power/img/lock-hover.png and /dev/null differ
diff --git a/home-config/sway/power/img/lock.png b/home-config/sway/power/img/lock.png
deleted file mode 100644
index f1ec4a2..0000000
Binary files a/home-config/sway/power/img/lock.png and /dev/null differ
diff --git a/home-config/sway/power/img/logout-hover.png b/home-config/sway/power/img/logout-hover.png
deleted file mode 100644
index b34a150..0000000
Binary files a/home-config/sway/power/img/logout-hover.png and /dev/null differ
diff --git a/home-config/sway/power/img/logout.png b/home-config/sway/power/img/logout.png
deleted file mode 100644
index 59a5aeb..0000000
Binary files a/home-config/sway/power/img/logout.png and /dev/null differ
diff --git a/home-config/sway/power/img/power-hover.png b/home-config/sway/power/img/power-hover.png
deleted file mode 100644
index a65e429..0000000
Binary files a/home-config/sway/power/img/power-hover.png and /dev/null differ
diff --git a/home-config/sway/power/img/power.png b/home-config/sway/power/img/power.png
deleted file mode 100644
index 6aac455..0000000
Binary files a/home-config/sway/power/img/power.png and /dev/null differ
diff --git a/home-config/sway/power/img/restart-hover.png b/home-config/sway/power/img/restart-hover.png
deleted file mode 100644
index 7921398..0000000
Binary files a/home-config/sway/power/img/restart-hover.png and /dev/null differ
diff --git a/home-config/sway/power/img/restart.png b/home-config/sway/power/img/restart.png
deleted file mode 100644
index 5851243..0000000
Binary files a/home-config/sway/power/img/restart.png and /dev/null differ
diff --git a/home-config/sway/power/img/sleep-hover.png b/home-config/sway/power/img/sleep-hover.png
deleted file mode 100644
index 7c9b6b3..0000000
Binary files a/home-config/sway/power/img/sleep-hover.png and /dev/null differ
diff --git a/home-config/sway/power/img/sleep.png b/home-config/sway/power/img/sleep.png
deleted file mode 100644
index 164f5fb..0000000
Binary files a/home-config/sway/power/img/sleep.png and /dev/null differ
diff --git a/home-config/sway/power/layout b/home-config/sway/power/layout
deleted file mode 100644
index 89af53b..0000000
--- a/home-config/sway/power/layout
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "label" : "lock",
-    "action" : "~/.config/sway/lock.sh",
-    "text" : "Lock",
-    "keybind" : "l"
-}
-{
-    "label" : "logout",
-    "action" : "loginctl terminate-user $USER",
-    "text" : "Logout",
-    "keybind" : "e"
-}
-{
-    "label" : "shutdown",
-    "action" : "loginctl poweroff",
-    "text" : "Shutdown",
-    "keybind" : "s"
-}
-{
-    "label" : "suspend",
-    "action" : "loginctl suspend",
-    "text" : "Suspend",
-    "keybind" : "u"
-}
-{
-    "label" : "reboot",
-    "action" : "loginctl reboot",
-    "text" : "Reboot",
-    "keybind" : "r"
-}
diff --git a/home-config/sway/power/style.css b/home-config/sway/power/style.css
deleted file mode 100644
index e80dd33..0000000
--- a/home-config/sway/power/style.css
+++ /dev/null
@@ -1,76 +0,0 @@
-nk* {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
-    font-size: 16px;
-    font-weight: bold;
-}
-
-window {
-	background-color: rgba(0, 0, 0, 0);
-}
-
-button {
-	background-color: #242434;
-    background-image: none;
-    color: #89ADF8;
-	border: 1px solid rgba(0, 0, 0, 0);
-    margin: 5px;
-	border-radius: 10px;
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: 35%;
-}
-
-button:focus, button:active {
-	background-color: #89B4FA;
-    color: #242434;
-    font-weight: 500;
-	outline-style: none;
-}
-
-#lock {
-    background-image: image(url("img/lock.png"));
-}
-
-#logout {
-    background-image: image(url("img/logout.png"));
-}
-
-#suspend {
-    background-image: image(url("img/sleep.png"));
-}
-
-#hibernate {
-    background-image: image(url("img/hibernate.png"));
-}
-
-#shutdown {
-    background-image: image(url("img/power.png"));
-}
-
-#reboot {
-    background-image: image(url("img/restart.png"));
-}
-
-#lock:focus {
-    background-image: image(url("img/lock-hover.png"));
-}
-
-#logout:focus {
-    background-image: image(url("img/logout-hover.png"));
-}
-
-#suspend:focus {
-    background-image: image(url("img/sleep-hover.png"));
-}
-
-#hibernate:focus {
-    background-image: image(url("img/hibernate-hover.png"));
-}
-
-#shutdown:focus {
-    background-image: image(url("img/power-hover.png"));
-}
-
-#reboot:focus {
-    background-image: image(url("img/restart-hover.png"));
-}
diff --git a/home-config/sway/scratchpads.sh b/home-config/sway/scratchpads.sh
deleted file mode 100755
index bb8e361..0000000
--- a/home-config/sway/scratchpads.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-( swaymsg -t get_tree | /bin/grep '"app_id": "'$1'"' ) || ( ( $TERMINAL --class=$1 -e $2 & ) && sleep 0.2 )
-swaymsg "[app_id=\"$1\"]" scratchpad show
diff --git a/home-config/sway/scripts.d/auto.sh b/home-config/sway/scripts.d/auto.sh
new file mode 100755
index 0000000..68a28e2
--- /dev/null
+++ b/home-config/sway/scripts.d/auto.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+/usr/lib/xdg-desktop-portal -r &
+/usr/lib/xdg-desktop-portal-wlr -r &
+
+mako &
+
+nm-applet --indicator &
+
+GTK_THEME= waybar &
+
+autotiling &
+
+/usr/bin/gnome-keyring-daemon --foreground &
+
+discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
+element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
+#thunderbird &
+
diff --git a/home-config/sway/scripts.d/scratchpads.sh b/home-config/sway/scripts.d/scratchpads.sh
new file mode 100755
index 0000000..bb8e361
--- /dev/null
+++ b/home-config/sway/scripts.d/scratchpads.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+( swaymsg -t get_tree | /bin/grep '"app_id": "'$1'"' ) || ( ( $TERMINAL --class=$1 -e $2 & ) && sleep 0.2 )
+swaymsg "[app_id=\"$1\"]" scratchpad show
diff --git a/home-config/sway/wallpapers/blue.jpg b/home-config/sway/wallpapers/blue.jpg
new file mode 100755
index 0000000..acd376b
Binary files /dev/null and b/home-config/sway/wallpapers/blue.jpg differ
diff --git a/home-config/sway/wallpapers/nya0.png b/home-config/sway/wallpapers/nya0.png
new file mode 100644
index 0000000..e9da5d5
Binary files /dev/null and b/home-config/sway/wallpapers/nya0.png differ
-- 
cgit v1.2.3-freya