fix unified config
This commit is contained in:
parent
635b3d4271
commit
8b95e6e0a0
38
flake.nix
38
flake.nix
@ -66,21 +66,21 @@
|
||||
"yarn"
|
||||
];
|
||||
|
||||
inputs.nixpkgs =
|
||||
(import nixpkgs {
|
||||
}).applyPatches
|
||||
{
|
||||
name = "nixpkgs";
|
||||
src = inputs.nixpkgs;
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/pull/67576
|
||||
# gimp 3.0
|
||||
(builtins.fetchurl {
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
|
||||
sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia";
|
||||
})
|
||||
];
|
||||
};
|
||||
# pkgs =
|
||||
# (import nixpkgs {
|
||||
# }).applyPatches
|
||||
# {
|
||||
# name = "nixpkgs";
|
||||
# src = inputs.nixpkgs;
|
||||
# patches = [
|
||||
# # https://github.com/NixOS/nixpkgs/pull/67576
|
||||
# # gimp 3.0
|
||||
# (builtins.fetchurl {
|
||||
# url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
|
||||
# sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia";
|
||||
# })
|
||||
# ];
|
||||
# };
|
||||
in
|
||||
{
|
||||
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
|
||||
@ -97,7 +97,13 @@
|
||||
(
|
||||
{ ... }:
|
||||
{
|
||||
home-manager = import ./home-manager/home-${hostname}.nix { inherit inputs hostname username; };
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit inputs hostname username;
|
||||
homeDirectory = "/home/${username}";
|
||||
};
|
||||
home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
|
||||
}
|
||||
)
|
||||
./etcnixos/system-${hostname}.nix
|
||||
|
||||
@ -56,12 +56,6 @@ in
|
||||
nixpkgs.overlays = [
|
||||
inputs.rust-overlay.overlays.default
|
||||
];
|
||||
|
||||
# home-manager stuff
|
||||
home = {
|
||||
inherit username;
|
||||
homeDirectory = "/home/${username}";
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user