remove firefox from non-desktops

This commit is contained in:
Motiejus Jakštys 2023-12-11 20:05:32 +02:00
parent 9719521847
commit c9aeac6ebe
5 changed files with 10 additions and 9 deletions

View File

@ -313,7 +313,7 @@
extraSpecialArgs = { extraSpecialArgs = {
stateVersion = "23.05"; stateVersion = "23.05";
email = "motiejusja@wix.com"; email = "motiejusja@wix.com";
devEnvironment = true; fullDesktop = true;
hmOnly = true; hmOnly = true;
}; };
}; };

View File

@ -59,7 +59,7 @@ in {
base = { base = {
zfs.enable = true; zfs.enable = true;
users = { users = {
devEnvironment = true; fullDesktop = true;
passwd = { passwd = {
root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;

View File

@ -108,6 +108,7 @@
bsdgames bsdgames
parallel parallel
binutils binutils
bandwhich
hyperfine hyperfine
sloccount sloccount
dmidecode dmidecode

View File

@ -7,7 +7,7 @@
cfg = config.mj.base.users; cfg = config.mj.base.users;
in { in {
options.mj.base.users = with lib.types; { options.mj.base.users = with lib.types; {
devEnvironment = lib.mkOption { fullDesktop = lib.mkOption {
type = bool; type = bool;
default = false; default = false;
}; };
@ -65,7 +65,7 @@ in {
inherit lib; inherit lib;
inherit pkgs; inherit pkgs;
inherit (config.mj) stateVersion; inherit (config.mj) stateVersion;
inherit (config.mj.base.users) devEnvironment; inherit (config.mj.base.users) fullDesktop;
hmOnly = false; hmOnly = false;
email = "motiejus@jakstys.lt"; email = "motiejus@jakstys.lt";
}) })

View File

@ -3,7 +3,7 @@
pkgs, pkgs,
stateVersion, stateVersion,
email, email,
devEnvironment, fullDesktop,
hmOnly, hmOnly,
... ...
}: { }: {
@ -16,7 +16,7 @@
home.packages = with pkgs; home.packages = with pkgs;
( (
if devEnvironment if fullDesktop
then [ then [
go go
@ -45,7 +45,7 @@
programs = { programs = {
direnv.enable = true; direnv.enable = true;
firefox = { firefox = lib.mkIf fullDesktop {
enable = true; enable = true;
profiles = { profiles = {
xdefault = { xdefault = {
@ -80,7 +80,7 @@
fugitive fugitive
] ]
++ ( ++ (
if devEnvironment if fullDesktop
then [ then [
vim-go vim-go
@ -96,7 +96,7 @@
); );
extraConfig = builtins.readFile ./vimrc; extraConfig = builtins.readFile ./vimrc;
} }
(lib.mkIf devEnvironment { (lib.mkIf fullDesktop {
extraLuaConfig = extraLuaConfig =
builtins.readFile builtins.readFile
(pkgs.substituteAll { (pkgs.substituteAll {