diff --git a/flake.nix b/flake.nix index 8f0ef3b..f6ee0ce 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ flake = let hosts = import ./hosts {inherit inputs;}; in { - inherit (hosts) nixosConfigurations homeConfigurations; + inherit (hosts) nixosConfigurations; }; systems = ["x86_64-linux"]; diff --git a/homes/min/default.nix b/homes/min/default.nix new file mode 100644 index 0000000..3b4dbca --- /dev/null +++ b/homes/min/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = [pkgs.fastfetch]; + + home.stateVersion = "24.11"; +} diff --git a/hosts/default.nix b/hosts/default.nix index d5d5ac9..252f5d2 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -21,15 +21,11 @@ }; } - # ../modules + ../modules ]; }; }) systems); - - makeHomeConfigurations = systems: - builtins.throw "todo"; in { nixosConfigurations = makeNixosConfigurations systems; - homeConfigurations = makeHomeConfigurations systems; } diff --git a/hosts/mpl/configuration.nix b/hosts/mpl/configuration.nix index 0b6b47d..8a0a710 100644 --- a/hosts/mpl/configuration.nix +++ b/hosts/mpl/configuration.nix @@ -1,10 +1,11 @@ -{...}: { +{config, ...}: { imports = [ ./audio.nix ./bootloader.nix ./disk-config.nix ./hardware.nix ./mounts.nix + ./nebula.nix ./secrets.nix ]; @@ -27,10 +28,15 @@ # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.min = { - isNormalUser = true; - extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + # Define a user account. + users.users = { + root.hashedPasswordFile = config.sops.secrets."root-pw".path; + + min = { + isNormalUser = true; + extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + hashedPasswordFile = config.sops.secrets."user-pw".path; + }; }; # Some programs need SUID wrappers, can be configured further or are