diff options
| -rw-r--r-- | machines/firelink.nix | 11 | ||||
| -rw-r--r-- | modules/common.nix | 3 | ||||
| -rw-r--r-- | modules/desktop.nix | 9 |
3 files changed, 19 insertions, 4 deletions
diff --git a/machines/firelink.nix b/machines/firelink.nix index 4403be5..ac74105 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -40,6 +40,9 @@ in { ])) retroarch wmctrl # for steam launcher + + # for gnome + gnomeExtensions.appindicator ]; nixpkgs.config.retroarch = { enableMGBA = true; @@ -51,7 +54,11 @@ in { hardware.uinput.enable = true; services.openssh.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.xserver.displayManager.sddm.enable = lib.mkForce false; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; + # services.xserver.displayManager.defaultSession = "plasmawayland"; services.xserver.displayManager.autoLogin = { enable = true; user = "guest"; @@ -100,8 +107,6 @@ in { hardware.enableAllFirmware = true; hardware.enableRedistributableFirmware = true; - # console.font = "ter-i32b"; - # console.packages = [ pkgs.terminus_font ]; # console.earlySetup = true; # Use steam driver instead. diff --git a/modules/common.nix b/modules/common.nix index 9d649c1..d6dd2ed 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -67,6 +67,9 @@ ]; time.timeZone = "America/New_York"; + console.font = "ter-i32b"; + console.packages = [ pkgs.terminus_font ]; + services = { postgresql = { package = pkgs.postgresql_12; }; openssh.passwordAuthentication = false; diff --git a/modules/desktop.nix b/modules/desktop.nix index 2dbbbaf..f3afc30 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -116,7 +116,14 @@ in { systemd.services.display-manager.after = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ]; boot.plymouth.enable = true; - boot.kernelParams = ["quiet" "splash" "vt.global_cursor_default=0"]; + boot.plymouth.theme = "spinner"; + boot.kernelParams = ["quiet" "splash" "vt.global_cursor_default=0" "fbcon=nodefer"]; + systemd.services.plymouth-quit-wait.wantedBy = [ "display-manager.service" ]; + systemd.services.plymouth-quit.wantedBy = [ "display-manager.service" ]; + + # Larger console font setup. + console.font = "ter-i32b"; + console.packages = [ pkgs.terminus_font ]; services = { avahi.enable = true; |