diff --git a/home/dots/eww/colors.scss b/home/dots/eww/colors.scss index da38cce..8205870 100644 --- a/home/dots/eww/colors.scss +++ b/home/dots/eww/colors.scss @@ -27,7 +27,7 @@ $bg: #BG; $border: $black_a; $shadow: $black_a; -$base: $bg; -$bg1: $black; +$base: $black; +$bg1: $black_a; $text: $fg; $outline: $black_a; diff --git a/home/dots/hyprland/hyprland.conf b/home/dots/hyprland/hyprland.conf index b409ede..18a7f47 100644 --- a/home/dots/hyprland/hyprland.conf +++ b/home/dots/hyprland/hyprland.conf @@ -23,8 +23,8 @@ input { general { layout=dwindle border_size=#THICK - gaps_in=15 - gaps_out=25 + gaps_in=#GAPSIN + gaps_out=#GAPSOUT resize_on_border=true hover_icon_on_border=true col.active_border=0xff#ACTIVEBORDER @@ -52,7 +52,7 @@ misc { } animations { - enabled=1 + enabled=0 bezier=overshot,0.05,0.9,0.1,1.1 bezier=smooth,0.06,0.94,0.1,1.0 bezier=slosmooth,0.1,0.89,0.14,0.96 diff --git a/home/home.nix b/home/home.nix index c67ef14..3e3a359 100644 --- a/home/home.nix +++ b/home/home.nix @@ -90,6 +90,8 @@ in { "#BORDER" "#THICK" "#ROUND" + "#GAPSIN" + "#GAPSOUT" ] [ "${bg.image}" @@ -100,6 +102,9 @@ in { palette-shex.normal.black (builtins.toString borders.thickness) (builtins.toString borders.rounding) + (builtins.toString borders.gaps_in) + (builtins.toString borders.gaps_out) + ] (builtins.readFile dots/hyprland/hyprland.conf)); }; @@ -371,6 +376,7 @@ in { color13 = bright.magenta; color14 = bright.cyan; color15 = bright.white; + sync_to_monitor = "yes"; }; }; diff --git a/home/programs/eww/eww.scss b/home/programs/eww/eww.scss index f7ff730..d037427 100644 --- a/home/programs/eww/eww.scss +++ b/home/programs/eww/eww.scss @@ -27,17 +27,18 @@ .bar { color: $fg; label { - font-size: 1.2rem; + font-size: 1rem; } } .vis { background-color: $bg; - border-radius: 24px; - padding: 4px 24px; - margin-top: 12px; + border-radius: 0px; + padding: 0px 0px; + margin-top: 0px; margin-bottom: 0px; - border: 3px solid $outline; + border: 0px; + // 3px solid $outline; } .invis { diff --git a/home/programs/eww/eww.yuck b/home/programs/eww/eww.yuck index d1b2654..f12a100 100644 --- a/home/programs/eww/eww.yuck +++ b/home/programs/eww/eww.yuck @@ -39,7 +39,7 @@ (defwidget bar-box [] (centerbox - :class "invis bar" + :class "vis bar" (left) (center) (right))) @@ -48,8 +48,8 @@ :monitor 0 :geometry (geometry :x "0%" :y "0%" - :width "98%" - :height "24px" + :width "100%" + :height "14px" :anchor "top center") :stacking "fg" :exclusive true diff --git a/rice.nix b/rice.nix index fe03ee7..d7d5e8b 100644 --- a/rice.nix +++ b/rice.nix @@ -101,8 +101,10 @@ in rec { borders = { - thickness = 4; - rounding = 10; + thickness = 1; + rounding = 0; + gaps_in = 0; + gaps_out = 0; }; bg = { diff --git a/system/adrift.nix b/system/adrift.nix index 01407a1..3657498 100644 --- a/system/adrift.nix +++ b/system/adrift.nix @@ -9,8 +9,9 @@ ... }: { nix.settings = { - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = ["https://hyprland.cachix.org" "https://nix-community.cachix.org" ]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; + trusted-users = [ "root" "bolt" ] }; imports = [ diff --git a/system/quiver.nix b/system/quiver.nix index f8dc41b..87beb83 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -9,7 +9,7 @@ ... }: { nix.settings = { - substituters = ["https://hyprland.cachix.org"]; + substituters = ["https://hyprland.cachix.org" "https://nix-community.cachix.org" ]; trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; };