diff options
| -rw-r--r-- | modules/base/default.nix | 8 | ||||
| -rw-r--r-- | modules/desktop/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/root.nix | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/modules/base/default.nix b/modules/base/default.nix index 0523d0e..d5c0dc9 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -24,12 +24,12 @@ in { }; nix = { - package = pkgs.nixFlakes; + package = mkDefault pkgs.nixFlakes; gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; + automatic = mkDefault true; + dates = mkDefault "weekly"; + options = mkDefault "--delete-older-than 7d"; }; settings = { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index b725f08..a758d78 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -29,11 +29,13 @@ in { noXlibs = lib.mkForce false; systemPackages = with pkgs; [pinentry-curses wl-clipboard xclip]; }; + programs = { dconf.enable = true; firefox.enable = true; xwayland.enable = true; }; + services.xserver.enable = true; xdg.portal.enable = true; }; diff --git a/modules/nixos/root.nix b/modules/nixos/root.nix index 4e27694..a49e3bf 100644 --- a/modules/nixos/root.nix +++ b/modules/nixos/root.nix @@ -4,16 +4,16 @@ ... }: let cfg = config.nixos.defaultRoot; - inherit (lib) mkEnableOption mkIf; + inherit (lib) mkDefault mkEnableOption mkIf; in { options.nixos.defaultRoot.enable = mkEnableOption "enable default root user"; config = mkIf cfg.enable { users.users.root = { - home = "/root"; - uid = config.ids.uids.root; - group = "root"; - passwordFile = config.age.secrets.rootPassword.path; + home = mkDefault "/root"; + uid = mkDefault config.ids.uids.root; + group = mkDefault "root"; + passwordFile = mkDefault config.age.secrets.rootPassword.path; }; }; } |