Thor: unstable
This commit is contained in:
parent
4d264d2cd8
commit
cdccd6e1ae
8 changed files with 74 additions and 50 deletions
22
flake.nix
22
flake.nix
|
|
@ -10,7 +10,10 @@
|
|||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# 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"; };
|
||||
};
|
||||
|
||||
agenix = {
|
||||
url = "github:ryantm/agenix";
|
||||
|
|
@ -44,6 +47,7 @@
|
|||
, nixpkgs
|
||||
, nixpkgs-u
|
||||
, home-manager
|
||||
, home-manager-u
|
||||
, agenix
|
||||
, deploy-rs
|
||||
, flake-utils
|
||||
|
|
@ -192,10 +196,10 @@
|
|||
}
|
||||
];
|
||||
|
||||
# homeManagerUModules = [
|
||||
# home-manager-u.nixosModules.default
|
||||
# { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
|
||||
# ];
|
||||
homeManagerUModules = [
|
||||
home-manager-u.nixosModules.default
|
||||
{ home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
|
||||
];
|
||||
|
||||
commonModules = [
|
||||
# Nix configuration
|
||||
|
|
@ -232,7 +236,7 @@
|
|||
|
||||
thorConfig = {
|
||||
nixosConfigurations = {
|
||||
thor = nixpkgs.lib.nixosSystem {
|
||||
thor = nixpkgs-u.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules =
|
||||
commonModules
|
||||
|
|
@ -259,7 +263,7 @@
|
|||
|
||||
./modules/nixos/musa.nix
|
||||
]
|
||||
++ homeManagerModules
|
||||
++ homeManagerUModules
|
||||
++ [{ home-manager.users.bertof = import ./instances/thor/hm.nix; }];
|
||||
};
|
||||
};
|
||||
|
|
@ -412,8 +416,8 @@
|
|||
++ homeManagerModules
|
||||
++ [
|
||||
{
|
||||
home-manager.users.bertof = import ./instances/loki/hm.nix;
|
||||
home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
|
||||
# home-manager.users.bertof = import ./instances/loki/hm.nix;
|
||||
# home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue