sort home manager settings

This commit is contained in:
Christoph Cullmann 2024-07-02 19:54:05 +02:00
parent 51983612e1
commit dfee38f437
No known key found for this signature in database
2 changed files with 22 additions and 15 deletions

View file

@ -1,21 +1,17 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
impermanence = builtins.fetchTarball "https://github.com/nix-community/impermanence/archive/master.tar.gz"; impermanence = builtins.fetchTarball "https://github.com/nix-community/impermanence/archive/master.tar.gz";
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in in
{ {
# #
# stuff shared between home machines # stuff shared between home machines
# #
# get impermanence & home manager working # get impermanence working & include more shared parts
imports = [ imports = [
# manage persistent files # manage persistent files
"${impermanence}/nixos.nix" "${impermanence}/nixos.nix"
# home manager for per user config
"${home-manager}/nixos"
# our users # our users
"/data/nixos/users.nix" "/data/nixos/users.nix"
]; ];
@ -278,12 +274,6 @@ in
systemd.targets.hibernate.enable = false; systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false; systemd.targets.hybrid-sleep.enable = false;
# let home manager install stuff to /etc/profiles
home-manager.useUserPackages = true;
# use global pkgs
home-manager.useGlobalPkgs = true;
# allow unfree packages # allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -1,6 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{ {
# get home manager working
imports = [
# home manager for per user config
"${home-manager}/nixos"
];
users = { users = {
# all users and passwords are defined here # all users and passwords are defined here
mutableUsers = false; mutableUsers = false;
@ -45,7 +53,16 @@
}; };
}; };
# use shared home manager settings for all users # home manager settings
home-manager.users.root = import ./home.nix; home-manager = {
home-manager.users.cullmann = import ./home.nix; # let home manager install stuff to /etc/profiles
useUserPackages = true;
# use global pkgs
useGlobalPkgs = true;
# use shared home manager settings for all users
users.root = import ./home.nix;
users.cullmann = import ./home.nix;
};
} }