1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00

Share the same padding value

This commit is contained in:
RGBCube 2023-12-07 16:03:48 +03:00
parent cb6acb3682
commit 7db3442533
No known key found for this signature in database
9 changed files with 25 additions and 22 deletions

View file

@ -117,6 +117,7 @@
theme = themes.custom (themes.raw.gruvbox-dark-hard // { theme = themes.custom (themes.raw.gruvbox-dark-hard // {
corner-radius = 12; corner-radius = 12;
border-width = 3; border-width = 3;
padding = 10;
font.size.normal = 12; font.size.normal = 12;
font.size.big = 18; font.size.big = 18;

View file

@ -10,9 +10,9 @@ homeConfiguration "nixos" {
dmenu = "fuzzel --dmenu"; dmenu = "fuzzel --dmenu";
corner_radius = corner-radius; corner_radius = corner-radius;
gap_size = 10; gap_size = padding;
horizontal_padding = 10; horizontal_padding = padding;
padding = 10; padding = padding;
frame_color = base0A; frame_color = base0A;
frame_width = border-width; frame_width = border-width;

View file

@ -14,9 +14,9 @@ homeConfiguration "nixos" {
tabs = 4; tabs = 4;
horizontal-pad = 10; horizontal-pad = padding;
vertical-pad = 10; vertical-pad = padding;
inner-pad = 10; inner-pad = padding;
}; };
settings.colors = { settings.colors = {

View file

@ -8,19 +8,19 @@ homeConfiguration "nixos" {
shellIntegration.enable = false; shellIntegration.enable = false;
settings = with theme.font; { settings = with theme; {
font-size = size.normal; font-size = font.size.normal;
font-family = mono.name; font-family = font.mono.name;
window-padding-x = 10; window-padding-x = padding;
window-padding-y = 10; window-padding-y = padding;
confirm-close-surface = false; confirm-close-surface = false;
window-decoration = false; window-decoration = false;
config-file = [ config-file = [
(toString (pkgs.writeText "base16-config" theme.ghosttyConfig)) (toString (pkgs.writeText "base16-config" ghosttyConfig))
]; ];
}; };
}; };

View file

@ -149,8 +149,8 @@
general { general {
max_fps = 60 max_fps = 60
gaps_in = 5 gaps_in = ${toString (padding / 2)}
gaps_out = 10 gaps_out = ${toString padding}
border_size = ${toString border-width} border_size = ${toString border-width}
col.active_border = 0xFF${base0A} col.active_border = 0xFF${base0A}

View file

@ -15,7 +15,7 @@ homeConfiguration "nixos" {
confirm_os_window_close = 0; confirm_os_window_close = 0;
focus_follows_mouse = true; focus_follows_mouse = true;
mouse_hide_wait = 0; mouse_hide_wait = 0;
window_padding_width = 10; window_padding_width = padding;
scrollback_lines = 100000; scrollback_lines = 100000;
scrollback_pager = "bat --chop-long-lines"; scrollback_pager = "bat --chop-long-lines";

View file

@ -1,4 +1,4 @@
{ config, pkgs, ulib, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3 { config, pkgs, ulib, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3
(systemConfiguration { (systemConfiguration {
users.defaultUserShell = pkgs.nushell; users.defaultUserShell = pkgs.nushell;
@ -9,7 +9,7 @@
programs.nushell = enabled { programs.nushell = enabled {
configFile.source = ./configuration.nu; configFile.source = ./configuration.nu;
envFile.source = ./environment.nu; envFile.text = (import ./environment.nu.nix) theme;
environmentVariables = { environmentVariables = {
inherit (config.environment.variables) NIX_LD; inherit (config.environment.variables) NIX_LD;

View file

@ -1,3 +1,4 @@
theme: ''
$env.PROMPT_INDICATOR = ""; $env.PROMPT_INDICATOR = "";
$env.PROMPT_INDICATOR_VI_INSERT = ""; $env.PROMPT_INDICATOR_VI_INSERT = "";
$env.PROMPT_INDICATOR_VI_NORMAL = ""; $env.PROMPT_INDICATOR_VI_NORMAL = "";
@ -20,6 +21,7 @@ def --wrapped hx [...arguments] {
^hx $arguments ^hx $arguments
if ($env.TERM | str contains "kitty") { if ($env.TERM | str contains "kitty") {
kitty @ set-spacing padding=10 kitty @ set-spacing padding=${toString theme.padding}
} }
} }
''

View file

@ -8,9 +8,9 @@ homeConfiguration "nixos" {
layer = "top"; layer = "top";
height = 2 * corner-radius; height = 2 * corner-radius;
margin-right = 10; margin-right = padding;
margin-left = 10; margin-left = padding;
margin-top = 10; margin-top = padding;
modules-left = [ modules-left = [
"hyprland/workspaces" "hyprland/workspaces"
@ -129,7 +129,7 @@ homeConfiguration "nixos" {
} }
.modules-right { .modules-right {
margin-right: 10px; margin-right: ${toString padding}px;
} }