Merge pull request #133 from JaKooLit/development

Development

6 files changed, 258 insertions, 17 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index fb0735d9..7f2d600d 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -49,6 +49,3 @@ exec-once = swayidle -w timeout 900 '$lock'
 
 # xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
 #exec-once = $scriptsDir/PortalHyprland.sh
-
-# wlsunset - for automatic gamma adjustment. Default is 1900 to 0700 (7pm to 7am). Edit Sunset.sh accordingly
-# exec-once = $UserScripts/Sunset.sh
\ No newline at end of file
diff --git a/config/hypr/UserScripts/Sunset.sh b/config/hypr/UserScripts/Sunset.sh
deleted file mode 100755
index 50e386d1..00000000
--- a/config/hypr/UserScripts/Sunset.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-
-# wlsunset project page
-# https://sr.ht/~kennylevinsen/wlsunset/
-
-wlsunset -t 4000 -T 6500 -d 900 -S 07:00 -s 19:00
\ No newline at end of file
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index ee6b512f..682174fc 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -1,9 +1,40 @@
 #!/bin/bash
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# Clipboard Manager. This needed cliphist & wl-copy and of course rofi
+# Clipboard Manager. This script uses cliphist, rofi, and wl-copy.
+
+# Actions:
+# CTRL Del to delete an entry
+# ALT Del to wipe clipboard contents
+
+while true; do
+    result=$(
+        rofi -dmenu \
+            -kb-custom-1 "Control-Delete" \
+            -kb-custom-2 "Alt-Delete" \
+            -config ~/.config/rofi/config-clipboard.rasi < <(cliphist list)
+    )
+
+    case "$?" in
+        1)
+            exit
+            ;;
+        0)
+            case "$result" in
+                "")
+                    continue
+                    ;;
+                *)
+                    cliphist decode <<<"$result" | wl-copy
+                    exit
+                    ;;
+            esac
+            ;;
+        10)
+            cliphist delete <<<"$result"
+            ;;
+        11)
+            cliphist wipe
+            ;;
+    esac
+done
 
-if [[ ! $(pidof rofi) ]]; then
-	cliphist list | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cliphist decode | wl-copy
-else
-	pkill rofi
-fi
diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh
index 77fce82a..711f4c62 100755
--- a/config/hypr/scripts/WaybarCava.sh
+++ b/config/hypr/scripts/WaybarCava.sh
@@ -28,5 +28,8 @@ data_format = ascii
 ascii_max_range = 7
 EOF
 
+# Kill cava if it's already running
+pkill -f "cava -p $config_file"
+
 # Read stdout from cava and perform substitution in a single sed command
 cava -p "$config_file" | sed -u "$dict"
diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi
new file mode 100644
index 00000000..d0c9549d
--- /dev/null
+++ b/config/rofi/config-clipboard.rasi
@@ -0,0 +1,217 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config (long) */
+
+/* ---- Configuration ---- */
+configuration {
+    modi:                       "drun,run";
+    font:                       "Fira Code SemiBold 14";
+    show-icons:                 true;
+    display-drun:               "";
+	display-run:                "";
+    display-filebrowser:        "";
+    display-window:             "";
+	drun-display-format:        "{name}";
+    hover-select:               true;
+    me-select-entry:            "MouseSecondary";
+    me-accept-entry:            "MousePrimary";
+    window-format:              "{w} · {c} · {t}";
+	dpi:						1;
+    
+}
+
+/* ---- Load pywal colors (custom wal template) ---- */
+@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+
+/* ---- Window ---- */
+window {
+    width:						700px;
+	/*height:						500px;*/
+    x-offset:                   0px;
+    y-offset:                   0px;
+    spacing:                    0px;
+    padding:                    2px;
+    margin:                     0px; 
+    border:                     2px;
+    border-color:               @active-background;
+    cursor:                     "default";
+    location:                   center;
+    anchor:                     center;
+    fullscreen:                 false;
+    enabled:                    true;
+    border-radius:              12px;
+    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+ 	
+}
+
+/* ---- Mainbox ---- */
+mainbox {
+    enabled:                    true;
+    orientation:                vertical;
+	padding:					8px;
+    background-color:           transparent;
+    children:                   [ "imagebox" ];
+    border-radius:              12px;
+}
+
+/* ---- Imagebox ---- */
+imagebox {
+    background-color:           transparent;
+    orientation:                vertical;
+    children:                   [ "inputbar", "message", "listbox"];
+}
+
+/* ---- Listbox ---- */
+listbox {
+    spacing:                    4px;
+    orientation:                vertical;
+    children:                   [ "listview", "mode-switcher" ];
+    border-radius:              10px;
+    border:                     1px;
+    border-color:               @active-background;
+	background-color:		    @background;
+}
+
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                    true;
+    text-color:                 @foreground;
+    spacing:                    10px;
+    padding:                    6px;
+    border-radius:              10px;
+    border-color:               @foreground;
+	background-color:		    @background;
+    children:                   [ "textbox-prompt-colon", "entry" ];
+    border:                     1px;
+    border-color:               @active-background;
+}
+
+textbox-prompt-colon {
+    enabled:                    true;
+    expand:                     false;
+    str:                        "🔎 ";
+    text-color:                 inherit;
+	background-color:			transparent;
+}
+
+entry {
+    enabled:                    true;
+    text-color:                 inherit;
+    cursor:                     text;
+    placeholder:                "CTRL Del - Cliphist del || Alt Del - cliphist wipe";
+    placeholder-color:          inherit;
+    background-color:           transparent;
+}
+
+/* ---- Listview ---- */
+listview {
+	enabled:					 true;
+	columns:					 1;
+	lines:						 9;
+	spacing:                     4px;
+	dynamic:                     true;
+	cycle:                       true;
+	scrollbar:                   true;
+	layout:                      vertical;
+	reverse:                     false;
+	fixed-height:                true;
+	fixed-columns:               true;
+	background-color:            transparent;
+	border-radius:             	 10px;
+}
+
+/* ---- Element ---- */
+element {
+    enabled:                    true;
+    padding:                    2px;
+    margin:                     2px;
+    cursor:                     pointer;
+    background-color:           transparent;
+    border-radius:              10px;
+}
+
+element normal.normal {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element normal.urgent {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element normal.active {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element selected.normal {
+    background-color:           @selected-normal-background;
+    text-color:                 @foreground;
+}
+
+element selected.urgent {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element selected.active {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element alternate.normal {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element alternate.urgent {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element alternate.active {
+    background-color:           inherit;
+    text-color:                 @foreground;
+}
+
+element-icon {
+    background-color:           transparent;
+    text-color:                 inherit;
+    size:                       32px;
+    cursor:                     inherit;
+}
+
+element-text {
+    background-color:           transparent;
+    text-color:                 inherit;
+    cursor:                     inherit;
+    vertical-align:             0.5;
+    horizontal-align:           0.0;
+}
+
+/*****----- Message -----*****/
+message {
+    background-color:           transparent;
+    border:						0px;
+    margin:						20px 0px 0px 0px;
+    padding:					0px;
+    spacing:					0px;
+    border-radius: 				10px;
+}
+
+textbox {
+    padding:                    6px;
+    margin:                     0px;
+    border-radius:              0px;
+    background-color:           transparent;
+    text-color:                 @foreground;
+    vertical-align:             0.5;
+    horizontal-align:           0.0;
+}
+
+error-message {
+    padding:                    6px;
+    border-radius:              20px;
+    background-color:           @background;
+    text-color:                 @foreground;
+}
diff --git a/config/wlogout/layout b/config/wlogout/layout
index bbcb6257..c873650e 100644
--- a/config/wlogout/layout
+++ b/config/wlogout/layout
@@ -18,7 +18,7 @@
 }
 {
     "label" : "logout",
-    "action" : "hyprctl dispatch exit",
+    "action" : "loginctl kill-session $XDG_SESSION_ID",
     "text" : "Logout",
     "keybind" : "e"
 }