diff --git a/apps/de/default.nix b/apps/de/default.nix index 2901424a24a04399e82b967901bdea5441f85451..d5ce532f61d6f008683fba3031c410c49978c57b 100644 --- a/apps/de/default.nix +++ b/apps/de/default.nix @@ -24,4 +24,5 @@ monospace-font-name = "MonaspiceAr Nerd Font Regular 10"; color-scheme = "prefer-dark"; }; }; + } diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix index 2249c1b171c40ae91d898342e13e897e640a886c..907b59f29e089434d6f24f1494ed9b0eeb4546c4 100644 --- a/machines/common/gui/default.nix +++ b/machines/common/gui/default.nix @@ -4,8 +4,6 @@ imports = [ ../nogui ]; security = { rtkit.enable = true; - polkit.enable = true; - pam.services.swaylock = { }; }; services = { pipewire = { @@ -14,15 +12,15 @@ pulse.enable = true; alsa.enable = true; }; pulseaudio.enable = false; - displayManager.sddm = { + xserver = { enable = true; - wayland.enable = true; + displayManager.lightdm.enable = true; + desktopManager.cinnamon.enable = true; + xkb = { + layout = "us"; + variant = ""; + }; }; - gnome.gnome-keyring.enable = true; - }; - programs = { - niri.enable = true; - waybar.enable = true; }; fonts.packages = with pkgs.nerd-fonts; [ hack @@ -30,11 +28,5 @@ iosevka jetbrains-mono monaspace ]; - environment.systemPackages = with pkgs; [ - tailscale-systray - fuzzel - swaylock - mako - swayidle - ]; + environment.systemPackages = [ pkgs.tailscale-systray ]; }