update home-manager

This commit is contained in:
Tim Schubert 2022-12-10 12:09:55 +01:00
parent c4ed2cbad9
commit 62db411fdd
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
6 changed files with 24 additions and 47 deletions

26
flake.lock generated
View file

@ -482,19 +482,20 @@
"inputs": {
"nixpkgs": [
"myNixpkgs"
]
],
"utils": "utils_2"
},
"locked": {
"lastModified": 1667907331,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"lastModified": 1670253003,
"narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.05",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
@ -973,6 +974,21 @@
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ws-butler": {
"flake": false,
"locked": {

View file

@ -5,7 +5,7 @@
myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
flake-utils.url = github:numtide/flake-utils;
home-manager = {
url = github:nix-community/home-manager/release-22.05;
url = github:nix-community/home-manager/release-22.11;
inputs.nixpkgs.follows = "myNixpkgs";
};
nix-doom-emacs = {

View file

@ -1,35 +0,0 @@
{ self
, nixpkgs
, home-manager
, nix-doom-emacs
, helix
, ...
} @ inputs:
let
hmConfiguration =
{ homeDirectory ? "/home/dadada"
, extraModules ? [ ]
, system ? "x86_64-linux"
, username ? "dadada"
, stateVersion
}: (home-manager.lib.homeManagerConfiguration {
configuration = { ... }: {
imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules;
nixpkgs = {
config = import ./nixpkgs-config.nix {
pkgs = nixpkgs;
};
};
manual.manpages.enable = false;
};
inherit system homeDirectory username stateVersion;
});
in
{
home = hmConfiguration {
extraModules = [ ./home nix-doom-emacs.hmModule ];
stateVersion = "20.09";
};
}

View file

@ -21,6 +21,8 @@ let
];
in
{
home.stateVersion = "20.09";
programs.git = {
signing = {
key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA";

View file

@ -2,8 +2,4 @@
(nixpkgs.lib.mapAttrs'
(name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
self.nixosConfigurations
) //
(nixpkgs.lib.mapAttrs'
(name: config: nixpkgs.lib.nameValuePair name config.activation-script)
self.hmConfigurations
) // self.checks.x86_64-linux

View file

@ -59,8 +59,6 @@
}))
// {
hmConfigurations = import ./home/configurations.nix inputs;
hmModules = import ./home/modules;
nixosConfigurations = import ./nixos/configurations.nix inputs;