diff --git a/hosts/aurum/default.nix b/hosts/aurum/default.nix index 5da04df..fba1411 100644 --- a/hosts/aurum/default.nix +++ b/hosts/aurum/default.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { imports = [ + ./services ./system ]; @@ -24,8 +25,6 @@ ]; }; - programs.zsh.enable = true; - # enable gnome virtual file system services.gvfs.enable = true; } diff --git a/hosts/aurum/system/impermanence/default.nix b/hosts/aurum/system/impermanence/default.nix index 7a65f0d..3d86a47 100644 --- a/hosts/aurum/system/impermanence/default.nix +++ b/hosts/aurum/system/impermanence/default.nix @@ -16,7 +16,7 @@ users.laurent = { directories = [ "Documents" - ".librewolf" + ".mozilla" ".thunderbird" ".local/share/direnv" ".local/share/keyrings" diff --git a/hosts/default.nix b/hosts/default.nix index 69927ec..666e3e4 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -42,10 +42,13 @@ in { modules = [ ./aurum inputs.home-manager.nixosModules.home-manager - inputs.disko.nixosModules.default + # inputs.disko.nixosModules.default # inputs.lanzaboote.nixosModules.lanzaboote # inputs.impermanence.nixosModules.impermanence # inputs.nixos-hardware.nixosModules.dell-xps-13-something + inputs.nixos-hardware.nixosModules.common-cpu-intel + inputs.nixos-hardware.nixosModules.common-pc-laptop + inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd {inherit home-manager;} ]; }; diff --git a/hosts/silicium/system/users/default.nix b/hosts/silicium/system/users/default.nix index e427ce8..c7b96a7 100644 --- a/hosts/silicium/system/users/default.nix +++ b/hosts/silicium/system/users/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { # disable user creation/deletion users.mutableUsers = false; @@ -8,7 +8,6 @@ isNormalUser = true; initialPassword = "laurent"; extraGroups = ["wheel" "video"]; - shell = pkgs.zsh; }; }; }