diff options
author | Christoph Cullmann <christoph@cullmann.io> | 2024-07-02 19:54:05 +0200 |
---|---|---|
committer | Christoph Cullmann <christoph@cullmann.io> | 2024-07-02 19:54:05 +0200 |
commit | dfee38f4370c8556ec408f081b92b3b9b56f98d6 (patch) | |
tree | 1d8a2447315b71c5b7e0cc31bd447dda32561591 | |
parent | 51983612e19bcd673311645b8527c2f1d74262f2 (diff) |
sort home manager settings
-rw-r--r-- | common.nix | 12 | ||||
-rw-r--r-- | users.nix | 25 |
2 files changed, 22 insertions, 15 deletions
@@ -1,21 +1,17 @@ { config, pkgs, ... }: let 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 { # # stuff shared between home machines # - # get impermanence & home manager working + # get impermanence working & include more shared parts imports = [ # manage persistent files "${impermanence}/nixos.nix" - # home manager for per user config - "${home-manager}/nixos" - # our users "/data/nixos/users.nix" ]; @@ -278,12 +274,6 @@ in systemd.targets.hibernate.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 nixpkgs.config.allowUnfree = true; @@ -1,6 +1,14 @@ { 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 = { # all users and passwords are defined here mutableUsers = false; @@ -45,7 +53,16 @@ }; }; - # use shared home manager settings for all users - home-manager.users.root = import ./home.nix; - home-manager.users.cullmann = import ./home.nix; + # home manager settings + home-manager = { + # 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; + }; } |