Merge pull request #446 from JaKooLit/development

Development to main. copy patch
JaKooLit · Sep 17, 2024 · 6799691 · 6799691
2 parents ea5a4b1 + 628b420
commit 6799691
Show file tree

Hide file tree

Showing 42 changed files with 100 additions and 119 deletions.
diff --git a/config/hypr/UserConfigs/UserDecorAnimations.conf b/config/hypr/UserConfigs/UserDecorAnimations.conf
@@ -22,16 +22,17 @@ decoration {
   drop_shadow = true
   shadow_range = 6
   shadow_render_power = 1
+
   col.shadow = $color12
   col.shadow_inactive = 0x50000000
 
   blur {
-  	enabled = true	
-  	size = 6
-  	passes = 2
-  	ignore_opacity = true
-  	new_optimizations = true
-  	special = true
+    enabled = true	
+    size = 6
+    passes = 2
+    ignore_opacity = true
+    new_optimizations = true
+    special = true
   }
 }
 

diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
@@ -49,7 +49,8 @@ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
 windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
 windowrulev2 = float, class:(xdg-desktop-portal-gtk)
 windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
-windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
+windowrulev2 = float, class:(codium|codium-url-handler|VSCodium|code-oss), title:(Add Folder to Workspace)
+windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
 windowrulev2 = float, class:^([Rr]ofi)$
 windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
 windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
@@ -85,7 +86,7 @@ windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
 windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$
 windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
 windowrulev2 = opacity 0.8 0.7, class:^(Alacritty|kitty|kitty-dropterm)$ # Terminals
-windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
+windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler|code-oss)$
 windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
 windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
 windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$

diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
@@ -1,66 +1,53 @@
 #!/bin/bash
-# Rofi menu for Quick Edit / View of Settings (SUPER E)
+# Rofi menu for Quick Edit/View of Settings (SUPER E)
 
-# define your preferred text editor and terminal to use
-editor=${EDITOR:-nano}
+# Define preferred text editor and terminal
+edit=${EDITOR:-nano}
 tty=kitty
 
+# Paths to configuration directories
 configs="$HOME/.config/hypr/configs"
 UserConfigs="$HOME/.config/hypr/UserConfigs"
 
-menu(){
-  printf "1. edit Env-variables\n"
-  printf "2. edit Window-Rules\n"
-  printf "3. edit Startup_Apps\n"
-  printf "4. edit User-Keybinds\n"
-  printf "5. edit Monitors\n"
-  printf "6. edit Laptop-Keybinds\n"
-  printf "7. edit User-Settings\n"
-  printf "8. edit Decorations & Animations\n"
-  printf "9. edit Workspace-Rules\n"
-  printf "10. edit Default-Settings\n"
-  printf "11. edit Default-Keybinds\n"
+# Function to display the menu options
+menu() {
+    cat <<EOF
+1. Edit Env-variables
+2. Edit Window-Rules
+3. Edit Startup_Apps
+4. Edit User-Keybinds
+5. Edit Monitors
+6. Edit Laptop-Keybinds
+7. Edit User-Settings
+8. Edit Decorations & Animations
+9. Edit Workspace-Rules
+10. Edit Default-Settings
+11. Edit Default-Keybinds
+EOF
 }
 
+# Main function to handle menu selection
 main() {
     choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
+
+    # Map choices to corresponding files
     case $choice in
-        1)
-            $tty $editor "$UserConfigs/ENVariables.conf"
-            ;;
-        2)
-            $tty $editor "$UserConfigs/WindowRules.conf"
-            ;;
-        3)
-            $tty $editor "$UserConfigs/Startup_Apps.conf"
-            ;;
-        4)
-            $tty $editor "$UserConfigs/UserKeybinds.conf"
-            ;;
-        5)
-            $tty $editor "$UserConfigs/Monitors.conf"
-            ;;
-        6)
-            $tty $editor "$UserConfigs/Laptops.conf"
-            ;;
-        7)
-            $tty $editor "$UserConfigs/UserSettings.conf"
-            ;;
-        8)
-            $tty $editor "$UserConfigs/UserDecorAnimations.conf"
-            ;;
-        9)
-            $tty $editor "$UserConfigs/WorkspaceRules.conf"
-            ;;            
-		10)
-            $tty $editor "$configs/Settings.conf"
-            ;;
-        11)
-            $tty $editor "$configs/Keybinds.conf"
-            ;;
-        *)
-            ;;
+        1) file="$UserConfigs/ENVariables.conf" ;;
+        2) file="$UserConfigs/WindowRules.conf" ;;
+        3) file="$UserConfigs/Startup_Apps.conf" ;;
+        4) file="$UserConfigs/UserKeybinds.conf" ;;
+        5) file="$UserConfigs/Monitors.conf" ;;
+        6) file="$UserConfigs/Laptops.conf" ;;
+        7) file="$UserConfigs/UserSettings.conf" ;;
+        8) file="$UserConfigs/UserDecorAnimations.conf" ;;
+        9) file="$UserConfigs/WorkspaceRules.conf" ;;
+        10) file="$configs/Settings.conf" ;;
+        11) file="$configs/Keybinds.conf" ;;
+        *) return ;;  # Do nothing for invalid choices
     esac
+
+    # Open the selected file in the terminal with the text editor
+    $tty -e $edit "$file"
 }
 
-main
+main
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
@@ -22,9 +22,9 @@ listview {
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px;
+  padding: 12px 0px 0px 0px;
   spacing: 6px;
-  border-radius: 20px;
+  border-radius: 12px;
 }
 
 element-icon {

diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi
@@ -175,9 +175,13 @@ element normal.active {
 }
 
 element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
+    border:                      0px 5px 0px 5px;
+    border-radius:               16px;
+    border-color:                @selected;
+    background-color:            transparent;
+    text-color:                  @selected;
 }
+
 element selected.urgent {
     background-color:            @urgent;
     text-color:                  @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
 element-icon {
     background-color:            transparent;
     text-color:                  inherit;
-    size:                        36px;
     cursor:                      inherit;
 }
 element-text {

diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
@@ -22,9 +22,9 @@ listview {
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px;
+  padding: 12px 0px 0px 0px;
   spacing: 6px;
-  border-radius: 20px;
+  border-radius: 12px;
 }
 
 element-icon {

diff --git a/config/rofi/resolution/1080p/master-config.rasi b/config/rofi/resolution/1080p/master-config.rasi
@@ -175,9 +175,13 @@ element normal.active {
 }
 
 element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
+    border:                      0px 5px 0px 5px;
+    border-radius:               16px;
+    border-color:                @selected;
+    background-color:            transparent;
+    text-color:                  @selected;
 }
+
 element selected.urgent {
     background-color:            @urgent;
     text-color:                  @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
 element-icon {
     background-color:            transparent;
     text-color:                  inherit;
-    size:                        36px;
     cursor:                      inherit;
 }
 element-text {

diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
@@ -28,9 +28,9 @@ listview {
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px;
+  padding: 12px 0px 0px 0px;
   spacing: 6px;
-  border-radius: 20px;
+  border-radius: 12px;
 }
 
 element-icon {

diff --git a/config/rofi/resolution/1440p/master-config.rasi b/config/rofi/resolution/1440p/master-config.rasi
@@ -175,9 +175,13 @@ element normal.active {
 }
 
 element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
+    border:                      0px 5px 0px 5px;
+    border-radius:               16px;
+    border-color:                @selected;
+    background-color:            transparent;
+    text-color:                  @selected;
 }
+
 element selected.urgent {
     background-color:            @urgent;
     text-color:                  @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
 element-icon {
     background-color:            transparent;
     text-color:                  inherit;
-    size:                        36px;
     cursor:                      inherit;
 }
 element-text {

diff --git a/config/wallust/wallust.toml b/config/wallust/wallust.toml
@@ -7,7 +7,7 @@ backend = "kmeans"
 
 # What color space to use to produce and select the most prominent colors:
 # lab - labmixed - lch - lchmixed
-color_space = "lab"
+color_space = "labmixed"
 
 # NOTE: All filters will fill 16 colors (from color0 to color15), 16 color
 #       variations are the 'ilusion' of more colors by opaquing color1 to color5.

diff --git a/config/waybar/Modules b/config/waybar/Modules
@@ -539,7 +539,7 @@
 "custom/swaync": {
 	"tooltip": true,
 	"tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb",
-	"format": "{} {icon}",
+	"format": "{}{icon}",
 	"format-icons": {
 		"notification": "<span foreground='red'><sup></sup></span>",
 		"none": "",

diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
@@ -158,7 +158,6 @@ tooltip label{
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #pulseaudio.muted {

diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css
@@ -130,7 +130,6 @@ window#waybar.empty #window {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #backlight {

diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css
@@ -149,7 +149,6 @@ window#waybar.empty #window {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #bluetooth,

diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
@@ -269,7 +269,6 @@ label:focus {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #mpd {

diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
@@ -293,7 +293,6 @@ label:focus {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #mpd {

diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -150,7 +150,6 @@ tooltip label{
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #pulseaudio.muted {

diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
@@ -157,7 +157,6 @@ tooltip label{
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #pulseaudio.muted {

diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -246,7 +246,6 @@ tooltip label{
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #bluetooth {

diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
@@ -176,7 +176,6 @@ tooltip {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #battery.critical:not(.charging) {

diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
@@ -138,7 +138,6 @@ color: #F3F4F5;
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #bluetooth {

diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -353,7 +353,6 @@ tooltip {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #clock {

diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
@@ -174,7 +174,6 @@ tooltip {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #taskbar button.active {

diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -179,7 +179,6 @@ tooltip label {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #battery.critical:not(.charging) {

diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css
@@ -170,7 +170,6 @@ tooltip {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #battery.critical:not(.charging) {

diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
@@ -188,7 +188,6 @@ tooltip {
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
 	color: #39FF14;
-	font-size: 100%;
 }
 
 #battery.critical:not(.charging) {