From eaf8054ef33ef754801eefc55d3eae7389d77948 Mon Sep 17 00:00:00 2001 From: Johannes Hendrik Gerard van der Weide Date: Wed, 21 Feb 2024 14:31:15 +0100 Subject: [PATCH] I am going insane why is there still an infinite recursion --- flake.nix | 4 +++- hertog/home.nix | 4 +++- programs/sway/sway.nix | 1 - programs/sway/waybar.nix | 3 --- programs/sway/wofi.nix | 3 --- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index d2b6b5a..55bae4c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,8 @@ self, nixos-hardware, nixpkgs, - nix-flatpak, + nix-flatpak, + nix-colors, nixvim, home-manager, ... @@ -56,6 +57,7 @@ ]; specialArgs = { inputs = inputs; + inherit nix-colors; inherit system; }; }; diff --git a/hertog/home.nix b/hertog/home.nix index 3e5af90..988de87 100644 --- a/hertog/home.nix +++ b/hertog/home.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, inputs, nix-colors, ... }: { programs.home-manage.enable = true; @@ -13,6 +13,8 @@ ../programs/firefox.nix ../programs/obs.nix ]; + + colorScheme = import ../theming/colorScheme.nix; home = { stateVersion = "23.05"; diff --git a/programs/sway/sway.nix b/programs/sway/sway.nix index c71705d..975c5a5 100644 --- a/programs/sway/sway.nix +++ b/programs/sway/sway.nix @@ -1,6 +1,5 @@ { pkgs, config }: let - config.colorScheme = import ../../theming/colorScheme.nix; modifierKey = config.wayland.windowManager.sway.config.modifier; in { diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix index 00c4651..083dbcb 100644 --- a/programs/sway/waybar.nix +++ b/programs/sway/waybar.nix @@ -1,7 +1,4 @@ { config }: -let - config.colorScheme = import ../../theming/colorScheme.nix; -in { programs.waybar = { enable = true; diff --git a/programs/sway/wofi.nix b/programs/sway/wofi.nix index 529aa60..235858a 100644 --- a/programs/sway/wofi.nix +++ b/programs/sway/wofi.nix @@ -1,7 +1,4 @@ { config }: -let - config.colorScheme = import ../../theming/colorScheme.nix; -in { programs.wofi = { enable = true;