From b9c4b2e3b9a49a781260c0951232bde955ea7d40 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Tue, 2 Apr 2024 22:24:45 +0300 Subject: [PATCH] Foot : Use nix color. --- host/work/Foot.nix | 5 +++-- host/work/foot/Foot.ini | 9 --------- module/Sway.nix | 4 ++-- module/foot/Foot.ini | 9 --------- module/foot/Init.nix | 13 +++++++++++++ user/home/Default.nix | 2 +- 6 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 host/work/foot/Foot.ini delete mode 100644 module/foot/Foot.ini create mode 100644 module/foot/Init.nix diff --git a/host/work/Foot.nix b/host/work/Foot.nix index a0d632b..97c84f2 100644 --- a/host/work/Foot.nix +++ b/host/work/Foot.nix @@ -1,3 +1,4 @@ -{ lib, ... }: { - environment.variables.FOOT_CONFIG = lib.mkForce ./foot/Foot.ini; +{ lib, pkgs, color, ... }: { + # Foot fontSize override. + environment.variables.FOOT_CONFIG = lib.mkForce (import ../../module/foot/Init.nix { pkgs = pkgs; fontSize = 12; color = color; }).config; } diff --git a/host/work/foot/Foot.ini b/host/work/foot/Foot.ini deleted file mode 100644 index d5e2b34..0000000 --- a/host/work/foot/Foot.ini +++ /dev/null @@ -1,9 +0,0 @@ -font=Terminess Nerd Font Mono:size=12 -# font-bold=Terminess Nerd Font Mono:size=12:weight=bold -font-italic=Terminess Nerd Font Mono:size=12 -font-bold-italic=Terminess Nerd Font Mono:weight=bold:size=12 -dpi-aware=yes - -[colors] -background=1d2021 -foreground=ebdbb2 diff --git a/module/Sway.nix b/module/Sway.nix index d6dc1d9..79b07bb 100644 --- a/module/Sway.nix +++ b/module/Sway.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, color, ... }: { imports = [ ./desktop/App.nix ./desktop/Bluetooth.nix @@ -33,7 +33,7 @@ environment = { variables = { - FOOT_CONFIG = ./foot/Foot.ini; + FOOT_CONFIG = (import ./foot/Init.nix { pkgs = pkgs; fontSize = 14; color = color; }).config; SWAY_CONFIG = ./sway/module; SWAY_IWT_PATH = "${pkgs.sway-contrib.inactive-windows-transparency}/bin/inactive-windows-transparency.py"; # PATH = [ "/etc/swaybin" ]; # NOTE: Kept as an example on PATH modification. diff --git a/module/foot/Foot.ini b/module/foot/Foot.ini deleted file mode 100644 index f6cc0c9..0000000 --- a/module/foot/Foot.ini +++ /dev/null @@ -1,9 +0,0 @@ -font=Terminess Nerd Font Mono:size=14 -# font-bold=Terminess Nerd Font Mono:size=12:weight=bold -font-italic=Terminess Nerd Font Mono:size=14 -font-bold-italic=Terminess Nerd Font Mono:weight=bold:size=14 -dpi-aware=yes - -[colors] -background=1d2021 -foreground=ebdbb2 diff --git a/module/foot/Init.nix b/module/foot/Init.nix new file mode 100644 index 0000000..f8a2c34 --- /dev/null +++ b/module/foot/Init.nix @@ -0,0 +1,13 @@ +{ pkgs, fontSize, color, ... }: { + config = pkgs.writeText "foot_config" '' + font=Terminess Nerd Font Mono:size=${toString(fontSize)} + # font-bold=Terminess Nerd Font Mono:size=${toString(fontSize)}:weight=bold + font-italic=Terminess Nerd Font Mono:size=${toString(fontSize)} + font-bold-italic=Terminess Nerd Font Mono:weight=bold:size=${toString(fontSize)} + dpi-aware=yes + + [colors] + background=${color.bg} + foreground=${color.fg} + ''; +} diff --git a/user/home/Default.nix b/user/home/Default.nix index 4ce7480..4ec4cef 100644 --- a/user/home/Default.nix +++ b/user/home/Default.nix @@ -1,4 +1,4 @@ -{ const, username, homeDir, ... }: { +{ const, username, homeDir, ... }: { home-manager.backupFileExtension = "old"; home-manager.users.${username} = {