Update Thor configuration
This commit is contained in:
parent
4fe22eb988
commit
4706a63b97
8 changed files with 33 additions and 59 deletions
24
flake.nix
24
flake.nix
|
|
@ -9,10 +9,10 @@
|
|||
};
|
||||
|
||||
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager-u = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs-u";
|
||||
};
|
||||
# home-manager-u = {
|
||||
# url = "github:nix-community/home-manager";
|
||||
# inputs.nixpkgs.follows = "nixpkgs-u";
|
||||
# };
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
, nixpkgs
|
||||
, home-manager
|
||||
, nixpkgs-u
|
||||
, home-manager-u
|
||||
# , home-manager-u
|
||||
, flake-utils
|
||||
, nixos-hardware
|
||||
, tex2nix
|
||||
|
|
@ -104,11 +104,11 @@
|
|||
homeManagerSettings
|
||||
{ home-manager.users = users; }
|
||||
];
|
||||
homeManagerUModules = users: [
|
||||
home-manager-u.nixosModules.home-manager
|
||||
homeManagerSettings
|
||||
{ home-manager.users = users; }
|
||||
];
|
||||
# homeManagerUModules = users: [
|
||||
# home-manager-u.nixosModules.home-manager
|
||||
# homeManagerSettings
|
||||
# { home-manager.users = users; }
|
||||
# ];
|
||||
|
||||
odinBaseModules = [
|
||||
./odin/hardware-configuration.nix
|
||||
|
|
@ -147,11 +147,11 @@
|
|||
./thor/configuration.nix
|
||||
];
|
||||
thorBuilder = { extraModules ? [ ] }:
|
||||
nixpkgs-u.lib.nixosSystem rec {
|
||||
nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
|
||||
++ commonBaseModules ++ thorBaseModules
|
||||
++ (homeManagerUModules { bertof = import ./thor/hm.nix; })
|
||||
++ (homeManagerModules { bertof = import ./thor/hm.nix; })
|
||||
++ extraModules;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue