From 7790265612294dd4927da593f898c4b7f97702b3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 15 May 2024 21:59:34 -0400 Subject: [PATCH] plasma6 --- modules/desktop/gnome.nix | 1 - modules/desktop/kde.nix | 6 ++---- modules/desktop/x11.nix | 5 +---- modules/os/core.nix | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index 44dc207..b71beb5 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; environment.systemPackages = with pkgs; [ gnomeExtensions.vitals diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix index d812e5b..0b81325 100644 --- a/modules/desktop/kde.nix +++ b/modules/desktop/kde.nix @@ -1,7 +1,5 @@ { pkgs, ... }: { - services.xserver.enable = true; - # services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - programs.dconf.enable = true; + services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.notoPackage = pkgs.fira-code; } diff --git a/modules/desktop/x11.nix b/modules/desktop/x11.nix index ba7d1ff..b1b2227 100644 --- a/modules/desktop/x11.nix +++ b/modules/desktop/x11.nix @@ -1,10 +1,7 @@ { ... }: { - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Configure keymap in X11 services.xserver = { + enable = true; xkb.layout = "us"; xkb.variant = ""; }; diff --git a/modules/os/core.nix b/modules/os/core.nix index a63bcad..fe2a116 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -2,6 +2,7 @@ { # System Packages services.flatpak.enable = true; + programs.dconf.enable = true; environment.systemPackages = with pkgs; [ # nix utils appimage-run