From da1de13cab90e92fddaf302db992a07dd75a912b Mon Sep 17 00:00:00 2001 From: Szymon P Date: Tue, 18 Mar 2025 19:13:35 +0100 Subject: [PATCH] very cool stuff --- private_dot_config/fastfetch/startup.jsonc | 2 - private_dot_config/hypr/hyprland.conf | 3 +- .../hypr/hyprland/binds/audio.conf | 4 +- .../hypr/hyprland/binds/open_apps.conf | 2 +- .../hypr/hyprland/binds/windows.conf | 1 - .../hypr/hyprland/rules/gimp.conf | 2 +- .../hypr/hyprland/workspaces.conf | 6 +-- private_dot_config/mako/gray | 2 +- private_dot_config/mako/red | 2 +- .../private_fish/functions/chezedit.fish | 4 ++ .../private_fish/functions/lazyg.fish | 4 ++ .../private_fish/functions/ls.fish | 4 ++ .../private_fish/functions/y.fish | 8 ++++ private_dot_config/waybar/config.jsonc | 40 +++++++++---------- private_dot_config/waybar/style.css | 3 +- .../bin/executable_change_colors.sh | 7 ++-- .../bin/executable_restart_waybar.sh | 2 +- 17 files changed, 56 insertions(+), 40 deletions(-) create mode 100644 private_dot_config/private_fish/functions/chezedit.fish create mode 100644 private_dot_config/private_fish/functions/lazyg.fish create mode 100644 private_dot_config/private_fish/functions/ls.fish create mode 100644 private_dot_config/private_fish/functions/y.fish diff --git a/private_dot_config/fastfetch/startup.jsonc b/private_dot_config/fastfetch/startup.jsonc index 96189d3..de5bb55 100644 --- a/private_dot_config/fastfetch/startup.jsonc +++ b/private_dot_config/fastfetch/startup.jsonc @@ -2,9 +2,7 @@ "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { "source": "arch_small", - "height": 14, "padding": { - "top": 1, "bottom": 1, } }, diff --git a/private_dot_config/hypr/hyprland.conf b/private_dot_config/hypr/hyprland.conf index daa536c..349d88d 100644 --- a/private_dot_config/hypr/hyprland.conf +++ b/private_dot_config/hypr/hyprland.conf @@ -1,5 +1,3 @@ - - $mainMod = SUPER # Sets "Windows" key as main modifier $terminal = uwsm app -- kitty $menu = uwsm app -- $(wofi --show drun --define=drun-print_desktop_file=true) @@ -32,3 +30,4 @@ source = ./hyprland/decoration.conf source = ./hyprland/animations.conf source = ./hyprland/layouts.conf source = ./hyprland/workspaces.conf +source = ./hyprland/exec.conf diff --git a/private_dot_config/hypr/hyprland/binds/audio.conf b/private_dot_config/hypr/hyprland/binds/audio.conf index de0b2b7..237039c 100644 --- a/private_dot_config/hypr/hyprland/binds/audio.conf +++ b/private_dot_config/hypr/hyprland/binds/audio.conf @@ -1,8 +1,8 @@ # 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 +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 # Requires playerctl bindl = , XF86AudioNext, exec, playerctl next diff --git a/private_dot_config/hypr/hyprland/binds/open_apps.conf b/private_dot_config/hypr/hyprland/binds/open_apps.conf index c865d7b..e400651 100644 --- a/private_dot_config/hypr/hyprland/binds/open_apps.conf +++ b/private_dot_config/hypr/hyprland/binds/open_apps.conf @@ -8,6 +8,6 @@ bind = $mainMod L_SHIFT, P, exec, $menu bind = $mainMod Control_L, 1, exec, uwsm app -- vesktop bind = $mainMod Control_L, 2, exec, uwsm app -- zen-browser bind = $mainMod Control_L, 3, exec, uwsm app -- mangohud steam -bind = $mainMod Control_L, 4, exec, uwsm app -- gimp +bind = $mainMod Control_L, 5, exec, uwsm app -- gimp bind = $mainMod Control_L, 9, exec, uwsm app -- spotify-launcher bind = $mainMod Control_L, 0, exec, uwsm app -- obs diff --git a/private_dot_config/hypr/hyprland/binds/windows.conf b/private_dot_config/hypr/hyprland/binds/windows.conf index 8b5c8ba..9ac5ab9 100644 --- a/private_dot_config/hypr/hyprland/binds/windows.conf +++ b/private_dot_config/hypr/hyprland/binds/windows.conf @@ -73,7 +73,6 @@ bind = $mainMod SHIFT L_ALT, 0, movetoworkspace, 20 bindd = $mainMod, F, Make app fullscreen, fullscreen bindd = $mainMod, T, Toggle floating, togglefloating bindd = $mainMod, P, Toggle pseudo, pseudo -bindd = $mainMod, P, Toggle pseudo, pseudo bindd = $mainMod, S, Toggle split, togglesplit bindd = $mainMod L_SHIFT, Q, Kill active window, killactive diff --git a/private_dot_config/hypr/hyprland/rules/gimp.conf b/private_dot_config/hypr/hyprland/rules/gimp.conf index 4f88a21..d15680e 100644 --- a/private_dot_config/hypr/hyprland/rules/gimp.conf +++ b/private_dot_config/hypr/hyprland/rules/gimp.conf @@ -1 +1 @@ -windowrulev2 = workspace 4, class:^(gimp)-(.*) +windowrulev2 = workspace 5, class:^(Gimp)$ diff --git a/private_dot_config/hypr/hyprland/workspaces.conf b/private_dot_config/hypr/hyprland/workspaces.conf index c61df57..746c6ff 100644 --- a/private_dot_config/hypr/hyprland/workspaces.conf +++ b/private_dot_config/hypr/hyprland/workspaces.conf @@ -1,6 +1,6 @@ -workspace = 1, monitor:HDMI-A-1 +workspace = 1, monitor:HDMI-A-2 workspace = 2, monitor:DP-1 workspace = 3, monitor:DP-1 workspace = 4, monitor:DP-1 -workspace = 9, monitor:HDMI-A-1 -workspace = 10, monitor:HDMI-A-1 +workspace = 9, monitor:HDMI-A-2 +workspace = 10, monitor:HDMI-A-2 diff --git a/private_dot_config/mako/gray b/private_dot_config/mako/gray index 8d3a8eb..4cc6876 100644 --- a/private_dot_config/mako/gray +++ b/private_dot_config/mako/gray @@ -19,7 +19,7 @@ border-radius=15 border-color=#D3D3D3 [urgency=normal] -border-color=#A9A9A9 +border-color=#A9A9A980 [urgency=critical] on-notify=exec paplay /usr/share/sounds/freedesktop/stereo/window-attention.oga diff --git a/private_dot_config/mako/red b/private_dot_config/mako/red index 8e62354..35decc4 100644 --- a/private_dot_config/mako/red +++ b/private_dot_config/mako/red @@ -19,7 +19,7 @@ border-radius=15 border-color=#FF6347 [urgency=normal] -border-color=#A94949 +border-color=#ca242480 [urgency=critical] on-notify=exec paplay /usr/share/sounds/freedesktop/stereo/window-attention.oga diff --git a/private_dot_config/private_fish/functions/chezedit.fish b/private_dot_config/private_fish/functions/chezedit.fish new file mode 100644 index 0000000..709b751 --- /dev/null +++ b/private_dot_config/private_fish/functions/chezedit.fish @@ -0,0 +1,4 @@ +function chezedit --wraps='chezmoi edit --apply' --description 'alias chezedit=chezmoi edit --apply' + chezmoi edit --apply $argv + +end diff --git a/private_dot_config/private_fish/functions/lazyg.fish b/private_dot_config/private_fish/functions/lazyg.fish new file mode 100644 index 0000000..9855bfc --- /dev/null +++ b/private_dot_config/private_fish/functions/lazyg.fish @@ -0,0 +1,4 @@ +function lazyg + git add . + git commit -m "$argv" +end diff --git a/private_dot_config/private_fish/functions/ls.fish b/private_dot_config/private_fish/functions/ls.fish new file mode 100644 index 0000000..647736d --- /dev/null +++ b/private_dot_config/private_fish/functions/ls.fish @@ -0,0 +1,4 @@ +function ls --wraps='eza --long --icons --color' --description 'alias ls=eza --long --icons --color' + eza --long --icons --color $argv + +end diff --git a/private_dot_config/private_fish/functions/y.fish b/private_dot_config/private_fish/functions/y.fish new file mode 100644 index 0000000..3e2af95 --- /dev/null +++ b/private_dot_config/private_fish/functions/y.fish @@ -0,0 +1,8 @@ +function y + set tmp (mktemp -t "yazi-cwd.XXXXXX") + yazi $argv --cwd-file="$tmp" + if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] + builtin cd -- "$cwd" + end + rm -f -- "$tmp" +end diff --git a/private_dot_config/waybar/config.jsonc b/private_dot_config/waybar/config.jsonc index 40a149b..edf313c 100644 --- a/private_dot_config/waybar/config.jsonc +++ b/private_dot_config/waybar/config.jsonc @@ -14,10 +14,11 @@ ], "modules-right": [ "tray", + "group/hardware", "network", "pulseaudio", "privacy", - "group/hardware" + "battery", ], "hyprland/workspaces": { "active-only": true, @@ -41,7 +42,6 @@ "memory", "disk", "cpu", - "battery", ], }, "temperature": { @@ -61,15 +61,13 @@ "battery": { "states": { "good": 95, - "warning": 30, - "critical": 15 + "warning": 20, + "critical": 10 }, - "format": "| {capacity}% {icon} ", - "format-full": "{capacity}% {icon} ", - "format-charging": "{capacity}%  ", - "format-plugged": "{capacity}%  ", - "format-alt": "{time} {icon}", - "format-good": "", // An empty format will hide the module + "format": "|{capacity}% {icon}|", + "format-charging": "|{capacity}% |", + "format-plugged": "|{capacity}% |", + "format-alt": "|{time} {icon}|", "format-full": "", "format-icons": [ "", @@ -80,20 +78,20 @@ ] }, "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": "|{essid} ({signalStrength}%)  |", + "format-ethernet": "|{ipaddr}/{cidr}  |", + "tooltip-format": "{ifname} via {gwaddr}  |", + "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-source": " {volume}%  ", + "format": "|{volume}% {icon} {format_source}|", + "format-bluetooth": "|{volume}% {icon} {format_source}|", + "format-bluetooth-muted": "| {icon} {format_source}|", + "format-muted": " | {format_source}|", + "format-source": " {volume}% ", "format-source-muted": "  ", "format-icons": { "headphone": " ", diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css index ebf55af..a28b0db 100644 --- a/private_dot_config/waybar/style.css +++ b/private_dot_config/waybar/style.css @@ -40,7 +40,8 @@ tooltip { #network, #pulseaudio, #battery { - border: 2px solid @foreground; + border-radius: 25px; + margin: 5px; } #tray { diff --git a/private_dot_local/bin/executable_change_colors.sh b/private_dot_local/bin/executable_change_colors.sh index 1f01980..7896d22 100644 --- a/private_dot_local/bin/executable_change_colors.sh +++ b/private_dot_local/bin/executable_change_colors.sh @@ -15,16 +15,17 @@ gray[background]="rgba(169, 169, 169, 0.20)" gray[foreground]="rgba(169, 169, 169, 0.30)" gray[font-color]="#A9A9A9" +choosen_color=$(echo -e "blue\nred\ngray\n" | wofi --show dmenu --prompt "Choose your theme") -if [[ $1 == "blue" ]]; then +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" -elif [[ $1 == "red" ]]; then +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" -elif [[ $1 == "gray" ]]; then +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" diff --git a/private_dot_local/bin/executable_restart_waybar.sh b/private_dot_local/bin/executable_restart_waybar.sh index 8c49b61..53d84ec 100644 --- a/private_dot_local/bin/executable_restart_waybar.sh +++ b/private_dot_local/bin/executable_restart_waybar.sh @@ -2,4 +2,4 @@ killall -q waybar while pgrep -x waybar >/dev/null; do sleep 1; done -waybar +uwsm app waybar