diff --git a/.bash_profile b/.bash_profile
index dc914cb..c83bc85 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,7 +1,5 @@
#!/usr/bin/env bash
-eval $(keychain --eval --quiet ry_ecdsa)
-eval $(keychain --eval --quiet id_rsa)
export MOZ_ENABLE_WAYLAND=1
export XDG_CONFIG_HOME=~/.config
export XDG_CACHE_HOME=~/.cache
diff --git a/.bashrc b/.bashrc
index 51c8bed..c3f4097 100755
--- a/.bashrc
+++ b/.bashrc
@@ -13,6 +13,14 @@ elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
+
+#######################################################
+# SSH
+#######################################################
+eval $(keychain --eval --quiet ry_ecdsa)
+eval $(keychain --eval --quiet id_rsa)
+
+
#######################################################
# EXPORTS
#######################################################
diff --git a/.config/swaylock/config b/.config/swaylock/config
index 25c87fa..f457f30 100644
--- a/.config/swaylock/config
+++ b/.config/swaylock/config
@@ -1,10 +1,32 @@
# Image
-image=~/.config/wallpapers/mountains.jpg
+image=~/.config/wallpapers/dante-bite.jpg
scaling=fill
# Indicator
ignore-empty-password
indicator-caps-lock
+indicator-radius=100
+indicator-thickness=20
+line-color=1f1d2e
+ring-color=191724
+inside-color=1f1d2e
+key-hl-color=eb6f92
+separator-color=00000000
+text-color=e0def4
+text-caps-lock-color=""
+line-ver-color=eb6f92
+ring-ver-color=eb6f92
+inside-ver-color=1f1d2e
+text-ver-color=e0def4
+ring-wrong-color=31748f
+text-wrong-color=31748f
+inside-wrong-color=1f1d2e
+inside-clear-color=1f1d2e
+text-clear-color=e0def4
+ring-clear-color=9ccfd8
+line-clear-color=1f1d2e
+line-wrong-color=1f1d2e
+bs-hl-color=31748f
# Behavior
show-failed-attempts
diff --git a/.config/systemd/user/default.target.wants/mpd.service b/.config/systemd/user/default.target.wants/mpd.service
deleted file mode 120000
index 0524f66..0000000
--- a/.config/systemd/user/default.target.wants/mpd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/user/mpd.service
\ No newline at end of file
diff --git a/.config/systemd/user/easyeffects.service b/.config/systemd/user/easyeffects.service
deleted file mode 100644
index d80de5c..0000000
--- a/.config/systemd/user/easyeffects.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=EasyEffects, EQ Program
-
-[Service]
-ExecStart=/usr/bin/easyeffects --gapplication-service
-Restart=on-failure
-StartLimitIntervalSec=10
-SuccessExitStatus=3 4
-RestartForceExitStatus=3 4
-
-[Install]
-WantedBy=default.target
diff --git a/.config/systemd/user/protonvpn_reconnect.service b/.config/systemd/user/protonvpn_reconnect.service
deleted file mode 100644
index 8b06e35..0000000
--- a/.config/systemd/user/protonvpn_reconnect.service
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# v3.14.0
-
-[Unit]
-Description=Proton VPN Reconnector
-
-[Service]
-ExecStart=/usr/bin/python3 /usr/lib/python3.11/site-packages/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py
diff --git a/.config/waybar/config b/.config/waybar/config
index bca5c40..05f77fb 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -3,8 +3,8 @@
"position": "top",
"height": 35,
"modules-left": ["sway/workspaces"],
- "modules-center": ["clock", "custom/wlsunset"],
- "modules-right": ["idle_inhibitor", "pulseaudio", "network", "battery", "tray"],
+ "modules-center": ["clock"],
+ "modules-right": ["custom/l_end","custom/wlsunset","custom/padd","pulseaudio", "custom/padd","network", "custom/padd","battery", "tray", "custom/power","custom/padd"],
"sway/workspaces": {
"disable-scroll": true,
"all-outputs": true,
@@ -39,14 +39,14 @@
"format-charging": " {capacity}% "
},
"custom/wlsunset": {
- "format": "",
- "format-icons": ["", ""],
+ "format": "",
+ "format-icons": ["", ""],
"on-click": "wlsunset -l 47.6 -L -122.3 -t 3000 -T 6500"
},
"network": {
"interval": 5,
- "format-wifi": " {essid}",
- "format-ethernet": " {ifname}",
+ "format-wifi": " {essid}",
+ "format-ethernet": " {ifname}",
"format-disconnected": "",
"tooltip-format-wifi": "{essid}:{signalStrength}\nSpeed:{bandwidthDownBits} \n{ipaddr}"
@@ -57,19 +57,62 @@
"on-click": "pavucontrol",
"on-scroll-down": "amixer set Master 3%-",
"format": "",
- "format": "Vol: {volume}%",
+ "format": "{icon} {volume}%",
"format-muted": "Muted",
- //"format-icons": {
- // "headset": "",
- // "headphone": "",
- // "default": ["", "", " "]
- // },
- },
- "idle_inhibitor": {
- "format": "{icon}",
"format-icons": {
- "activated": "Idle Inhibit: On",
- "deactivated": "Idle Inhibit: Off",
+ "headset": "",
+ "headphone": "",
+ "default": ["", "", " "]
},
},
+
+ "custom/power": {
+ "format": "⏻{}",
+ //"exec": "echo ; echo logout",
+ "on-click": "wlogout -p layer-shell",
+ "interval" : 86400, // once every day
+ "tooltip": true
+ },
+
+ "custom/l_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/r_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/sl_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/sr_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/rl_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/rr_end": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ },
+
+ "custom/padd": {
+ "format": " ",
+ "interval" : "once",
+ "tooltip": false
+ }
}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 632bd92..9ec7e02 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -53,11 +53,19 @@ window#waybar {
}
#network {
+ color: #bebebe;
+ margin:7px 4px 4px 4px;
+ font-size: 16.5px;
+ border-radius: 6px;
+ /* padding: 0px 5px 0px 5px; */
+}
+
+#custom-power {
color: #bebebe;
margin:7px 4px 0 4px;
font-size: 16.5px;
border-radius: 6px;
- padding: 0px 5px 0px 5px;
+ /*padding: 0px 0px 0px 0px;*/
}
@keyframes critical {
@@ -106,7 +114,7 @@ window#waybar {
color: #bebebe;
border: none;
border-radius: 0;
- padding: 0px 0px 5px 0px;
+ /* padding: 0px px 5px 0px; */
}
#custom-wlsunset:hover {
@@ -120,15 +128,15 @@ window#waybar {
margin:7px 4px 0 4px;
font-size: 16.5px;
color: #bebebe;
- border-radius: 5px;
- padding: 0px 5px 0px 5px;
+ /* border-radius: 5px; */
+ /* padding: 0px 5px 0px 5px; */
}
#tray {
- margin: 7px 15px 0 4px;
+ margin: 7px 15px 3px 4px;
background: rgba(40,40,40, .65);
border-radius: 6px;
- padding: 0px 5px 0px 5px;
+ padding: 5px 3px 5px 5px;
}
#idle_inhibitor {
diff --git a/.config/wlogout/layout b/.config/wlogout/layout
new file mode 100644
index 0000000..9281637
--- /dev/null
+++ b/.config/wlogout/layout
@@ -0,0 +1,41 @@
+{
+ "label" : "lock",
+ "action" : "swaylock",
+ "text" : "Lock",
+ "keybind" : "l"
+}
+
+{
+ "label" : "logout",
+ "action" : "sway exit",
+ "text" : "Logout",
+ "keybind" : "e"
+}
+
+{
+ "label" : "suspend",
+ "action" : "swaylock -f && systemctl suspend",
+ "text" : "Suspend",
+ "keybind" : "u"
+}
+
+{
+ "label" : "shutdown",
+ "action" : "systemctl poweroff",
+ "text" : "Shutdown",
+ "keybind" : "s"
+}
+
+{
+ "label" : "hibernate",
+ "action" : "systemctl hibernate",
+ "text" : "Hibernate",
+ "keybind" : "h"
+}
+
+{
+ "label" : "reboot",
+ "action" : "systemctl reboot",
+ "text" : "Reboot",
+ "keybind" : "r"
+}
diff --git a/.config/wlogout/style.css b/.config/wlogout/style.css
new file mode 100644
index 0000000..865c700
--- /dev/null
+++ b/.config/wlogout/style.css
@@ -0,0 +1,76 @@
+* {
+ background-image: none;
+}
+window {
+ background-color: rgba(0, 0, 0, 0.8);
+}
+button {
+ color: #BD93F9;
+ font-family: "Hack";
+
+ border-radius: 0px;
+ border-style: solid;
+ border-width: 1px;
+
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: 25%;
+}
+
+button:focus,
+button:active,
+button:hover {
+ background-color: #BD93F9;
+ outline-style: none;
+}
+
+#lock
+#logout,
+#suspend,
+#hibernate,
+#shutdown,
+#reboot {
+ opacity: 0.6;
+}
+
+#lock {
+ background-image: image(
+ url("/usr/share/wlogout/icons/lock.png"),
+ url("/usr/local/share/wlogout/icons/lock.png")
+ );
+}
+
+#logout {
+ background-image: image(
+ url("/usr/share/wlogout/icons/logout.png"),
+ url("/usr/local/share/wlogout/icons/logout.png")
+ );
+}
+
+#suspend {
+ background-image: image(
+ url("/usr/share/wlogout/icons/suspend.png"),
+ url("/usr/local/share/wlogout/icons/suspend.png")
+ );
+}
+
+#hibernate {
+ background-image: image(
+ url("/usr/share/wlogout/icons/hibernate.png"),
+ url("/usr/local/share/wlogout/icons/hibernate.png")
+ );
+}
+
+#shutdown {
+ background-image: image(
+ url("/usr/share/wlogout/icons/shutdown.png"),
+ url("/usr/local/share/wlogout/icons/shutdown.png")
+ );
+}
+
+#reboot {
+ background-image: image(
+ url("/usr/share/wlogout/icons/reboot.png"),
+ url("/usr/local/share/wlogout/icons/reboot.png")
+ );
+}