From 952824a49aacead0dbc26ab6e1bf61f2b9576c62 Mon Sep 17 00:00:00 2001 From: Trianta <56975502+Trimutex@users.noreply.github.com> Date: Mon, 26 Feb 2024 01:01:35 -0600 Subject: [PATCH] New dotfiles update, spacing and colors mainly --- dunst/dunstrc | 6 +++- dunst/scripts/alert.sh | 2 ++ hypr/hyprland.conf | 15 ++++------ hypr/nvidia.conf | 6 ++-- hypr/theme.conf | 14 ++++----- hypr/windowrules.conf | 65 +++++++----------------------------------- waybar/config | 10 ++++--- waybar/style.css | 40 +++++++++++++------------- 8 files changed, 60 insertions(+), 98 deletions(-) create mode 100755 dunst/scripts/alert.sh diff --git a/dunst/dunstrc b/dunst/dunstrc index 3bc9032..6efccf9 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -4,7 +4,7 @@ ### Display ### # Which monitor should the notifications be displayed on. - monitor = 1 + monitor = 0 # Display notification on focused monitor. Possible modes are: # mouse: follow mouse pointer @@ -463,3 +463,7 @@ frame_color = "#575C5B" icon = "~/.config/dunst/icons/hyprdots.svg" timeout = 10 + +[play_sound] + summary = "*" + script = ~/.config/dunst/scripts/alert.sh diff --git a/dunst/scripts/alert.sh b/dunst/scripts/alert.sh new file mode 100755 index 0000000..f5886ab --- /dev/null +++ b/dunst/scripts/alert.sh @@ -0,0 +1,2 @@ +#!/bin/bash +pw-play --volume=1.1 ~/audio/alert.mp3 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 08f0f57..81cdee6 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -2,13 +2,13 @@ # █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄ # Day -monitor=DP-1, highres, 0x1080, 1, vrr, 1 -monitor=DP-3, highres, 760x0, 1, vrr, 1 -workspace = DP-3, 5 +#monitor=DP-3, highres, 0x1080, 1, vrr, 1 +#monitor=DP-1, highres, 760x0, 1, vrr, 1 +#workspace = DP-1, 5 # Night -#monitor=DP-1, highrr, 0x0, 1, bitdepth, 10, vrr, 1 -#monitor=DP-3, disable +monitor=DP-3, highrr, 0x0, 1, vrr, 1 +monitor=DP-1, disable # █░░ ▄▀█ █░█ █▄░█ █▀▀ █░█ @@ -24,9 +24,6 @@ exec-once = ~/.config/waybar/autobar.sh exec-once = dunst # start notification demon exec-once = swww init exec-once = syncthing --no-browser -#exec-once = xwaylandvideobridge -exec-once = linux-discord-rich-presence -c ~/.config/linux-discord-rich-presencerc - # █▀▀ █▄░█ █░█ @@ -61,7 +58,7 @@ input { # █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀ # █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█ -workspace = DP-1, 1 +workspace = DP-3, 1 dwindle { pseudotile = yes diff --git a/hypr/nvidia.conf b/hypr/nvidia.conf index 4dea797..3a7580d 100644 --- a/hypr/nvidia.conf +++ b/hypr/nvidia.conf @@ -6,10 +6,10 @@ # See https://wiki.hyprland.org/Nvidia/ for more #env = GBM_BACKEND,nvidia-drm +#env = __GLX_VENDOR_LIBRARY_NAME,nvidia env = LIBVA_DRIVER_NAME,nvidia -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = __GL_VRR_ALLOWED,1 +#env = __GL_VRR_ALLOWED,1 env = __GL_GSYNC_ALLOWED,1 env = WLR_NO_HARDWARE_CURSORS,1 -env = WLR_DRM_NO_ATOMIC,1 +#env = WLR_DRM_NO_ATOMIC,1 diff --git a/hypr/theme.conf b/hypr/theme.conf index c34ce8c..4e49678 100644 --- a/hypr/theme.conf +++ b/hypr/theme.conf @@ -24,11 +24,11 @@ layerrule = blur,waybar source = ~/.config/hypr/mocha.conf general { - gaps_in = 3 - gaps_out = 8 - border_size = 3 - col.active_border = 0xff$yellowAlpha 0xff$mauveAlpha 45deg - col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg + gaps_in = 15 + gaps_out = 40 + border_size = 4 + col.active_border = $peach + col.inactive_border = $peach layout = dwindle resize_on_border = false } @@ -41,11 +41,11 @@ group { } decoration { - rounding = 10 + rounding = 0 drop_shadow = false dim_special = 0.3 #active_opacity = 1.0 - #inactive_opacity = 0.9 + #inactive_opacity = 0.8 blur { enabled = yes diff --git a/hypr/windowrules.conf b/hypr/windowrules.conf index 376d72d..d581300 100644 --- a/hypr/windowrules.conf +++ b/hypr/windowrules.conf @@ -3,62 +3,18 @@ # ▀▄▀▄▀ █ █░▀█ █▄▀ █▄█ ▀▄▀▄▀   █▀▄ █▄█ █▄▄ ██▄ ▄█ -# Example windowrule v1 -# windowrule = float, ^(Alacritty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(Alacritty)$,title:^(Alacritty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - -windowrulev2 = opacity 0.90 0.90,class:^(firefox)$ -windowrulev2 = opacity 0.90 0.90,class:^(Brave-browser)$ -windowrulev2 = opacity 0.80 0.80,class:^(Steam)$ -windowrulev2 = opacity 0.80 0.80,class:^(steam)$ -windowrulev2 = opacity 0.80 0.80,class:^(steamwebhelper)$ -windowrulev2 = opacity 0.80 0.80,class:^(Spotify)$ -windowrulev2 = opacity 0.80 0.80,class:^(Code)$ -windowrulev2 = opacity 0.80 0.80,class:^(code-url-handler)$ -windowrulev2 = opacity 0.80 0.80,class:^(Alacritty)$ -windowrulev2 = opacity 0.80 0.80,class:^(org.kde.dolphin)$ -windowrulev2 = opacity 0.80 0.80,class:^(org.kde.ark)$ -windowrulev2 = opacity 0.80 0.80,class:^(nwg-look)$ -windowrulev2 = opacity 0.80 0.80,class:^(qt5ct)$ - -windowrulev2 = opacity 0.90 0.90,class:^(com.github.rafostar.Clapper)$ #Clapper-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(com.github.tchx84.Flatseal)$ #Flatseal-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(hu.kramo.Cartridges)$ #Cartridges-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(com.obsproject.Studio)$ #Obs-Qt -windowrulev2 = opacity 0.80 0.80,class:^(gnome-boxes)$ #Boxes-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(discord)$ #Discord-Electron -windowrulev2 = opacity 0.80 0.80,class:^(WebCord)$ #WebCord-Electron -windowrulev2 = opacity 0.80 0.80,class:^(app.drey.Warp)$ #Warp-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(net.davidotek.pupgui2)$ #ProtonUp-Qt -windowrulev2 = opacity 0.80 0.80,class:^(yad)$ #Protontricks-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(Signal)$ #Signal-Gtk -windowrulev2 = opacity 0.80 0.80,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk - +# Main +windowrulev2 = opacity 0.80 0.80,class:^(.*)$ windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ - -windowrulev2 = float,class:^(qt5ct)$ -windowrulev2 = float,class:^(nwg-look)$ -windowrulev2 = float,class:^(org.kde.ark)$ -windowrulev2 = float,class:^(Signal)$ #Signal-Gtk -windowrulev2 = float,class:^(com.github.rafostar.Clapper)$ #Clapper-Gtk -windowrulev2 = float,class:^(app.drey.Warp)$ #Warp-Gtk -windowrulev2 = float,class:^(net.davidotek.pupgui2)$ #ProtonUp-Qt -windowrulev2 = float,class:^(yad)$ #Protontricks-Gtk -windowrulev2 = float,class:^(eog)$ #Imageviewer-Gtk -windowrulev2 = float,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk -windowrulev2 = float,class:^(pavucontrol)$ -windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$ - -windowrulev2 = tile,class:^(Alacritty.*)$ -windowrulev2 = pseudo,class:^(Alacritty.*)$ -windowrulev2 = pseudo,class:^(firefox.*)$ -windowrulev2 = float, class:^(Steam)$ +windowrulev2 = float, class:^(qt5ct)$ +windowrulev2 = float, class:^(nwg-look)$ +windowrulev2 = float, class:^(pavucontrol)$ +windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = float, class:^(steam)$ # Development +windowrulev2 = float, class:^(Unity)$ windowrulev2 = float, title:^(SnakePlusPlus)$ windowrulev2 = center, title:^(SnakePlusPlus)$ windowrulev2 = opacity 0.6, title:^(SnakePlusPlus)$ @@ -66,12 +22,13 @@ windowrulev2 = float, title:^(TetrisPlusPlus)$ windowrulev2 = center, title:^(TetrisPlusPlus)$ # Games -windowrulev2 = tile, class:^(league.*)$ -windowrulev2 = pseudo, class:^(league.*)$ -windowrulev2 = size 2646 1108, class:^(league.*)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$ windowrulev2 = pseudo, class:^(Minecraft.*)$ windowrulev2 = size 2646 1108, class:^(Minecraft.*)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ windowrulev2 = pseudo, class:^(steam_app_.*)$ windowrulev2 = size 2646 1108, class:^(steam_app_.*)$ +windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ windowrulev2 = pseudo, class:^(steam_proton)$ windowrulev2 = size 2646 1108, class:^(steam_proton)$ + diff --git a/waybar/config b/waybar/config index 877b9b3..f0f003e 100755 --- a/waybar/config +++ b/waybar/config @@ -3,11 +3,14 @@ "name": "main", "layer": "top", "position": "bottom", - "height": 48, - "spacing": 4, - "output": "DP-1", + "height": 38, + "spacing": 0, + "output": "DP-3", + "reload_style_on_change": true, "margin-left": 800, "margin-right": 800, + "margin-top": 20, + "margin-bottom": 10, "modules-left": [ "wireplumber", "disk", @@ -78,7 +81,6 @@ "format-icons": { "default": "", "persistent": "", - "active": "" }, "persistent-workspaces": { "1": [ ], diff --git a/waybar/style.css b/waybar/style.css index b2ef14f..11cb546 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -10,10 +10,10 @@ } window#waybar { - background: alpha(@base, 0.6); - border: 4px solid @sapphire; - border-radius: 8px; - color: @text; + background: @mantle; + border: 4px solid @crust; + border-radius: 0px; + color: @peach; } window#waybar.hidden { @@ -25,31 +25,24 @@ window#waybar.hidden { } #workspaces button { - color: @blue; + color: @peach; background: transparent; transition: all 0.1s ease; } #workspaces button.active { - background-color: @blue; - margin: 4px; - border-radius: 6px; + background-color: alpha(@base, 0.5); + margin-top: 2px; + margin-bottom: 2px; transition: all 0.1s ease; } -.modules-left { - color: @blue; - margin: 2px; - border-radius: 16px; -} -.modules-center { - border-radius: 16px; - margin: 2px; -} +.modules-left, +.modules-center, .modules-right { - color: @blue; - border-radius: 16px; - margin: 2px; + background: alpha(@mantle, 0.6); + margin: 4px; + padding: 0 5px; } #clock, @@ -64,5 +57,12 @@ window#waybar.hidden { #custom-gpu, #custom-poweroff, #custom-weather { + background-color: @base; + border-radius: 6px; + margin-top: 4px; + margin-bottom: 4px; + margin-left: 6px; + margin-right: 6px; padding: 0 10px; + color: @peach; }