diff options
| -rw-r--r-- | hosts/common/desktop/default.nix | 3 | ||||
| -rw-r--r-- | hosts/common/desktop/gnome.nix | 21 | ||||
| -rw-r--r-- | hosts/common/desktop/plasma.nix | 19 | ||||
| -rw-r--r-- | hosts/common/packages.nix | 29 |
4 files changed, 56 insertions, 16 deletions
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix index 74faa77..7199859 100644 --- a/hosts/common/desktop/default.nix +++ b/hosts/common/desktop/default.nix @@ -1,5 +1,6 @@ {lib, ...}: { + environment.noXlibs = lib.mkForce false; programs.xwayland.enable = true; + services.xserver.enable = true; xdg.portal.enable = true; - environment.noXlibs = lib.mkForce false; } diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix index e05a0cd..b59309a 100644 --- a/hosts/common/desktop/gnome.nix +++ b/hosts/common/desktop/gnome.nix @@ -2,15 +2,24 @@ imports = [ ./. ]; + environment = { + gnome.excludePackages = with pkgs; + [ + epiphany + gnome-tour + ] + ++ (with pkgs.gnome; [ + cheese + geary + gnome-characters + gnome-contacts + gnome-music + ]); + systemPackages = with pkgs; [adw-gtk3 blackbox-terminal]; + }; services.xserver = { - enable = true; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; }; - - environment.gnome.excludePackages = with pkgs; [ - epiphany - gnome-tour - ]; } diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix new file mode 100644 index 0000000..ddd3a28 --- /dev/null +++ b/hosts/common/desktop/plasma.nix @@ -0,0 +1,19 @@ +{pkgs, ...}: { + imports = [ + ./. + ]; + + services.xserver = { + displayManager.sddm.enable = true; + desktopManager.plasma5 = { + enable = true; + excludePackages = with pkgs.libsForQt5; [ + elisa + khelpcenter + oxygen + plasma-browser-integration + print-manager + ]; + }; + }; +} diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix index dbb0091..8e08740 100644 --- a/hosts/common/packages.nix +++ b/hosts/common/packages.nix @@ -1,12 +1,23 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - git - neofetch - nixos-option - pinentry-curses - python310 - vim - ]; +{ + config, + pkgs, + ... +}: let + extraPkgs = + if config.sys.gui.enable + then with pkgs; [firefox] + else []; +in { + environment.systemPackages = with pkgs; + [ + git + neofetch + nixos-option + pinentry-curses + python310 + vim + ] + ++ extraPkgs; programs = { gnupg = { |