From 7db34425337ce94fc586bf2596b13c4814753d3d Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 7 Dec 2023 16:03:48 +0300 Subject: [PATCH] Share the same padding value --- flake.nix | 1 + machines/enka/dunst/default.nix | 6 +++--- machines/enka/fuzzel/default.nix | 6 +++--- machines/enka/ghostty/default.nix | 12 ++++++------ machines/enka/hyprland/default.nix | 4 ++-- machines/enka/kitty/default.nix | 2 +- machines/enka/nushell/default.nix | 4 ++-- .../nushell/{environment.nu => environment.nu.nix} | 4 +++- machines/enka/waybar/default.nix | 8 ++++---- 9 files changed, 25 insertions(+), 22 deletions(-) rename machines/enka/nushell/{environment.nu => environment.nu.nix} (88%) diff --git a/flake.nix b/flake.nix index 13942a2..4a0d2c3 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,7 @@ theme = themes.custom (themes.raw.gruvbox-dark-hard // { corner-radius = 12; border-width = 3; + padding = 10; font.size.normal = 12; font.size.big = 18; diff --git a/machines/enka/dunst/default.nix b/machines/enka/dunst/default.nix index e33733f..2633cbe 100644 --- a/machines/enka/dunst/default.nix +++ b/machines/enka/dunst/default.nix @@ -10,9 +10,9 @@ homeConfiguration "nixos" { dmenu = "fuzzel --dmenu"; corner_radius = corner-radius; - gap_size = 10; - horizontal_padding = 10; - padding = 10; + gap_size = padding; + horizontal_padding = padding; + padding = padding; frame_color = base0A; frame_width = border-width; diff --git a/machines/enka/fuzzel/default.nix b/machines/enka/fuzzel/default.nix index 191fe24..95707fb 100644 --- a/machines/enka/fuzzel/default.nix +++ b/machines/enka/fuzzel/default.nix @@ -14,9 +14,9 @@ homeConfiguration "nixos" { tabs = 4; - horizontal-pad = 10; - vertical-pad = 10; - inner-pad = 10; + horizontal-pad = padding; + vertical-pad = padding; + inner-pad = padding; }; settings.colors = { diff --git a/machines/enka/ghostty/default.nix b/machines/enka/ghostty/default.nix index e0ee245..2b2331c 100644 --- a/machines/enka/ghostty/default.nix +++ b/machines/enka/ghostty/default.nix @@ -8,19 +8,19 @@ homeConfiguration "nixos" { shellIntegration.enable = false; - settings = with theme.font; { - font-size = size.normal; - font-family = mono.name; + settings = with theme; { + font-size = font.size.normal; + font-family = font.mono.name; - window-padding-x = 10; - window-padding-y = 10; + window-padding-x = padding; + window-padding-y = padding; confirm-close-surface = false; window-decoration = false; config-file = [ - (toString (pkgs.writeText "base16-config" theme.ghosttyConfig)) + (toString (pkgs.writeText "base16-config" ghosttyConfig)) ]; }; }; diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix index 6898154..c5d2537 100644 --- a/machines/enka/hyprland/default.nix +++ b/machines/enka/hyprland/default.nix @@ -149,8 +149,8 @@ general { max_fps = 60 - gaps_in = 5 - gaps_out = 10 + gaps_in = ${toString (padding / 2)} + gaps_out = ${toString padding} border_size = ${toString border-width} col.active_border = 0xFF${base0A} diff --git a/machines/enka/kitty/default.nix b/machines/enka/kitty/default.nix index 96d8631..0bbe1b3 100644 --- a/machines/enka/kitty/default.nix +++ b/machines/enka/kitty/default.nix @@ -15,7 +15,7 @@ homeConfiguration "nixos" { confirm_os_window_close = 0; focus_follows_mouse = true; mouse_hide_wait = 0; - window_padding_width = 10; + window_padding_width = padding; scrollback_lines = 100000; scrollback_pager = "bat --chop-long-lines"; diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix index 5208bad..0413005 100644 --- a/machines/enka/nushell/default.nix +++ b/machines/enka/nushell/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ulib, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3 +{ config, pkgs, ulib, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3 (systemConfiguration { users.defaultUserShell = pkgs.nushell; @@ -9,7 +9,7 @@ programs.nushell = enabled { configFile.source = ./configuration.nu; - envFile.source = ./environment.nu; + envFile.text = (import ./environment.nu.nix) theme; environmentVariables = { inherit (config.environment.variables) NIX_LD; diff --git a/machines/enka/nushell/environment.nu b/machines/enka/nushell/environment.nu.nix similarity index 88% rename from machines/enka/nushell/environment.nu rename to machines/enka/nushell/environment.nu.nix index 2131b71..a8dc7d3 100644 --- a/machines/enka/nushell/environment.nu +++ b/machines/enka/nushell/environment.nu.nix @@ -1,3 +1,4 @@ +theme: '' $env.PROMPT_INDICATOR = ""; $env.PROMPT_INDICATOR_VI_INSERT = ""; $env.PROMPT_INDICATOR_VI_NORMAL = ""; @@ -20,6 +21,7 @@ def --wrapped hx [...arguments] { ^hx $arguments if ($env.TERM | str contains "kitty") { - kitty @ set-spacing padding=10 + kitty @ set-spacing padding=${toString theme.padding} } } +'' diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix index c6e5e78..0da51c9 100644 --- a/machines/enka/waybar/default.nix +++ b/machines/enka/waybar/default.nix @@ -8,9 +8,9 @@ homeConfiguration "nixos" { layer = "top"; height = 2 * corner-radius; - margin-right = 10; - margin-left = 10; - margin-top = 10; + margin-right = padding; + margin-left = padding; + margin-top = padding; modules-left = [ "hyprland/workspaces" @@ -129,7 +129,7 @@ homeConfiguration "nixos" { } .modules-right { - margin-right: 10px; + margin-right: ${toString padding}px; }