From b43ad79b030aa8a56e786fd363412eb64da2c56b Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 5 Jan 2024 21:55:58 -0500 Subject: Switch to gnome in beryllium I couldn't get my monitor to work properly in xmonad, so decided to use gnome for a while because I'll be away and will be using it headless from my macbook anyway. --- Biz/Dev/Beryllium/Configuration.nix | 7 +++---- Biz/OsBase.nix | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Biz/Dev/Beryllium/Configuration.nix b/Biz/Dev/Beryllium/Configuration.nix index 712f2eb..96e358b 100644 --- a/Biz/Dev/Beryllium/Configuration.nix +++ b/Biz/Dev/Beryllium/Configuration.nix @@ -39,8 +39,8 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; # Configure keymap in X11 services.xserver = { @@ -94,8 +94,7 @@ # ]; #}; - # Enable automatic login for the user. - services.xserver.displayManager.autoLogin.enable = true; + services.xserver.displayManager.autoLogin.enable = false; services.xserver.displayManager.autoLogin.user = "ben"; services.clight.enable = true; diff --git a/Biz/OsBase.nix b/Biz/OsBase.nix index ffd7258..3b59f11 100644 --- a/Biz/OsBase.nix +++ b/Biz/OsBase.nix @@ -2,7 +2,7 @@ let ports = import ./Cloud/Ports.nix; in { - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; fonts.fonts = with pkgs; [ google-fonts mononoki source-code-pro fantasque-sans-mono hack-font fira fira-code fira-code-symbols @@ -24,8 +24,8 @@ in { services.fail2ban.ignoreIP = [ ports.bensIp ]; # my home IP services.openssh.enable = true; services.openssh.openFirewall = true; - services.openssh.forwardX11 = true; - services.openssh.passwordAuthentication = false; - services.openssh.permitRootLogin = "prohibit-password"; + services.openssh.settings.X11Forwarding = true; + services.openssh.settings.PasswordAuthentication = false; + services.openssh.settings.PermitRootLogin = "prohibit-password"; system.autoUpgrade.enable = false; # 'true' breaks our nixpkgs pin } -- cgit v1.2.3