diff --git a/common/home/default.nix b/common/home/default.nix index ea442da..34dfd65 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -10,11 +10,12 @@ displays ? [ ], # is there any extra specific config necessary (like nvidia on lambdaOS) extraConfig ? { }, + # inputs of this flake + local_inputs, }: { config, pkgs, - inputs, lib, ... }: @@ -75,8 +76,8 @@ in ] # FLURRY AND TSUNAMI :3 (I made these) ++ lib.optionals enableFlut [ - inputs.flurry.packages.${system}.default - inputs.tsunami.packages.${system}.default + local_inputs.flurry.packages.${system}.default + local_inputs.tsunami.packages.${system}.default ] # and ofc the things that are only logical with graphics ++ lib.optionals enableGraphical [ @@ -146,8 +147,9 @@ in # If I have a monitor I want niri with my config, but niri wants it at that spot configFile = lib.mkIf enableGraphical { "niri/config.kdl".source = import ../../packages/niri-config/default.nix { - inherit pkgs inputs displays; - self-pkgs = inputs.self.packages.${pkgs.system}; + inherit pkgs displays; + inputs = local_inputs; + self-pkgs = local_inputs.self.packages.${pkgs.system}; }; }; }; @@ -296,8 +298,8 @@ in let display-shader = pkgs.substituteAll { src = ../../modules/automapaper/display-with_vars.glsl; - background = inputs.nix-colors.lib.conversions.hexToGLSLVec "0a000a"; - foreground = inputs.nix-colors.lib.conversions.hexToGLSLVec "192291"; + background = local_inputs.nix-colors.lib.conversions.hexToGLSLVec "0a000a"; + foreground = local_inputs.nix-colors.lib.conversions.hexToGLSLVec "192291"; }; state-shader = ../../modules/automapaper/state-game_of_life.glsl; init-shader = ../../modules/automapaper/init.glsl; @@ -334,7 +336,7 @@ in Service = { ExecStart = "${ - inputs.automapaper.packages.${pkgs.system}.automapaper + local_inputs.automapaper.packages.${pkgs.system}.automapaper }/bin/automapaper -C ${display_config}/config.toml"; Restart = "on-failure"; RestartSec = 15; diff --git a/flake.nix b/flake.nix index 438a3b9..8de7829 100644 --- a/flake.nix +++ b/flake.nix @@ -154,7 +154,6 @@ let pkgs = nixpkgs.legacyPackages.x86_64-linux; in - (import ./common/home { enableGraphical = true; enableFlut = false; @@ -170,6 +169,7 @@ scale = "1"; } ]; + local_inputs = inputs; extraConfig = { programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: { cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [