From ed2e5a1b4267602b6b4103751b968518ec9c2d40 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Wed, 28 Dec 2022 20:49:38 -0600 Subject: [PATCH] Revert "workstation | enable greetd to start things up" This reverts commit 311b925cfff81261a5bfcd195bdfdb26cbcf8bb4. It is more hassle than it is worth. --- workstation/configuration.nix | 36 +++++++---------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/workstation/configuration.nix b/workstation/configuration.nix index 7df27b6..4f8917a 100644 --- a/workstation/configuration.nix +++ b/workstation/configuration.nix @@ -1,15 +1,5 @@ -{ config, lib, pkgs, ... }: -let - swayConfig = pkgs.writeText "greetd-sway-config" '' - # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. - exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway; swaymsg exit" - bindsym Mod4+shift+e exec swaynag \ - -t warning \ - -m 'What do you want to do?' \ - -b 'Poweroff' 'systemctl poweroff' \ - -b 'Reboot' 'systemctl reboot' - ''; -in +{ config, pkgs, ... }: + { # Bootloader. boot.loader.systemd-boot.enable = true; @@ -32,24 +22,8 @@ in # Select internationalisation properties. i18n.defaultLocale = "en_US.utf8"; - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; - }; - }; - }; - - environment.etc."greetd/environments".text = '' - sway - fish - bash - startxfce4 - ''; - # Splash screen - boot.plymouth.enable = true; + boot.plymouth.enable = false; boot.plymouth.theme = "breeze"; security.polkit.enable = true; @@ -65,6 +39,10 @@ in # Enable the X11 windowing system. #services.xserver.enable = false; + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; + #services.xserver.desktopManager.gnome.enable = false; # Configure keymap in X11 #services.xserver = {