From 08dd62e5edeb166b254862255aadfb3b07c93939 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 25 Apr 2024 10:37:56 -0400 Subject: [PATCH] clean up styles --- configs/hypr/hyprland.conf | 9 ++-- configs/waybar/config.jsonc | 83 +++++++++++++++++++++++------------ configs/waybar/macchiato.css | 26 ----------- configs/waybar/mocha.css | 26 ----------- configs/waybar/style.css | 62 +++++++++++++------------- modules/optional/hyprland.nix | 5 +++ 6 files changed, 94 insertions(+), 117 deletions(-) delete mode 100644 configs/waybar/macchiato.css delete mode 100644 configs/waybar/mocha.css diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index d8ec2fd..9ec4b16 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -15,8 +15,7 @@ windowrulev2 = float,class:(nm-connection-editor) windowrulev2 = float,class:(pavucontrol) windowrulev2 = size 40%,40%,class:(pavucontrol) windowrulev2 = center,class:(pavucontrol) -windowrulev2 = fullscreen,class:(Code) -windowrulev2 = fakefullscreen,class:(firefox) +windowrulev2 = fakefullscreen,class:(Code) windowrulev2 = fakefullscreen, class:^(code-url-handler)$ # Some default env vars. @@ -93,14 +92,12 @@ xwayland { $mainMod = SUPER -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, F, exec, firefox +# My Binds bind = $mainMod, T, exec, kitty bind = $mainMod, F4, killactive, -bind = $mainMod, E, exec, nautilus - bind = $mainMod, V, togglefloating, bind = $mainMod, space, exec, rofi -show drun +bind = $mainMod, s, exec, grim -g "$(slurp)" - | swappy -f - # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index d59aaef..efd5169 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -1,16 +1,17 @@ { - "layer": "top", + "layer": "bottom", + "position": "top", + "name": "waybar", + "width": "50px", "modules-left": [ "hyprland/workspaces" ], "modules-center": [ - "clock" + "group/hardware" ], "modules-right": [ - "backlight", - "pulseaudio", - "bluetooth", - "network", + // "backlight", + // "pulseaudio", "battery" ], "hyprland/workspaces": { @@ -60,13 +61,6 @@ "scroll-step": 1, "on-click": "pavucontrol" }, - "bluetooth": { - "format": " {status}", - "format-disabled": "", // an empty format will hide the module - "format-connected": " {num_connections}", - "tooltip-format": "{device_enumerate}", - "tooltip-format-enumerate-connected": "{device_alias} {device_address}" - }, "network": { "format": "{ifname}", "format-wifi": "{essid}", @@ -76,20 +70,53 @@ "on-click": "nm-connection-editor" }, "battery": { - "format": "{icon} {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "format-charging": " {capacity}%", - "tooltip": false, + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}%|{power}w {icon}", + "format-icons": ["", "", "", "", ""], + "design-capacity": true }, + "custom/quit": { + "format": "󰗼", + "tooltip": false, + "on-click": "hyprctl dispatch exit" + }, + "group/hardware": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": false + }, + "modules": [ + "clock", + "bluetooth", + "cpu", + "memory", + "network", + "temperature" + ] + }, + "cpu": { + "interval": 1, + "format": "{icon}cpu", + "format-icons": [ + "▁", // green + "▂", // blue + "▃", // white + "▄", // white + "▅", // yellow + "▆", // yellow + "▇", // orange + "█" // red + ] + }, + "memory": { + "interval": 30, + "format": "{used:0.1f}G/{total:0.1f}G" + }, + "temperature": { + "format": "{temperatureC}°C " + } } \ No newline at end of file diff --git a/configs/waybar/macchiato.css b/configs/waybar/macchiato.css deleted file mode 100644 index 0b9c43c..0000000 --- a/configs/waybar/macchiato.css +++ /dev/null @@ -1,26 +0,0 @@ -@define-color rosewater #f4dbd6; -@define-color flamingo #f0c6c6; -@define-color pink #f5bde6; -@define-color mauve #c6a0f6; -@define-color red #ed8796; -@define-color maroon #ee99a0; -@define-color peach #f5a97f; -@define-color yellow #eed49f; -@define-color green #a6da95; -@define-color teal #8bd5ca; -@define-color sky #91d7e3; -@define-color sapphire #7dc4e4; -@define-color blue #8aadf4; -@define-color lavender #b7bdf8; -@define-color text #cad3f5; -@define-color subtext1 #b8c0e0; -@define-color subtext0 #a5adcb; -@define-color overlay2 #939ab7; -@define-color overlay1 #8087a2; -@define-color overlay0 #6e738d; -@define-color surface2 #5b6078; -@define-color surface1 #494d64; -@define-color surface0 #363a4f; -@define-color base #24273a; -@define-color mantle #1e2030; -@define-color crust #181926; diff --git a/configs/waybar/mocha.css b/configs/waybar/mocha.css deleted file mode 100644 index 75cfb9d..0000000 --- a/configs/waybar/mocha.css +++ /dev/null @@ -1,26 +0,0 @@ -@define-color rosewater #f5e0dc; -@define-color flamingo #f2cdcd; -@define-color pink #f5c2e7; -@define-color mauve #cba6f7; -@define-color red #f38ba8; -@define-color maroon #eba0ac; -@define-color peach #fab387; -@define-color yellow #f9e2af; -@define-color green #a6e3a1; -@define-color teal #94e2d5; -@define-color sky #89dceb; -@define-color sapphire #74c7ec; -@define-color blue #89b4fa; -@define-color lavender #b4befe; -@define-color text #cdd6f4; -@define-color subtext1 #bac2de; -@define-color subtext0 #a6adc8; -@define-color overlay2 #9399b2; -@define-color overlay1 #7f849c; -@define-color overlay0 #6c7086; -@define-color surface2 #585b70; -@define-color surface1 #45475a; -@define-color surface0 #313244; -@define-color base #1e1e2e; -@define-color mantle #181825; -@define-color crust #11111b; diff --git a/configs/waybar/style.css b/configs/waybar/style.css index d874697..6e90e44 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,60 +1,60 @@ + * { border: none; font-family: 'Fira Code', 'Symbols Nerd Font Mono'; font-size: 16px; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; - min-height: 45px; + min-height: 25px; } window#waybar { background: transparent; } -#custom-arch, #workspaces { - border-radius: 10px; - background-color: #11111b; - color: #b4befe; - margin-top: 15px; - margin-right: 15px; - padding-top: 1px; - padding-left: 10px; - padding-right: 10px; -} - -#custom-arch { - font-size: 20px; - margin-left: 15px; - color: #b4befe; -} - #workspaces button { - background: #11111b; color: #b4befe; } -#clock, #backlight, #pulseaudio, #bluetooth, #network, #battery{ +window#waybar > box { border-radius: 10px; - background-color: #11111b; - color: #cdd6f4; - margin-top: 15px; - padding-left: 10px; - padding-right: 10px; + margin-top: 5px; + margin-left: 15px; margin-right: 15px; + margin-bottom: 0px; + padding-bottom: 0px; } -#backlight, #bluetooth { + +widget > * { + border-radius: 10px; + /* background-color: #11111b; */ + color: #cdd6f4; + border-left: 1px solid #cdd6f4; + border-right: 1px solid #cdd6f4; + padding-left: 10px; + padding-right: 10px; + margin-left: 10px; +} + + +widget > label:hover { + /* background-color: #cdd6f4; */ + color: #11111b; +} + +/* #backlight, #bluetooth { border-top-right-radius: 0; border-bottom-right-radius: 0; padding-right: 5px; margin-right: 0 -} +} */ -#pulseaudio, #network { +/* #pulseaudio, #network { border-top-left-radius: 0; border-bottom-left-radius: 0; padding-left: 5px; -} - +} */ +/* #clock { margin-right: 0; -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/modules/optional/hyprland.nix b/modules/optional/hyprland.nix index 6d82f52..c1b321c 100644 --- a/modules/optional/hyprland.nix +++ b/modules/optional/hyprland.nix @@ -25,6 +25,10 @@ lxqt.lxqt-policykit xdg-desktop-portal-gtk xdg-desktop-portal-hyprland + # screenshots + grim + swappy + slurp # networking networkmanagerapplet # waybar @@ -33,6 +37,7 @@ wayland-utils wl-clipboard wlroots + cliphist # app launchers rofi-wayland wofi