♻️ Replace imports with function argument, hyprpanel does not follow nixpkgs, git push alias
This commit is contained in:
15
flake.nix
15
flake.nix
@ -14,7 +14,6 @@
|
||||
};
|
||||
hyprpanel = {
|
||||
url = "github:Jas-SinghFSU/HyprPanel";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
@ -40,6 +39,7 @@
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
inherit (self) outputs;
|
||||
common = import ./common.nix;
|
||||
theme = import ./theme.nix;
|
||||
in
|
||||
{
|
||||
defaultPackage.${system} = home-manager.defaultPackage.${system};
|
||||
@ -48,6 +48,8 @@
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
just
|
||||
git
|
||||
git-crypt
|
||||
nh
|
||||
];
|
||||
};
|
||||
@ -57,7 +59,14 @@
|
||||
|
||||
nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
|
||||
system = system;
|
||||
specialArgs = { inherit outputs inputs; }; # Pass args to modules
|
||||
specialArgs = {
|
||||
inherit
|
||||
outputs
|
||||
inputs
|
||||
common
|
||||
theme
|
||||
;
|
||||
}; # Pass args to modules
|
||||
modules = [
|
||||
./configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
@ -68,7 +77,7 @@
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
# Passes inputs as an argument to home-manager
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
extraSpecialArgs = { inherit inputs common theme; };
|
||||
users.${common.username} = import ./home-manager;
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user