diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 1aa16069..7d075a02 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -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; }; } diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 894ef545..84a39dc4 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -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 ''; diff --git a/nixos/gnome.nix b/nixos/gnome.nix new file mode 100644 index 00000000..6b76a19f --- /dev/null +++ b/nixos/gnome.nix @@ -0,0 +1,7 @@ +{ config, makeEnable, ... }: +makeEnable config "modules.gnome" false { + services.xserver = { + desktopManager.gnome3.enable = true; + displayManager.gdm.enable = true; + }; +} diff --git a/nixos/nixified.ai.nix b/nixos/nixified.ai.nix index 7eb3404b..3db4d4b9 100644 --- a/nixos/nixified.ai.nix +++ b/nixos/nixified.ai.nix @@ -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; }; } diff --git a/nixos/plasma.nix b/nixos/plasma.nix new file mode 100644 index 00000000..14f22b37 --- /dev/null +++ b/nixos/plasma.nix @@ -0,0 +1,7 @@ +{ config, makeEnable, ... }: +makeEnable config "modules.plasma" true { + services.xserver = { + desktopManager.plasma5.enable = true; + displayManager.sddm.enable = true; + }; +}