From: Andre Ramnitz <tux.rising@gmail.com>
Date: Mon, 15 Jan 2024 18:53:46 +0000 (+0100)
Subject: hypr: add shutdown script, update config
X-Git-Tag: v0.2~234
X-Git-Url: https://git.ramnitz.eu/?a=commitdiff_plain;h=7f0f0bed5a3af164e04843f3a8a75da29d26a375;p=dotfiles.git

hypr: add shutdown script, update config

waybar: revert to wl-gammarelay-rs
---

diff --git a/config/hypr/scripts/gammarelay-autotemp.py b/config/hypr/scripts/gammarelay-autotemp.py
index c1a0c8a3..d0e4f08f 100755
--- a/config/hypr/scripts/gammarelay-autotemp.py
+++ b/config/hypr/scripts/gammarelay-autotemp.py
@@ -15,7 +15,7 @@ with open('/tmp/autotemp.pid', 'a') as pid_file:
 temp_day = 6500
 temp_night = 3800
 dawn_time = 9 * 3600  # 9am
-dusk_time = 19 * 3600  # 19pm
+dusk_time = 18 * 3600  # 19pm
 
 while True:
     temp = temp_day
diff --git a/config/hypr/scripts/powermenu.sh b/config/hypr/scripts/powermenu.sh
index 8f4367ce..7e3c998d 100755
--- a/config/hypr/scripts/powermenu.sh
+++ b/config/hypr/scripts/powermenu.sh
@@ -9,7 +9,7 @@ case $selected in
     reload)
         waybar_reload.sh &;;
     logout)
-        hyprctl dispatch exit;;
+        "$HOME"/.config/hypr/scripts/shutdown.sh && hyprctl dispatch exit;;
     suspend)
         sync && exec loginctl suspend;;
     reboot)
diff --git a/config/hypr/scripts/shutdown.sh b/config/hypr/scripts/shutdown.sh
new file mode 100755
index 00000000..8c3c5b25
--- /dev/null
+++ b/config/hypr/scripts/shutdown.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+killall polkit-kde-authentication-agent-1 &
+killall mako &
+killall xdg-desktop-portal-hyprland &
+killall xdg-desktop-portal-kde &
+killall xdg-desktop-portal-gtk &
+killall xdg-desktop-portal-gnome &
+killall xdg-desktop-portal-wlr &
+killall xdg-desktop-portal &
+killall wl-gammarelay-rs &
+kill "$(cat /tmp/autotemp.pid)" &
+
diff --git a/config/hypr/scripts/startup.sh b/config/hypr/scripts/startup.sh
index aa80355c..8d5ae178 100755
--- a/config/hypr/scripts/startup.sh
+++ b/config/hypr/scripts/startup.sh
@@ -95,25 +95,25 @@ if [[ ! $(pidof swww-daemon) ]]; then
     swww img ~/Bilder/Wallpapers/default.jpg &
 fi
 
-# if [[ ! $(pidof wl-gammarelay-rs) ]]; then
-#     "$HOME"/.cargo/bin/wl-gammarelay-rs > /dev/null 2>&1 &
-#     logger 'gammarelay started'
-# fi
-# if [[ ! -f "/tmp/autotemp.pid" ]]; then
-#     #kill "$(cat /tmp/autotemp.pid)" && logger "autotemp pid file removed"
-#     "$HOME"/.config/hypr/scripts/gammarelay-autotemp.py > /dev/null 2>&1 &
-# fi
-
-if [[ ! $(pidof wlsunset) ]]; then
-    wlsunset -l 51.5 -L 6.7 > /dev/null 2>&1 &
-    logger 'wlsunset started'
-else
-    logger 'wlsunset already running'
+if [[ ! $(pidof wl-gammarelay-rs) ]]; then
+    "$HOME"/.cargo/bin/wl-gammarelay-rs > /dev/null 2>&1 &
+    logger 'gammarelay started'
 fi
+if [[ ! -f "/tmp/autotemp.pid" ]]; then
+    kill "$(cat /tmp/autotemp.pid)" && logger "gammarelay-autotemp killed"
+    "$HOME"/.config/hypr/scripts/gammarelay-autotemp.py > /dev/null 2>&1 &
+fi
+
+# if [[ ! $(pidof wlsunset) ]]; then
+#     wlsunset -l 51.5 -L 6.7 > /dev/null 2>&1 &
+#     logger 'wlsunset started'
+# else
+#     logger 'wlsunset already running'
+# fi
 
-openrgb -p Greenish.orp &
+openrgb -p default &
 logger 'openrgb theme "simple" loaded'
-kcr create -c main -s default & # kakoune default server
+kks new default & # kakoune default server
 
 if [[ $(pidof swww-daemon) ]]; then
     killall wl-paste
diff --git a/config/waybar/config b/config/waybar/config
index 8a484679..e36ce64f 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -6,8 +6,8 @@
     // "width": 1280, // Waybar width
     "spacing": -8, // Gaps between modules (4px)
     // Choose the order of the modules
-//    "modules-left": ["hyprland/workspaces", "custom/spacer", "custom/gammarelay-temperature", "custom/gammarelay-gamma", "custom/gammarelay-brightness", "mpd"],
-    "modules-left": ["hyprland/workspaces", "custom/spacer", "mpd"],
+    "modules-left": ["hyprland/workspaces", "custom/spacer", "custom/gammarelay-temperature", "custom/gammarelay-gamma", "custom/gammarelay-brightness", "mpd"],
+//    "modules-left": ["hyprland/workspaces", "custom/spacer", "mpd"],
     "modules-center": ["hyprland/window"],
 	"margin": "0",
     "modules-right": ["keyboard-state", "cpu", "memory", "temperature#temp2", "temperature", "pulseaudio", "clock", "tray", "idle_inhibitor", "custom/wallpaper", "custom/powermenu"],
@@ -185,29 +185,29 @@
     "idle_inhibitor": {
         "format": " {icon} ",
         "format-icons": {
-            "activated": "",
-            "deactivated": ""
+        "activated": "",
+        "deactivated": ""
         }
     },
 
 
      "custom/wallpaper": {
-        "format": "  ",
-        "on-click": "$HOME/.local/bin/rndwallpaper swww",
-       "tooltip": false,
-       "interval": "once",
+		"format": "  ",
+		"on-click": "$HOME/.local/bin/rndwallpaper swww",
+		"tooltip": false,
+		"interval": "once",
      },
 
 
-     "custom/powermenu": {
-        "format": " ⏻ ",
-        "on-click-middle": "$HOME/.config/hypr/scripts/powermenu.sh",
-       "tooltip": false,
-       "interval": "once",
-     },
+	"custom/powermenu": {
+		"format": " ⏻ ",
+		"on-click": "$HOME/.config/hypr/scripts/powermenu.sh",
+		"tooltip": false,
+		"interval": "once",
+    },
 
 	"custom/spacer": {
-    	"format": " ",
+		"format": " ",
     	"tooltip": false,
 	},