mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-01-31 04:58:01 +00:00
workflows: remove conditional config
Now this is handled on the host-specific modules.
This commit is contained in:
parent
193a4796ed
commit
3afb2e4d56
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, _isfoodogsquaredcustom ? false, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.workflows.workflows.a-happy-gnome;
|
cfg = config.workflows.workflows.a-happy-gnome;
|
||||||
@ -94,8 +94,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
config = lib.mkIf cfg.enable {
|
||||||
{
|
|
||||||
# Enable GNOME and GDM.
|
# Enable GNOME and GDM.
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -152,11 +151,5 @@ in
|
|||||||
# The application menu.
|
# The application menu.
|
||||||
junction
|
junction
|
||||||
] ++ cfg.shellExtensions ++ cfg.extraApps;
|
] ++ cfg.shellExtensions ++ cfg.extraApps;
|
||||||
}
|
};
|
||||||
|
|
||||||
# Check whether this is inside of my personal configuration or nah.
|
|
||||||
(lib.mkIf _isfoodogsquaredcustom {
|
|
||||||
profiles.i18n.setup = "ibus";
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, _isfoodogsquaredcustom ? false, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.workflows.workflows.mosey-branch;
|
cfg = config.workflows.workflows.mosey-branch;
|
||||||
@ -109,8 +109,7 @@ in
|
|||||||
debug = lib.mkEnableOption "gnome-session debug messages";
|
debug = lib.mkEnableOption "gnome-session debug messages";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
config = lib.mkIf cfg.enable {
|
||||||
{
|
|
||||||
environment.systemPackages = cfg.extraApps ++ requiredPackages;
|
environment.systemPackages = cfg.extraApps ++ requiredPackages;
|
||||||
|
|
||||||
# Install all of the required systemd units.
|
# Install all of the required systemd units.
|
||||||
@ -176,14 +175,5 @@ in
|
|||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
# Setting up my project-specific profiles. This is only to be applied for
|
|
||||||
# my setup. If you're not foodogsquared and you're using my project as one
|
|
||||||
# of the flake input, this shouldn't be applied nor be used in the first
|
|
||||||
# place.
|
|
||||||
(lib.mkIf _isfoodogsquaredcustom {
|
|
||||||
profiles.i18n.setup = "ibus";
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user