Flake for my NixOS devices

Less manual scaling, restyle waybar

bwc9876.dev 5558abca 917a5e73

verified
+56 -77
+25 -11
homeModules/gdi.nix
··· 19 cursorTheme = { 20 name = "catppuccin-mocha-dark-cursors"; 21 package = pkgs.catppuccin-cursors.mochaDark; 22 - size = 24; 23 }; 24 in 25 lib.mkIf config.cow.gdi.enable { ··· 107 clipboard.disable-primary = true; 108 109 input = { 110 keyboard.numlock = true; 111 touchpad.natural-scroll = true; 112 }; 113 114 layout = { 115 focus-ring.active.gradient = { 116 - in' = "oklab"; 117 angle = 135; 118 relative-to = "workspace-view"; 119 - from = "#74c7ec"; 120 - to = "#cba6f7"; 121 }; 122 }; 123 ··· 161 "Mod+BracketRight".action = consume-or-expel-window-right; 162 163 "Mod+Comma".action = set-column-width "-100"; 164 "Mod+Period".action = set-column-width "+100"; 165 166 "Mod+F".action = maximize-column; 167 "Mod+Shift+F".action = fullscreen-window; ··· 476 enable = true; 477 settings = { 478 control-center-exclusive-zone = false; 479 - control-center-height = 1000; 480 control-center-margin-bottom = 10; 481 control-center-margin-left = 10; 482 control-center-margin-right = 10; 483 control-center-margin-top = 0; 484 - control-center-width = 800; 485 fit-to-screen = false; 486 hide-on-action = true; 487 hide-on-clear = false; 488 image-visibility = "when-available"; 489 keyboard-shortcuts = true; 490 - notification-body-image-height = 100; 491 - notification-body-image-width = 200; 492 - notification-icon-size = 64; 493 - notification-window-width = 500; 494 positionX = "center"; 495 positionY = "top"; 496 script-fail-notify = true; ··· 691 extraConfig = '' 692 return { 693 font = wezterm.font("monospace"), 694 - font_size = 18.0, 695 color_scheme = "Catppuccin Mocha", 696 enable_tab_bar = false, 697 window_background_opacity = 0.92,
··· 19 cursorTheme = { 20 name = "catppuccin-mocha-dark-cursors"; 21 package = pkgs.catppuccin-cursors.mochaDark; 22 + size = 16; 23 }; 24 in 25 lib.mkIf config.cow.gdi.enable { ··· 107 clipboard.disable-primary = true; 108 109 input = { 110 + focus-follows-mouse = { 111 + enable = true; 112 + max-scroll-amount = "10%"; 113 + }; 114 keyboard.numlock = true; 115 touchpad.natural-scroll = true; 116 }; 117 118 layout = { 119 + # gaps = 4; 120 + struts = let val = -4; in { 121 + top = val; 122 + bottom = val; 123 + left = val; 124 + right = val; 125 + }; 126 + focus-ring.width = 2; 127 focus-ring.active.gradient = { 128 + in' = "oklch longer hue"; 129 angle = 135; 130 relative-to = "workspace-view"; 131 + from = "#0f08"; 132 + to = "#f007"; 133 }; 134 }; 135 ··· 173 "Mod+BracketRight".action = consume-or-expel-window-right; 174 175 "Mod+Comma".action = set-column-width "-100"; 176 + "Mod+Shift+Comma".action = set-column-width "-20"; 177 "Mod+Period".action = set-column-width "+100"; 178 + "Mod+Shift+Period".action = set-column-width "+20"; 179 180 "Mod+F".action = maximize-column; 181 "Mod+Shift+F".action = fullscreen-window; ··· 490 enable = true; 491 settings = { 492 control-center-exclusive-zone = false; 493 + # control-center-height = 1000; 494 control-center-margin-bottom = 10; 495 control-center-margin-left = 10; 496 control-center-margin-right = 10; 497 control-center-margin-top = 0; 498 + # control-center-width = 800; 499 fit-to-screen = false; 500 hide-on-action = true; 501 hide-on-clear = false; 502 image-visibility = "when-available"; 503 keyboard-shortcuts = true; 504 + # notification-body-image-height = 100; 505 + # notification-body-image-width = 200; 506 + notification-icon-size = 32; 507 + # notification-window-width = 500; 508 positionX = "center"; 509 positionY = "top"; 510 script-fail-notify = true; ··· 705 extraConfig = '' 706 return { 707 font = wezterm.font("monospace"), 708 + font_size = 12.0, 709 color_scheme = "Catppuccin Mocha", 710 enable_tab_bar = false, 711 window_background_opacity = 0.92,
+3 -3
homeModules/waybar.nix
··· 232 scroll-step = 5; 233 }; 234 tray = { 235 - icon-size = 25; 236 show-passive-items = true; 237 - spacing = 5; 238 }; 239 user = { 240 format = " {user}"; ··· 300 # modules-center = ["wlr/taskbar"]; 301 modules-left = ["mpris"]; 302 modules-right = [ 303 "temperature" 304 "cpu" 305 - "power-profiles-daemon" 306 "memory" 307 ]; 308 position = "bottom";
··· 232 scroll-step = 5; 233 }; 234 tray = { 235 + # icon-size = 25; 236 show-passive-items = true; 237 + spacing = 2; 238 }; 239 user = { 240 format = " {user}"; ··· 300 # modules-center = ["wlr/taskbar"]; 301 modules-left = ["mpris"]; 302 modules-right = [ 303 + "power-profiles-daemon" 304 "temperature" 305 "cpu" 306 "memory" 307 ]; 308 position = "bottom";
+1 -1
nixosConfigurations/aperture.nix
··· 46 }; 47 48 home-manager.users.bean.programs.niri.settings = { 49 - outputs."eDP-1".scale = 1; 50 }; 51 52 environment.systemPackages = with pkgs; [
··· 46 }; 47 48 home-manager.users.bean.programs.niri.settings = { 49 + outputs."eDP-1".scale = 1.25; 50 }; 51 52 environment.systemPackages = with pkgs; [
+27 -62
res/waybar.css
··· 1 @import "catppuccin.css"; 2 3 * { 4 font-family: monospace; 5 } 6 7 window#waybar { 8 - background: rgba(49, 50, 68, 0.65); 9 color: @text; 10 } 11 12 - .modules-left > * > *, 13 - .modules-right > * > * { 14 background: @crust; 15 border: 2px solid @base; 16 - border-radius: 5rem; 17 - padding: 5px 15px; 18 - margin: 2px 2px; 19 } 20 21 #bluetooth.disabled { ··· 23 } 24 25 #waybar .modules-left > *:first-child > * { 26 - margin-left: 25px; 27 } 28 29 #waybar .modules-right > *:last-child > * { 30 - margin-right: 25px; 31 } 32 33 - #waybar .modules-left, 34 - #waybar .modules-right { 35 - margin-top: 2px; 36 - margin-bottom: 2px; 37 - } 38 - 39 - #waybar .modules-center { 40 - margin-top: 2px; 41 - margin-bottom: 2px; 42 - } 43 44 #battery.warning { 45 border-color: @yellow; ··· 53 border-color: @green; 54 } 55 56 - #taskbar, 57 - #workspaces { 58 - padding: 10px; 59 - border-radius: 5rem; 60 - border: none; 61 - background: none; 62 - } 63 - 64 - #taskbar button, 65 - #workspaces button { 66 - color: @text; 67 - border-radius: 5rem; 68 - padding: 5px 15px; 69 - margin: 0 5px; 70 - background: @crust; 71 - border: 2px solid @base; 72 - } 73 - 74 - #taskbar button:hover, 75 - #workspaces button:hover { 76 - background: @mantle; 77 - } 78 - 79 - #cpu, 80 - #memory, 81 - #temperature { 82 - padding: 10px 25px; 83 - } 84 - 85 #cpu.warning, 86 #memory.warning { 87 border-color: @yellow; ··· 93 border-color: @red; 94 } 95 96 - #workspaces button.active { 97 - border: 2px solid @sapphire; 98 - } 99 - 100 - #taskbar button.active { 101 - border: 2px solid @sapphire; 102 - } 103 - 104 #idle_inhibitor.activated { 105 border-color: @mauve; 106 } ··· 134 135 #privacy-item { 136 border-radius: 5rem; 137 - padding: 5px 15px; 138 - margin: 5px 2px; 139 - border: 2px solid @red; 140 background-color: @crust; 141 } 142 ··· 212 /* Some fixes for icon spacing */ 213 214 #custom-notification { 215 - padding: 0 1em 0 .9em; 216 } 217 218 #idle_inhibitor { 219 - padding: 0 1em 0 .7em; 220 } 221 222 #power-profiles-daemon { 223 - padding: 0 1em 0 .8em; 224 } 225 226 #pulseaudio.muted { 227 - padding: 0 .8em 0 .55em; 228 } 229 230
··· 1 @import "catppuccin.css"; 2 3 * { 4 + font-size: 12pt; 5 font-family: monospace; 6 } 7 8 window#waybar { 9 + background: rgba(49, 50, 68, 0.01); 10 color: @text; 11 } 12 13 + .module { 14 background: @crust; 15 border: 2px solid @base; 16 + border-radius: 10px; 17 + padding: 5px 8px; 18 + margin-left: 1px; 19 + margin-right: 0; 20 + margin-top: 4px; 21 + margin-bottom: 0; 22 } 23 24 #bluetooth.disabled { ··· 26 } 27 28 #waybar .modules-left > *:first-child > * { 29 + margin-left: 10px; 30 } 31 32 #waybar .modules-right > *:last-child > * { 33 + margin-right: 10px; 34 } 35 36 + /* #waybar .modules-left, */ 37 + /* #waybar .modules-right { */ 38 + /* margin-top: 2px; */ 39 + /* margin-bottom: 2px; */ 40 + /* } */ 41 42 #battery.warning { 43 border-color: @yellow; ··· 51 border-color: @green; 52 } 53 54 #cpu.warning, 55 #memory.warning { 56 border-color: @yellow; ··· 62 border-color: @red; 63 } 64 65 #idle_inhibitor.activated { 66 border-color: @mauve; 67 } ··· 95 96 #privacy-item { 97 border-radius: 5rem; 98 + padding: 5px 8px; 99 + margin: 2px 2px; 100 + border: solid 2px @red; 101 background-color: @crust; 102 } 103 ··· 173 /* Some fixes for icon spacing */ 174 175 #custom-notification { 176 + padding-right: 1em; 177 + padding-left: .9em; 178 } 179 180 #idle_inhibitor { 181 + padding-right: 1em; 182 + padding-left: .7em; 183 } 184 185 #power-profiles-daemon { 186 + padding-left: .8em; 187 + padding-right: 1em; 188 } 189 190 #pulseaudio.muted { 191 + padding-right: .8em; 192 + padding-left: .55em; 193 } 194 195