fixing home-manager

This commit is contained in:
cnst
2024-07-30 21:54:38 +02:00
parent 7e6787ff38
commit df6ddf3644
6 changed files with 34 additions and 30 deletions

44
flake.lock generated
View File

@@ -506,6 +506,26 @@
"type": "github" "type": "github"
} }
}, },
"hm": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1722321190,
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -528,26 +548,6 @@
} }
}, },
"home-manager_2": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1722321190,
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@@ -1028,7 +1028,7 @@
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_3", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -1132,7 +1132,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager_2", "hm": "hm",
"hyprland": "hyprland", "hyprland": "hyprland",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",

View File

@@ -45,7 +45,7 @@
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
home-manager = { hm = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -27,10 +27,4 @@
# let HM manage itself when in standalone mode # let HM manage itself when in standalone mode
programs.home-manager.enable = true; programs.home-manager.enable = true;
nixpkgs.overlays = [
(final: prev: {
lib = prev.lib // {colors = import "${self}/lib/colors" lib;};
})
];
} }

View File

@@ -0,0 +1,10 @@
{inputs, ...}: {
imports = [
inputs.hm.nixosModules.default
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
}

View File

@@ -3,6 +3,7 @@ let
./core/hyprland.nix ./core/hyprland.nix
./core/zsh.nix ./core/zsh.nix
./core/fonts.nix ./core/fonts.nix
./core/home-manager.nix
./locale ./locale

View File

@@ -36,7 +36,6 @@ in {
programs.dconf.enable = true; programs.dconf.enable = true;
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager
./system.nix ./system.nix
./hardware-configuration.nix ./hardware-configuration.nix
./substituters.nix ./substituters.nix