From f89702dbbb15fab101f83b8fd8aca2b67b2dc86b Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Mon, 21 Aug 2023 10:46:13 +0200 Subject: [PATCH] Updates --- .bashrc | 3 ++ hypr/hyprland.conf | 21 ++++----- waybar/colors-waybar.css | 38 ++++++++-------- waybar/config | 26 ++++++++--- waybar/style.css | 94 ++++++++++++++++++++-------------------- 5 files changed, 97 insertions(+), 85 deletions(-) diff --git a/.bashrc b/.bashrc index 335f7b4..fc4766f 100644 --- a/.bashrc +++ b/.bashrc @@ -81,6 +81,9 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."' # ----------------------------------------------------- alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120' alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120' +alias r1='hyprctl keyword monitor ,preferred,auto,1' +alias r2='hyprctl keyword monitor ,1920x1080,auto,1' + export PATH="/usr/lib/ccache/bin/:$PATH" diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 077bc11..3d3dd35 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -12,7 +12,7 @@ # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -monitor=,preferred,auto,auto +monitor=,preferred,auto,1 # ----------------------------------------------------- # Autostart @@ -57,10 +57,10 @@ general { gaps_out = 20 border_size = 3 # Single Color for active window - col.active_border = $color11 + col.active_border = rgba(ffffffee) # Color Gradient for active window # col.active_border = $color11 $background $background $color14 45deg - col.inactive_border = rgba(ffffffee) + col.inactive_border = $color11 layout = dwindle } @@ -73,15 +73,17 @@ decoration { enabled = true size = 3 passes = 1 + new_optimizations = on + blurls = waybar } active_opacity = 1.0 inactive_opacity = 0.9 fullscreen_opacity = 1.0 drop_shadow = true - shadow_range = 4 + shadow_range = 30 shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + col.shadow = 0x66000000 } # ----------------------------------------------------- @@ -102,23 +104,18 @@ animations { # Layouts # ----------------------------------------------------- dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # you probably want this + pseudotile = true + preserve_split = true } master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = true } gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = false } -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more device:epic-mouse-v1 { sensitivity = -0.5 } diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css index 93c51d1..67d7b72 100644 --- a/waybar/colors-waybar.css +++ b/waybar/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #c2c3c4; -@define-color background #0d0f16; -@define-color cursor #c2c3c4; +@define-color foreground #bfc2c2; +@define-color background #000b0d; +@define-color cursor #bfc2c2; -@define-color color0 #0d0f16; -@define-color color1 #9B93B3; -@define-color color2 #D1939D; -@define-color color3 #99A3CF; -@define-color color4 #ADB2D5; -@define-color color5 #C7B9D2; -@define-color color6 #B2C2DE; -@define-color color7 #c2c3c4; -@define-color color8 #494b50; -@define-color color9 #9B93B3; -@define-color color10 #D1939D; -@define-color color11 #99A3CF; -@define-color color12 #ADB2D5; -@define-color color13 #C7B9D2; -@define-color color14 #B2C2DE; -@define-color color15 #c2c3c4; +@define-color color0 #000b0d; +@define-color color1 #21ACC5; +@define-color color2 #63B7C6; +@define-color color3 #7AC2CD; +@define-color color4 #8BBAC9; +@define-color color5 #90C8D1; +@define-color color6 #AED3D8; +@define-color color7 #bfc2c2; +@define-color color8 #3f4849; +@define-color color9 #21ACC5; +@define-color color10 #63B7C6; +@define-color color11 #7AC2CD; +@define-color color12 #8BBAC9; +@define-color color13 #90C8D1; +@define-color color14 #AED3D8; +@define-color color15 #bfc2c2; diff --git a/waybar/config b/waybar/config index 594b4fe..894f6f9 100644 --- a/waybar/config +++ b/waybar/config @@ -2,21 +2,24 @@ "layer": "top", // Waybar at top layer "height": 30, // Waybar height (to be removed for auto height) "spacing": 4, // Gaps between modules (4px) + "margin-top": 0, + "margin-left": 0, + "margin-right": 0, "modules-left": [ "custom/appmenu", - "wlr/workspaces", - "custom/brave", + // "custom/brave", "custom/outlook", "custom/teams", - "custom/calculator", + // "custom/calculator", "custom/chatgpt", "custom/lookingglass" + // "hyprland/window" ], "modules-center": [ - "hyprland/window" + "wlr/workspaces", ], "modules-right": [ - "hyprland/language", + // "hyprland/language", "keyboard-state", "pulseaudio", "cpu", @@ -27,7 +30,16 @@ "tray" ], "wlr/workspaces" : { - "on-click": "activate" + "on-click": "activate", + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "urgent": "", + "active": "", + "default": "", + "sort-by-number": true + } }, "custom/outlook": { "format": "", @@ -54,7 +66,7 @@ "on-click": "~/dotfiles/scripts/looking-glass.sh" }, "custom/appmenu": { - "format": "", + "format": " ", "on-click": "~/dotfiles/scripts/applauncher.sh" }, "custom/exit": { diff --git a/waybar/style.css b/waybar/style.css index 7fe56a3..08881c3 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -3,59 +3,51 @@ * { font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; - border-radius: 4px; + border-radius: 20px; } window#waybar { - background-color: rgba(0,0,0,0.3); + background-color: rgba(0,0,0,0.8); /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ color: #FFFFFF; + background: transparent; transition-property: background-color; transition-duration: .5s; - border-radius: 0; -} - -window#waybar.hidden { - opacity: 0.2; -} - -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; + border-radius: 20; } +/* button { - /* box-shadow: inset 0 -3px transparent; */ + box-shadow: inset 0 -3px transparent; border: none; border-radius: 0; } - -button:hover { - background: inherit; - box-shadow: inset 0 0px @foreground; -} +*/ #workspaces button { - padding: 0 10px; - color: #ffffff; -} - -#workspaces button:hover { - background-color: @foreground; - color: @background; + padding: 0px 10px; + border-radius: 10px; + color: #FFFFFF; + /* font-weight:bold; */ + border:0; } #workspaces button.active { - background-color: @color11; color: #FFFFFF; + border-radius: 15px; + font-weight:bold; + border:0; } +#workspaces button:hover { + color: #FFFFFF; + border-radius: 15px; + border:0; +} #workspaces button.focused { - background-color: @foreground; + color: #FFFFFF; + border-radius: 15px; + font-weight:bold; } #workspaces button.urgent { @@ -82,19 +74,21 @@ button:hover { #mode, #idle_inhibitor, #scratchpad, +#language, #mpd { - margin: 6px 6px; - padding: 0 10px; + margin: 6px 10px 6px 0px; + padding: 0 0px; color: #ffffff; + font-size:14; } #window, #workspaces { - margin: 0 10px 0 6px; + margin: 5 10px 5 10px; + background-color:@color11; + opacity:0.8; } - - .modules-left > widget:first-child > #workspaces { margin-left: 0; } @@ -104,24 +98,28 @@ button:hover { } #custom-appmenu { - margin-left:10; + margin-left:16; + font-size:18; + font-weight:bold; } -#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator { +#custom-appmenu, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { margin-right:10px; + font-size:16px; } #custom-exit { margin-right: 10px; + font-size:16px; } #clock { - background-color: @color11; + background-color: transparent; + font-size:18; } #battery { - background-color: #ffffff; - color: #000000; + color: @color11; } #battery.charging, #battery.plugged { @@ -151,13 +149,11 @@ label:focus { } #cpu { - background-color: @foreground; - color: #000000; + background-color: transparent; } #memory { - background-color: @foreground; - color:#000000; + background-color: transparent; } #disk { @@ -177,8 +173,7 @@ label:focus { } #pulseaudio { - background-color: @foreground; - color: #000000; + background-color: transparent; } #pulseaudio.muted { @@ -259,6 +254,7 @@ label:focus { } #language { + color:#FFFFFF; /* background: #00b093; color: #740864; @@ -284,6 +280,10 @@ label:focus { background: rgba(0, 0, 0, 0.2); } +#window { + margin:0; +} + #scratchpad { background: rgba(0, 0, 0, 0.2); }