Skip to content

Commit 6799691

Browse files
authored
Merge pull request #446 from JaKooLit/development
Development to main. copy patch
2 parents ea5a4b1 + 628b420 commit 6799691

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+100
-119
lines changed

config/hypr/UserConfigs/UserDecorAnimations.conf

+7-6
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@ decoration {
2222
drop_shadow = true
2323
shadow_range = 6
2424
shadow_render_power = 1
25+
2526
col.shadow = $color12
2627
col.shadow_inactive = 0x50000000
2728

2829
blur {
29-
enabled = true
30-
size = 6
31-
passes = 2
32-
ignore_opacity = true
33-
new_optimizations = true
34-
special = true
30+
enabled = true
31+
size = 6
32+
passes = 2
33+
ignore_opacity = true
34+
new_optimizations = true
35+
special = true
3536
}
3637
}
3738

config/hypr/UserConfigs/WindowRules.conf

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
4949
windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
5050
windowrulev2 = float, class:(xdg-desktop-portal-gtk)
5151
windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
52-
windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
52+
windowrulev2 = float, class:(codium|codium-url-handler|VSCodium|code-oss), title:(Add Folder to Workspace)
53+
windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
5354
windowrulev2 = float, class:^([Rr]ofi)$
5455
windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
5556
windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
@@ -85,7 +86,7 @@ windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
8586
windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$
8687
windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
8788
windowrulev2 = opacity 0.8 0.7, class:^(Alacritty|kitty|kitty-dropterm)$ # Terminals
88-
windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
89+
windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler|code-oss)$
8990
windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
9091
windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
9192
windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$

config/hypr/UserScripts/QuickEdit.sh

+38-51
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,53 @@
11
#!/bin/bash
2-
# Rofi menu for Quick Edit / View of Settings (SUPER E)
2+
# Rofi menu for Quick Edit/View of Settings (SUPER E)
33

4-
# define your preferred text editor and terminal to use
5-
editor=${EDITOR:-nano}
4+
# Define preferred text editor and terminal
5+
edit=${EDITOR:-nano}
66
tty=kitty
77

8+
# Paths to configuration directories
89
configs="$HOME/.config/hypr/configs"
910
UserConfigs="$HOME/.config/hypr/UserConfigs"
1011

11-
menu(){
12-
printf "1. edit Env-variables\n"
13-
printf "2. edit Window-Rules\n"
14-
printf "3. edit Startup_Apps\n"
15-
printf "4. edit User-Keybinds\n"
16-
printf "5. edit Monitors\n"
17-
printf "6. edit Laptop-Keybinds\n"
18-
printf "7. edit User-Settings\n"
19-
printf "8. edit Decorations & Animations\n"
20-
printf "9. edit Workspace-Rules\n"
21-
printf "10. edit Default-Settings\n"
22-
printf "11. edit Default-Keybinds\n"
12+
# Function to display the menu options
13+
menu() {
14+
cat <<EOF
15+
1. Edit Env-variables
16+
2. Edit Window-Rules
17+
3. Edit Startup_Apps
18+
4. Edit User-Keybinds
19+
5. Edit Monitors
20+
6. Edit Laptop-Keybinds
21+
7. Edit User-Settings
22+
8. Edit Decorations & Animations
23+
9. Edit Workspace-Rules
24+
10. Edit Default-Settings
25+
11. Edit Default-Keybinds
26+
EOF
2327
}
2428

29+
# Main function to handle menu selection
2530
main() {
2631
choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
32+
33+
# Map choices to corresponding files
2734
case $choice in
28-
1)
29-
$tty $editor "$UserConfigs/ENVariables.conf"
30-
;;
31-
2)
32-
$tty $editor "$UserConfigs/WindowRules.conf"
33-
;;
34-
3)
35-
$tty $editor "$UserConfigs/Startup_Apps.conf"
36-
;;
37-
4)
38-
$tty $editor "$UserConfigs/UserKeybinds.conf"
39-
;;
40-
5)
41-
$tty $editor "$UserConfigs/Monitors.conf"
42-
;;
43-
6)
44-
$tty $editor "$UserConfigs/Laptops.conf"
45-
;;
46-
7)
47-
$tty $editor "$UserConfigs/UserSettings.conf"
48-
;;
49-
8)
50-
$tty $editor "$UserConfigs/UserDecorAnimations.conf"
51-
;;
52-
9)
53-
$tty $editor "$UserConfigs/WorkspaceRules.conf"
54-
;;
55-
10)
56-
$tty $editor "$configs/Settings.conf"
57-
;;
58-
11)
59-
$tty $editor "$configs/Keybinds.conf"
60-
;;
61-
*)
62-
;;
35+
1) file="$UserConfigs/ENVariables.conf" ;;
36+
2) file="$UserConfigs/WindowRules.conf" ;;
37+
3) file="$UserConfigs/Startup_Apps.conf" ;;
38+
4) file="$UserConfigs/UserKeybinds.conf" ;;
39+
5) file="$UserConfigs/Monitors.conf" ;;
40+
6) file="$UserConfigs/Laptops.conf" ;;
41+
7) file="$UserConfigs/UserSettings.conf" ;;
42+
8) file="$UserConfigs/UserDecorAnimations.conf" ;;
43+
9) file="$UserConfigs/WorkspaceRules.conf" ;;
44+
10) file="$configs/Settings.conf" ;;
45+
11) file="$configs/Keybinds.conf" ;;
46+
*) return ;; # Do nothing for invalid choices
6347
esac
48+
49+
# Open the selected file in the terminal with the text editor
50+
$tty -e $edit "$file"
6451
}
6552

66-
main
53+
main

config/rofi/config.rasi

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ listview {
2222
/* ---- Element ---- */
2323
element {
2424
orientation: vertical;
25-
padding: 12px;
25+
padding: 12px 0px 0px 0px;
2626
spacing: 6px;
27-
border-radius: 20px;
27+
border-radius: 12px;
2828
}
2929

3030
element-icon {

config/rofi/master-config.rasi

+6-3
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,13 @@ element normal.active {
175175
}
176176

177177
element selected.normal {
178-
background-color: @selected;
179-
text-color: @text-selected;
178+
border: 0px 5px 0px 5px;
179+
border-radius: 16px;
180+
border-color: @selected;
181+
background-color: transparent;
182+
text-color: @selected;
180183
}
184+
181185
element selected.urgent {
182186
background-color: @urgent;
183187
text-color: @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
202206
element-icon {
203207
background-color: transparent;
204208
text-color: inherit;
205-
size: 36px;
206209
cursor: inherit;
207210
}
208211
element-text {

config/rofi/resolution/1080p/config.rasi

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ listview {
2222
/* ---- Element ---- */
2323
element {
2424
orientation: vertical;
25-
padding: 12px;
25+
padding: 12px 0px 0px 0px;
2626
spacing: 6px;
27-
border-radius: 20px;
27+
border-radius: 12px;
2828
}
2929

3030
element-icon {

config/rofi/resolution/1080p/master-config.rasi

+6-3
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,13 @@ element normal.active {
175175
}
176176

177177
element selected.normal {
178-
background-color: @selected;
179-
text-color: @text-selected;
178+
border: 0px 5px 0px 5px;
179+
border-radius: 16px;
180+
border-color: @selected;
181+
background-color: transparent;
182+
text-color: @selected;
180183
}
184+
181185
element selected.urgent {
182186
background-color: @urgent;
183187
text-color: @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
202206
element-icon {
203207
background-color: transparent;
204208
text-color: inherit;
205-
size: 36px;
206209
cursor: inherit;
207210
}
208211
element-text {

config/rofi/resolution/1440p/config.rasi

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ listview {
2828
/* ---- Element ---- */
2929
element {
3030
orientation: vertical;
31-
padding: 12px;
31+
padding: 12px 0px 0px 0px;
3232
spacing: 6px;
33-
border-radius: 20px;
33+
border-radius: 12px;
3434
}
3535

3636
element-icon {

config/rofi/resolution/1440p/master-config.rasi

+6-3
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,13 @@ element normal.active {
175175
}
176176

177177
element selected.normal {
178-
background-color: @selected;
179-
text-color: @text-selected;
178+
border: 0px 5px 0px 5px;
179+
border-radius: 16px;
180+
border-color: @selected;
181+
background-color: transparent;
182+
text-color: @selected;
180183
}
184+
181185
element selected.urgent {
182186
background-color: @urgent;
183187
text-color: @text-selected;
@@ -202,7 +206,6 @@ element alternate.active {
202206
element-icon {
203207
background-color: transparent;
204208
text-color: inherit;
205-
size: 36px;
206209
cursor: inherit;
207210
}
208211
element-text {

config/wallust/wallust.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ backend = "kmeans"
77

88
# What color space to use to produce and select the most prominent colors:
99
# lab - labmixed - lch - lchmixed
10-
color_space = "lab"
10+
color_space = "labmixed"
1111

1212
# NOTE: All filters will fill 16 colors (from color0 to color15), 16 color
1313
# variations are the 'ilusion' of more colors by opaquing color1 to color5.

config/waybar/Modules

+1-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@
539539
"custom/swaync": {
540540
"tooltip": true,
541541
"tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb",
542-
"format": "{} {icon}",
542+
"format": "{}{icon}",
543543
"format-icons": {
544544
"notification": "<span foreground='red'><sup></sup></span>",
545545
"none": "",

config/waybar/style/[Black & White] Monochrome.css

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ tooltip label{
158158
#custom-hypridle.notactive,
159159
#idle_inhibitor.activated {
160160
color: #39FF14;
161-
font-size: 100%;
162161
}
163162

164163
#pulseaudio.muted {

config/waybar/style/[Catppuccin] Latte.css

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ window#waybar.empty #window {
130130
#custom-hypridle.notactive,
131131
#idle_inhibitor.activated {
132132
color: #39FF14;
133-
font-size: 100%;
134133
}
135134

136135
#backlight {

config/waybar/style/[Catppuccin] Mocha.css

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ window#waybar.empty #window {
149149
#custom-hypridle.notactive,
150150
#idle_inhibitor.activated {
151151
color: #39FF14;
152-
font-size: 100%;
153152
}
154153

155154
#bluetooth,

config/waybar/style/[Colored] Chroma Glow.css

-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ label:focus {
269269
#custom-hypridle.notactive,
270270
#idle_inhibitor.activated {
271271
color: #39FF14;
272-
font-size: 100%;
273272
}
274273

275274
#mpd {

config/waybar/style/[Colored] Translucent.css

-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ label:focus {
293293
#custom-hypridle.notactive,
294294
#idle_inhibitor.activated {
295295
color: #39FF14;
296-
font-size: 100%;
297296
}
298297

299298
#mpd {

config/waybar/style/[Colorful] Aurora Blossom.css

-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ tooltip label{
150150
#custom-hypridle.notactive,
151151
#idle_inhibitor.activated {
152152
color: #39FF14;
153-
font-size: 100%;
154153
}
155154

156155
#pulseaudio.muted {

config/waybar/style/[Colorful] Aurora.css

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ tooltip label{
157157
#custom-hypridle.notactive,
158158
#idle_inhibitor.activated {
159159
color: #39FF14;
160-
font-size: 100%;
161160
}
162161

163162
#pulseaudio.muted {

config/waybar/style/[Colorful] Rainbow Spectrum.css

-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ tooltip label{
246246
#custom-hypridle.notactive,
247247
#idle_inhibitor.activated {
248248
color: #39FF14;
249-
font-size: 100%;
250249
}
251250

252251
#bluetooth {

config/waybar/style/[Dark] Golden Noir.css

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ tooltip {
176176
#custom-hypridle.notactive,
177177
#idle_inhibitor.activated {
178178
color: #39FF14;
179-
font-size: 100%;
180179
}
181180

182181
#battery.critical:not(.charging) {

config/waybar/style/[Dark] Half-Moon.css

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ color: #F3F4F5;
138138
#custom-hypridle.notactive,
139139
#idle_inhibitor.activated {
140140
color: #39FF14;
141-
font-size: 100%;
142141
}
143142

144143
#bluetooth {

config/waybar/style/[Dark] Latte-Wallust combined.css

-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ tooltip {
353353
#custom-hypridle.notactive,
354354
#idle_inhibitor.activated {
355355
color: #39FF14;
356-
font-size: 100%;
357356
}
358357

359358
#clock {

config/waybar/style/[Dark] Purpl.css

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ tooltip {
174174
#custom-hypridle.notactive,
175175
#idle_inhibitor.activated {
176176
color: #39FF14;
177-
font-size: 100%;
178177
}
179178

180179
#taskbar button.active {

config/waybar/style/[Dark] Wallust Obsidian Edge.css

-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ tooltip label {
179179
#custom-hypridle.notactive,
180180
#idle_inhibitor.activated {
181181
color: #39FF14;
182-
font-size: 100%;
183182
}
184183

185184
#battery.critical:not(.charging) {

config/waybar/style/[Extra] Crimson.css

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ tooltip {
170170
#custom-hypridle.notactive,
171171
#idle_inhibitor.activated {
172172
color: #39FF14;
173-
font-size: 100%;
174173
}
175174

176175
#battery.critical:not(.charging) {

config/waybar/style/[Extra] Mauve.css

-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ tooltip {
188188
#custom-hypridle.notactive,
189189
#idle_inhibitor.activated {
190190
color: #39FF14;
191-
font-size: 100%;
192191
}
193192

194193
#battery.critical:not(.charging) {

0 commit comments

Comments
 (0)