bar with gaps?

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-04-21 22:20:14 +02:00
parent 907fe34f56
commit 819f0a8079
3 changed files with 32 additions and 31 deletions

View File

@@ -71,6 +71,8 @@
lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; }; lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; };
transparency = 0.9; transparency = 0.9;
rounding = 5; rounding = 5;
gap-size = 10;
border-width = 2;
color = rec { color = rec {
background = "#000000"; background = "#000000";
foreground = "#dddddd"; foreground = "#dddddd";

View File

@@ -2,9 +2,6 @@
let let
animation-speed = "2"; animation-speed = "2";
transparency = builtins.toString rice.transparency; transparency = builtins.toString rice.transparency;
gap-size = 10;
rounding = rice.rounding;
border-width = 3;
monitors = { monitors = {
xps = { xps = {
main = { main = {
@@ -140,11 +137,11 @@ in
}; };
general = { general = {
gaps_in = builtins.div gap-size 2; gaps_in = builtins.div rice.gap-size 2;
gaps_out = gap-size; gaps_out = rice.gap-size;
border_size = border-width; border_size = rice.border-width;
"col.active_border" = "rgba(${rice.lib.nohash rice.color.red}ff) rgba(${rice.lib.nohash rice.color.blue}ff) 90deg"; "col.active_border" = "rgba(${rice.lib.nohash rice.color.red}ff) rgba(${rice.lib.nohash rice.color.blue}ff) 90deg";
"col.inactive_border" = "rgba(${rice.lib.nohash rice.color.black}ff)"; "col.inactive_border" = "rgba(${rice.lib.nohash rice.color.black}ff) rgba(${rice.lib.nohash rice.color.blue}ff) 90deg";
cursor_inactive_timeout = 10; cursor_inactive_timeout = 10;
@@ -154,7 +151,7 @@ in
}; };
decoration = { decoration = {
rounding = rounding; rounding = rice.rounding;
drop_shadow = false; drop_shadow = false;
shadow_range = "20"; shadow_range = "20";
shadow_offset = "0 0"; shadow_offset = "0 0";
@@ -184,7 +181,7 @@ in
# bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o # bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o
# bezier = "myBezier, 0.83, 0, 0.17, 1"; # io # bezier = "myBezier, 0.83, 0, 0.17, 1"; # io
bezier = "myBezier, 0.33, 1, 0.68, 1"; bezier = "myBezier, 0.33, 1, 0.68, 1";
animation = let direction = if host == "NxXPS" then "slide" else "fade"; in [ animation = let direction = if host == "NxXPS" then "slide" else "slidevert"; in [
"windows, 1, ${animation-speed}, myBezier, slide" "windows, 1, ${animation-speed}, myBezier, slide"
"border, 1, ${animation-speed}, myBezier" "border, 1, ${animation-speed}, myBezier"
"fade, 1, ${animation-speed}, myBezier" "fade, 1, ${animation-speed}, myBezier"
@@ -208,7 +205,7 @@ in
dwindle = { dwindle = {
preserve_split = true; # you probably want this preserve_split = true; # you probably want this
no_gaps_when_only = true; no_gaps_when_only = false;
}; };
master = { master = {
@@ -467,7 +464,7 @@ in
# plugin = { # plugin = {
# hyprexpo = { # hyprexpo = {
# columns = 1; # columns = 1;
# gap_size = gap-size; # gap_size = rice.gap-size;
# bg_col = "rgb(ff1111)"; # bg_col = "rgb(ff1111)";
# workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1 # workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1
@@ -777,7 +774,7 @@ in
plugin { plugin {
hyprexpo { hyprexpo {
columns = 5 columns = 5
gap_size = ${builtins.toString gap-size} gap_size = ${builtins.toString rice.gap-size}
bg_col = rgb(${rice.lib.nohash rice.color.background}) bg_col = rgb(${rice.lib.nohash rice.color.background})
workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1 workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1

View File

@@ -58,15 +58,14 @@ in
enable = true; enable = true;
settings = { settings = {
bar = { bar = {
height = 20; height = 30;
layer = "top"; layer = "top";
# position = "top"; # position = "top";
position = "bottom"; position = "bottom";
margin-top = 0; margin-top = 0;
margin-left = 0; margin-left = rice.gap-size;
margin-bottom = 0; margin-bottom = rice.gap-size;
padding-bottom = 0; margin-right = rice.gap-size;
margin-right = 0;
spacing = 10; spacing = 10;
modules-left = [ modules-left = [
"cpu" "cpu"
@@ -168,15 +167,20 @@ in
* { * {
font-family: ${rice.font.code.name2}; font-family: ${rice.font.code.name2};
font-size: 1em; font-size: 1em;
min-height: 0; min-height: 0px;
margin: 0px;
padding: 0px;
} }
window#waybar { window#waybar {
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency}); background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
transition-duration: 0.5s; transition-duration: 0.5s;
padding: 0.1em 1em; padding: 7px 10px;
padding-top: 0.1em; padding-top: 0.1em;
border: None; border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
/* margin: ${builtins.toString rice.gap-size}px; */
border-radius: ${builtins.toString rice.rounding}px;
} }
#clock, #clock,
@@ -196,25 +200,23 @@ in
padding: 0px 3px; padding: 0px 3px;
margin-top: 0.3em; margin-top: 0.3em;
border-radius: ${builtins.toString rice.rounding}px; border-radius: ${builtins.toString rice.rounding}px;
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.foreground}); color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan});
} }
#workspaces button { #workspaces button {
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-black}); color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-black});
padding: 0px 10px; margin-left: 10px;
margin: 1px; margin-right: 10px;
border-radius: ${builtins.toString rice.rounding}px; border-radius: ${builtins.toString rice.rounding}px;
border: None; }
#workspaces button.active {
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan});
} }
#workspaces button:hover { #workspaces button:hover {
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background}); color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background});
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.foreground},${builtins.toString rice.transparency}); background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan},${builtins.toString rice.transparency});
}
#workspaces button.active {
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.foreground});
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
} }
#workspaces button.urgent { #workspaces button.urgent {