diff --git a/flake.nix b/flake.nix index 8608d69..b917448 100644 --- a/flake.nix +++ b/flake.nix @@ -14,33 +14,23 @@ let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - overlays = { - nixpkgs.overlays = [ - (final: prev: { - stable = import nixpkgs-stable { - system = prev.system; - }; - }) - ]; - }; + pkgs-stable = nixpkgs-stable.legacyPackages.${system}; in { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; - modules = [ - system/configuration.nix - overlays - ]; + specialArgs = { + inherit pkgs-stable; + }; + modules = [ system/configuration.nix ]; }; homeConfigurations.ahnwuoa = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = rec { + inherit pkgs-stable; username = "ahnwuoa"; homeDirectory = "/home/${username}"; }; - modules = [ - user/home.nix - overlays - ]; + modules = [ user/home.nix ]; }; }; } diff --git a/user/home.nix b/user/home.nix index 46b858e..b030290 100644 --- a/user/home.nix +++ b/user/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, username, homeDirectory, ... }: +{ config, pkgs, pkgs-stable, username, homeDirectory, ... }: { imports = [ @@ -12,7 +12,7 @@ home.packages = with pkgs; [ (pkgs.symlinkJoin { name = "firefox"; - paths = [ pkgs.stable.firefox ]; + paths = [ pkgs-stable.firefox ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/firefox \ @@ -30,7 +30,7 @@ picom obs-studio screenkey - pkgs.stable.safeeyes + pkgs-stable.safeeyes libsForQt5.kcalc libsForQt5.kolourpaint libsForQt5.filelight