[NixOS] Add files that allow enabling of plasma/gnome

This commit is contained in:
Ivan Malison 2023-11-17 15:20:44 -07:00
parent d376da4ca4
commit 2abde807aa
5 changed files with 22 additions and 11 deletions

View File

@ -3,8 +3,8 @@
imports = [
./android.nix
./base.nix
./cache.nix
./cache-server.nix
./cache.nix
./code.nix
./desktop.nix
./environment.nix
@ -12,8 +12,9 @@
./extra.nix
./games.nix
./git-sync.nix
./gitea.nix
./gitea-runner.nix
./gitea.nix
./gnome.nix
./imalison.nix
./internet-computer.nix
./kat.nix
@ -21,6 +22,7 @@
./nix.nix
./nixified.ai.nix
./options.nix
./plasma.nix
./secrets.nix
./ssh.nix
./syncthing.nix
@ -36,12 +38,14 @@
config = lib.mkIf config.features.full.enable {
modules.base.enable = true;
modules.desktop.enable = true;
modules.plasma.enable = true;
modules.gnome.enable = false;
modules.xmonad.enable = true;
modules.extra.enable = true;
modules.code.enable = true;
modules.games.enable = true;
modules.syncthing.enable = true;
modules.fonts.enable = true;
modules.nixified-ai.enable = true;
modules.nixified-ai.enable = false;
};
}

View File

@ -1,4 +1,4 @@
{ config, pkgs, options, inputs, makeEnable, forEachUser, ... }:
{ config, pkgs, makeEnable, forEachUser, ... }:
makeEnable config "modules.desktop" true {
imports = [
./fonts.nix
@ -8,13 +8,7 @@ makeEnable config "modules.desktop" true {
exportConfiguration = true;
enable = true;
layout = "us";
desktopManager = {
plasma5.enable = true;
};
displayManager = {
sddm = {
enable = true;
};
sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
'';

7
nixos/gnome.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, makeEnable, ... }:
makeEnable config "modules.gnome" false {
services.xserver = {
desktopManager.gnome3.enable = true;
displayManager.gdm.enable = true;
};
}

View File

@ -11,7 +11,6 @@ specialArgs.makeEnable config "modules.nixified-ai" false {
services.invokeai = {
enable = false;
host = "0.0.0.0";
nsfwChecker = false;
package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia;
};
}

7
nixos/plasma.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, makeEnable, ... }:
makeEnable config "modules.plasma" true {
services.xserver = {
desktopManager.plasma5.enable = true;
displayManager.sddm.enable = true;
};
}