diff --git a/flake.nix b/flake.nix index c85445f..d01ab74 100644 --- a/flake.nix +++ b/flake.nix @@ -313,7 +313,7 @@ extraSpecialArgs = { stateVersion = "23.05"; email = "motiejusja@wix.com"; - devEnvironment = true; + fullDesktop = true; hmOnly = true; }; }; diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index 0699692..bf55dce 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -59,7 +59,7 @@ in { base = { zfs.enable = true; users = { - devEnvironment = true; + fullDesktop = true; passwd = { root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; diff --git a/modules/base/default.nix b/modules/base/default.nix index 7d94159..f7352c9 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -108,6 +108,7 @@ bsdgames parallel binutils + bandwhich hyperfine sloccount dmidecode diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix index 9f1e236..874782a 100644 --- a/modules/base/users/default.nix +++ b/modules/base/users/default.nix @@ -7,7 +7,7 @@ cfg = config.mj.base.users; in { options.mj.base.users = with lib.types; { - devEnvironment = lib.mkOption { + fullDesktop = lib.mkOption { type = bool; default = false; }; @@ -65,7 +65,7 @@ in { inherit lib; inherit pkgs; inherit (config.mj) stateVersion; - inherit (config.mj.base.users) devEnvironment; + inherit (config.mj.base.users) fullDesktop; hmOnly = false; email = "motiejus@jakstys.lt"; }) diff --git a/shared/home/default.nix b/shared/home/default.nix index 01f9a8e..cd2a61e 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -3,7 +3,7 @@ pkgs, stateVersion, email, - devEnvironment, + fullDesktop, hmOnly, ... }: { @@ -16,7 +16,7 @@ home.packages = with pkgs; ( - if devEnvironment + if fullDesktop then [ go @@ -45,7 +45,7 @@ programs = { direnv.enable = true; - firefox = { + firefox = lib.mkIf fullDesktop { enable = true; profiles = { xdefault = { @@ -80,7 +80,7 @@ fugitive ] ++ ( - if devEnvironment + if fullDesktop then [ vim-go @@ -96,7 +96,7 @@ ); extraConfig = builtins.readFile ./vimrc; } - (lib.mkIf devEnvironment { + (lib.mkIf fullDesktop { extraLuaConfig = builtins.readFile (pkgs.substituteAll {