diff --git a/private_dot_config/fastfetch/startup.jsonc b/private_dot_config/fastfetch/startup.jsonc
index de5bb55..58ef028 100644
--- a/private_dot_config/fastfetch/startup.jsonc
+++ b/private_dot_config/fastfetch/startup.jsonc
@@ -1,25 +1,26 @@
{
- "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
- "logo": {
- "source": "arch_small",
- "padding": {
- "bottom": 1,
- }
- },
- "display": {
- "separator" : " ➜ ",
- },
- "modules": [
- "title",
- "kernel",
- "packages",
- "shell",
- "battery",
- {
- "type": "separator",
- "string": " • ",
- },
- "break",
- "break"
- ]
+ "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+ "logo": {
+ "source": "arch_small",
+ "padding": {
+ "bottom": 1,
+ }
+ },
+ "display": {
+ "separator": " ➜ ",
+ },
+ "modules": [
+ "title",
+ "kernel",
+ "packages",
+ "shell",
+ "battery",
+ {
+ "type": "separator",
+ "string": " • ",
+ },
+ "break",
+ "break",
+ "break"
+ ]
}
diff --git a/private_dot_config/hypr/hyprland.conf b/private_dot_config/hypr/hyprland.conf
index 349d88d..417f4c6 100644
--- a/private_dot_config/hypr/hyprland.conf
+++ b/private_dot_config/hypr/hyprland.conf
@@ -31,3 +31,4 @@ source = ./hyprland/animations.conf
source = ./hyprland/layouts.conf
source = ./hyprland/workspaces.conf
source = ./hyprland/exec.conf
+source = ./hyprland/monitors.conf
diff --git a/private_dot_config/hypr/hyprland/animations.conf b/private_dot_config/hypr/hyprland/animations.conf
index 53a93c9..9444a7a 100644
--- a/private_dot_config/hypr/hyprland/animations.conf
+++ b/private_dot_config/hypr/hyprland/animations.conf
@@ -22,7 +22,7 @@ animations {
animation = layersOut, 1, 1.5, linear, fade
animation = fadeLayersIn, 1, 1.79, almostLinear
animation = fadeLayersOut, 1, 1.39, almostLinear
- animation = workspaces, 1, 1.94, almostLinear, fade
- animation = workspacesIn, 1, 1.21, almostLinear, fade
- animation = workspacesOut, 1, 1.94, almostLinear, fade
+ animation = workspaces, 1, 1.94, quick, slide
+ animation = workspacesIn, 1, 1.21, quick, slide
+ animation = workspacesOut, 1, 1.94, quick, slide
}
diff --git a/private_dot_config/hypr/hyprland/binds/audio.conf b/private_dot_config/hypr/hyprland/binds/audio.conf
index 237039c..2968035 100644
--- a/private_dot_config/hypr/hyprland/binds/audio.conf
+++ b/private_dot_config/hypr/hyprland/binds/audio.conf
@@ -1,11 +1,11 @@
# Requires pactl
bindl=, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && ~/.local/bin/wp-vol.sh && paplay /usr/share/sounds/freedesktop/stereo/bell.oga
bindl=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && ~/.local/bin/wp-vol.sh && paplay /usr/share/sounds/freedesktop/stereo/bell.oga
-bindl=, XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindl=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && ~/.local/bin/check-if-muted.sh
+bindl=, XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle
+bindl=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle && ~/.local/bin/check-if-muted.sh
# Requires playerctl
bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , Pause, exec, playerctl play-pause
bindl = , XF86AudioPlay, exec, playerctl play-pause
bindl = , XF86AudioPrev, exec, playerctl previous
diff --git a/private_dot_config/hypr/hyprland/binds/clipboard.conf b/private_dot_config/hypr/hyprland/binds/clipboard.conf
index ce6cdbb..fc8da2c 100644
--- a/private_dot_config/hypr/hyprland/binds/clipboard.conf
+++ b/private_dot_config/hypr/hyprland/binds/clipboard.conf
@@ -1,2 +1,2 @@
-bind = $mainMod, V, exec, cliphist list | wofi --dmenu --conf ~/.config/wofi/clipboard | cliphist decode | wl-copy
+bind = $mainMod, V, exec, cliphist list | wofi --dmenu --conf ~/.config/wofi/clipboard --color ~/.config/wofi/colors --style ~/.config/wofi/style.css | cliphist decode | wl-copy
bind = $mainMod CONTROL_L, V, exec, cliphist wipe && notify-send "Clipboard" "Clipboard cleared!"
diff --git a/private_dot_config/hypr/hyprland/exec.conf b/private_dot_config/hypr/hyprland/exec.conf
index 15ac088..ead6d6e 100644
--- a/private_dot_config/hypr/hyprland/exec.conf
+++ b/private_dot_config/hypr/hyprland/exec.conf
@@ -2,3 +2,4 @@ exec-once = wl-paste --type text --watch cliphist store
exec-once = wl-paste --type image --watch cliphist store
exec-once = uwsm app waybar
+exec-once = uwsm app zen-browser
diff --git a/private_dot_config/hypr/hyprland/general.conf b/private_dot_config/hypr/hyprland/general.conf
index 2a9e556..f3b61ff 100644
--- a/private_dot_config/hypr/hyprland/general.conf
+++ b/private_dot_config/hypr/hyprland/general.conf
@@ -5,7 +5,7 @@ general {
border_size = 2
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
- col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+ col.active_border = rgba(249ECA33) rgba(249ECA4C) 45deg
col.inactive_border = rgba(595959aa)
# Set to true enable resizing windows by clicking and dragging on borders and gaps
diff --git a/private_dot_config/hypr/hyprland/rules/pavucontrol.conf b/private_dot_config/hypr/hyprland/rules/pavucontrol.conf
index 29195c9..200b0d4 100644
--- a/private_dot_config/hypr/hyprland/rules/pavucontrol.conf
+++ b/private_dot_config/hypr/hyprland/rules/pavucontrol.conf
@@ -1,4 +1,5 @@
windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = size 80% 60%, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = stayfocused, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = center, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = pin, class:^(org.pulseaudio.pavucontrol)$
diff --git a/private_dot_config/hypr/hyprland/rules/vesktop.conf b/private_dot_config/hypr/hyprland/rules/vesktop.conf
index 5af54d3..f849113 100644
--- a/private_dot_config/hypr/hyprland/rules/vesktop.conf
+++ b/private_dot_config/hypr/hyprland/rules/vesktop.conf
@@ -3,6 +3,3 @@ windowrulev2 = noinitialfocus, class:^(vesktop)$
windowrulev2 = focusonactivate 0, class:^(vesktop)$
windowrulev2 = renderunfocused, class:^(vesktop)$
windowrulev2 = opacity 0.95, class:^(vesktop)$
-windowrulev2 = fullscreen, class:^(vesktop)$
-
-
diff --git a/private_dot_config/mako/config b/private_dot_config/mako/config
index 0459c64..4cc6876 100644
--- a/private_dot_config/mako/config
+++ b/private_dot_config/mako/config
@@ -11,28 +11,28 @@ height=300
margin=25,25,10,10
padding=10
font="Cousine Nerd Font mono"
-background-color=#249eca80
-text-color=#FFFFFF
+background-color=#A9A9A980
+text-color=#A9A9A9
border-radius=15
[urgency=low]
-border-color=#87CEEB
+border-color=#D3D3D3
[urgency=normal]
-border-color=#00000080
+border-color=#A9A9A980
[urgency=critical]
on-notify=exec paplay /usr/share/sounds/freedesktop/stereo/window-attention.oga
-border-color=#FF0000
+border-color=#808080
[app-name=wp-vol]
height=50
-background-color=#249eca99
-border-color=#249eca99
+background-color=#A9A9A999
+border-color=#A9A9A999
layer=overlay
history=0
anchor=center
-progress-color=source #5588AA33
+progress-color=source #AAAAAA33
text-alignment=center
[mode=do-not-disturb]
diff --git a/private_dot_config/waybar/colors.css b/private_dot_config/waybar/colors.css
index c30cc2f..ae364c1 100644
--- a/private_dot_config/waybar/colors.css
+++ b/private_dot_config/waybar/colors.css
@@ -1,3 +1,3 @@
-@define-color background rgba(36, 158, 202, 0.20);
-@define-color foreground rgba(36, 158, 202, 0.30);
-@define-color font-color #499DA9;
+@define-color background rgba(169, 169, 169, 0.20);
+@define-color foreground rgba(169, 169, 169, 0.30);
+@define-color font-color #A9A9A9;
diff --git a/private_dot_config/waybar/config.jsonc b/private_dot_config/waybar/config.jsonc
index edf313c..9d6b237 100644
--- a/private_dot_config/waybar/config.jsonc
+++ b/private_dot_config/waybar/config.jsonc
@@ -2,10 +2,12 @@
{
"layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right)
- "spacing": 4, // Gaps between modules (4px)
+ "spacing": 5, // Gaps between modules (4px)
+ "output": "DP-1",
// Choose the order of the modules
"modules-left": [
- "hyprland/workspaces",
+ "privacy",
+ "tray",
"custom/spotify",
"custom/media"
],
@@ -13,11 +15,9 @@
"clock",
],
"modules-right": [
- "tray",
"group/hardware",
- "network",
"pulseaudio",
- "privacy",
+ "custom/notifications",
"battery",
],
"hyprland/workspaces": {
@@ -27,6 +27,7 @@
"spacing": 10
},
"clock": {
+ "format": "{:%H:%M}",
"tooltip-format": "{:%Y %B}\n{calendar}",
"format-alt": "{:%Y-%m-%d}"
},
@@ -38,10 +39,12 @@
"transition-left-to-right": true,
},
"modules": [
+ "custom/hardware",
"temperature",
"memory",
"disk",
"cpu",
+ "network",
],
},
"temperature": {
@@ -56,7 +59,7 @@
"tooltip": false,
},
"cpu": {
- "format": "|CPU: {usage}|",
+ "format": "|CPU: {usage}%|",
},
"battery": {
"states": {
@@ -78,35 +81,36 @@
]
},
"network": {
- "format-wifi": "|{essid} ({signalStrength}%) |",
- "format-ethernet": "|{ipaddr}/{cidr} |",
- "tooltip-format": "{ifname} via {gwaddr} |",
- "format-linked": "|{ifname} (No IP) |",
- "format-disconnected": "|Disconnected ⚠|",
- "format-alt": "|{ifname}: {ipaddr}/{cidr}|"
+ "format-wifi": "Wifi: {essid} ({signalStrength}%) ",
+ "format-ethernet": "Ethernet: ",
+ "tooltip-format": "{ifname} via {gwaddr} with {ipaddr}/{cidr} ",
+ "format-linked": "{ifname} (No IP) ",
+ "format-disconnected": "Disconnected ⚠",
+ "format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
- "format": "|{volume}% {icon} {format_source}|",
- "format-bluetooth": "|{volume}% {icon} {format_source}|",
- "format-bluetooth-muted": "| {icon} {format_source}|",
- "format-muted": " | {format_source}|",
+ "format": "{volume}% {icon}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " ",
"format-source": " {volume}% ",
"format-source-muted": " ",
"format-icons": {
- "headphone": " ",
+ "headphone": "",
"hands-free": " ",
"headset": " ",
"phone": " ",
"portable": " ",
"car": " ",
"default": [
- " ",
- " ",
- " "
+ "",
+ "",
+ ""
]
},
- "on-click": "pavucontrol"
+ "on-click": "pavucontrol -t 3",
+ "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
},
"custom/spotify": {
"format": "{}",
@@ -121,17 +125,16 @@
"max-length": 40,
"exec": "$HOME/.config/waybar/scripts/mediaplayer.sh spotify",
},
- "custom/media": {
- "format": "{}",
- "return-type": "json",
- "on-click": "playerctl play-pause --player firefox.instance_1_76",
- "on-click-right": "killall firefox.instance_1_76",
- "on-scroll-up": "playerctl next --player firefox.instance_1_76",
- "on-scroll-down": "playerctl previous --player firefox.instance_1_76",
- "restart-interval": "0",
- "hide-empty-text": true,
- "justify": "center",
- "max-length": 40,
- "exec": "$HOME/.config/waybar/scripts/mediaplayer.sh firefox.instance_1_76",
+ "custom/hardware": {
+ "format": "",
+ },
+ "custom/notifications": {
+ "format": "{text}",
+ "on-click-right": "~/.local/bin/check-do-not-disturb.sh change",
+ "exec": "~/.local/bin/check-do-not-disturb.sh show",
+ "exec-on-event": "~/.local/bin/check-do-not-disturb.sh show",
+ "tooltip": false,
+ "return-type": "text",
+ "signal": 2,
},
}
diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css
index a28b0db..860718f 100644
--- a/private_dot_config/waybar/style.css
+++ b/private_dot_config/waybar/style.css
@@ -1,12 +1,23 @@
@import url("./colors.css");
* {
+ transition: 2s all ease-in-out;
font-family: "Cousine Nerd Font mono";
font-size: 16px;
padding: 2px;
- margin: 1px;
+ margin: 1px 4px 1px 4px;
color: @font-color;
text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray;
+ border-radius: 25px;
+}
+
+*:hover {
+ text-shadow: 1 1 10px black, 1 1 10px black, 1 1 10px black;
+}
+
+window {
+ background-color: black;
+ margin: 1px;
}
window#waybar {
@@ -17,8 +28,15 @@ window#waybar {
/* modules */
#workspaces button {
+ background-color: @background;
+ margin-left: 5px;
+ text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray;
+}
+
+#workspaces button:hover {
background-color: @foreground;
margin-left: 5px;
+ text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray;
}
#workspaces button.urgent {
@@ -28,7 +46,6 @@ window#waybar {
}
#clock {
- border-radius: 25px;
margin: 10px;
}
@@ -36,6 +53,11 @@ tooltip {
background-color: black;
}
+menu {
+ background-color: black;
+ border-radius: 15px;
+}
+
#media,
#network,
#pulseaudio,
@@ -45,12 +67,16 @@ tooltip {
}
#tray {
- background-color: @foreground;
+ background-color: @background;
border-radius: 5px;
padding: 5px;
margin: 5px;
}
+#tray:hover {
+ background-color: @foreground;
+}
+
/* battery */
#battery.warning:not(.charging) {
@@ -91,21 +117,20 @@ tooltip {
color: black;
padding: 10px;
margin: 5px;
- transition: 0.5s all ease-in-out;
+ border-radius: 5px;
}
#custom-spotify:hover {
background-color: rgba(29, 185, 84, 1);
}
-#custom-media {
- background-color: rgba(255, 16, 0, 0.30);
- color: black;
- padding: 10px;
- margin: 5px;
- transition: 0.5s all ease-in-out;
+#custom-notifications {
+ border-radius: 5px;
+ padding: 5px;
+ margin: 5;
}
-#custom-media:hover {
- background-color: rgba(255, 16, 0, 1);
+#custom-hardware {
+ border-radius: 15px;
+ margin: 4px;
}
diff --git a/private_dot_config/wofi/colors b/private_dot_config/wofi/colors
index e69e57e..79be674 100644
--- a/private_dot_config/wofi/colors
+++ b/private_dot_config/wofi/colors
@@ -1,2 +1,2 @@
-#249ECA
-#499DA9
+#A9A9A9
+#A9A9A9
diff --git a/private_dot_config/wofi/style.css b/private_dot_config/wofi/style.css
index 546b1d4..a7e573d 100644
--- a/private_dot_config/wofi/style.css
+++ b/private_dot_config/wofi/style.css
@@ -1,14 +1,14 @@
* {
font-family: "Cousine Nerd Font mono";
- font-size: 18px;
+ font-size: 16px;
padding: 2px;
+ border-radius: 5px;
}
#window {
background-color: black;
border-radius: 20px;
opacity: 15%;
-
}
#outer-box {
@@ -21,7 +21,6 @@
border-radius: 20px 20px 0 0;
border-color: transparent;
color: #499DA9;
- text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray;
}
#scroll {
@@ -43,7 +42,7 @@
#entry {
border-radius: 15px;
- outline: none
+ outline: none;
}
#entry:selected {
diff --git a/private_dot_local/bin/executable_change_colors.sh b/private_dot_local/bin/executable_change_colors.sh
index 7896d22..5f3a5dd 100644
--- a/private_dot_local/bin/executable_change_colors.sh
+++ b/private_dot_local/bin/executable_change_colors.sh
@@ -4,41 +4,55 @@ declare -A blue
blue[background]="rgba(36, 158, 202, 0.20)"
blue[foreground]="rgba(36, 158, 202, 0.30)"
blue[font-color]="#499DA9"
+blue[wallpaper]="~/Obrazy/tapety/niebieski.jpg"
declare -A red
red[background]="rgba(202, 36, 36, 0.20)"
red[foreground]="rgba(202, 36, 36, 0.30)"
red[font-color]="#A94949"
+red[wallpaper]="~/Obrazy/tapety/czerwony.jpg"
declare -A gray
gray[background]="rgba(169, 169, 169, 0.20)"
gray[foreground]="rgba(169, 169, 169, 0.30)"
gray[font-color]="#A9A9A9"
+gray[wallpaper]="~/Obrazy/tapety/szary.jpg"
+
choosen_color=$(echo -e "blue\nred\ngray\n" | wofi --show dmenu --prompt "Choose your theme")
+echo "You choose: $(choosen_color)"
if [[ $choosen_color == "blue" ]]; then
waybar_colors="@define-color background ${blue[background]};\n@define-color foreground ${blue[foreground]};\n@define-color font-color ${blue[font-color]};"
mako_colors="blue"
wofi_colors="#249ECA\n#499DA9"
+ rivalcfg --strip-top-color "#249ECA" --strip-middle-color "#249ECA" --strip-bottom-color "#249ECA" -c "#249ECA"
+ hyprctl hyprpaper reload ,${blue[wallpaper]}
+ echo -e "preload = ${blue[wallpaper]}\nwallpaper = ,${blue[wallpaper]}\nsplash = off\nipc = on" > ~/.config/hypr/hyprpaper.conf
elif [[ $choosen_color == "red" ]]; then
waybar_colors="@define-color background ${red[background]};\n@define-color foreground ${red[foreground]};\n@define-color font-color ${red[font-color]};"
mako_colors="red"
wofi_colors="#CA2424\n#A94949"
+ rivalcfg --strip-top-color "#CA2424" --strip-middle-color "#CA2424" --strip-bottom-color "#CA2424" -c "#CA2424"
+ hyprctl hyprpaper reload ,${red[wallpaper]}
+ echo -e "preload = ${red[wallpaper]}\nwallpaper = ,${red[wallpaper]}\nsplash = off\nipc = on" > ~/.config/hypr/hyprpaper.conf
elif [[ $choosen_color == "gray" ]]; then
waybar_colors="@define-color background ${gray[background]};\n@define-color foreground ${gray[foreground]};\n@define-color font-color ${gray[font-color]};"
mako_colors="gray"
wofi_colors="#A9A9A9\n#A9A9A9"
-else
- echo "Invalid color choice. Please use 'blue', 'red', or 'gray'."
- exit 1
+ rivalcfg --strip-top-color "#A9A9A9" --strip-middle-color "#A9A9A9" --strip-bottom-color "#A9A9A9" -c "#A9A9A9"
+ hyprctl hyprpaper reload ,${gray[wallpaper]}
+ echo -e "preload = ${gray[wallpaper]}\nwallpaper = ,${gray[wallpaper]}\nsplash = off\nipc = on" > ~/.config/hypr/hyprpaper.conf
fi
echo -e "$waybar_colors" > ~/.config/waybar/colors.css
~/.local/bin/restart_waybar.sh &
-killall mako
-mako --config ~/.config/mako/$mako_colors &
+# killall mako
+cat ~/.config/mako/$mako_colors > ~/.config/mako/config
+makoctl reload
+# mako --config ~/.config/mako/$mako_colors &
echo -e $wofi_colors > ~/.config/wofi/colors
+
diff --git a/private_dot_local/bin/executable_system_setup.sh b/private_dot_local/bin/executable_system_setup.sh
index af6c739..d0c715c 100644
--- a/private_dot_local/bin/executable_system_setup.sh
+++ b/private_dot_local/bin/executable_system_setup.sh
@@ -35,7 +35,7 @@ flatpak install --noninteractive net.rpcs3.RPCS3
echo "Services..."
-systemctl --user enable hypridle hyprpolkitagent pipewire-pulse hypridle waybar
+systemctl --user enable hypridle hyprpolkitagent pipewire-pulse hypridle waybar hyprpaper
sudo systemctl enable bluetooth greetd
echo "All done"
diff --git a/private_dot_local/bin/executable_wp-vol.sh b/private_dot_local/bin/executable_wp-vol.sh
index 9ac60ba..3ab9b80 100644
--- a/private_dot_local/bin/executable_wp-vol.sh
+++ b/private_dot_local/bin/executable_wp-vol.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Get the volume level and convert it to a percentage
-volume=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
+volume=$(wpctl get-volume @DEFAULT_SINK@)
volume=$(echo "$volume" | awk '{print $2}')
volume=$(echo "( $volume * 100 ) / 1" | bc)