From ad904f0bc341f104979633b204eb8c6d3af94970 Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 26 Jun 2024 15:23:47 +0200 Subject: [PATCH] switch sddm to gdm --- modules/default.nix | 6 +++++- modules/games/default.nix | 2 +- modules/sddm/default.nix | 12 ----------- modules/sddm/sddm-theme.conf | 39 ------------------------------------ 4 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 modules/sddm/default.nix delete mode 100644 modules/sddm/sddm-theme.conf diff --git a/modules/default.nix b/modules/default.nix index c87701f..8ecaba1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -8,7 +8,6 @@ ./home ./niri ./plasma - ./sddm ./virt ]; @@ -83,6 +82,11 @@ services = { # Needed for some features in nautilus such as auto-mounting and trash gvfs.enable = true; + + xserver.displayManage.gdm = { + enable = true; + wayland = true; + }; }; programs.fish.enable = true; diff --git a/modules/games/default.nix b/modules/games/default.nix index 71281b6..f6f1a74 100644 --- a/modules/games/default.nix +++ b/modules/games/default.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, ... }: lib.mkIf (config.withGames) { programs.steam = { enable = true; - gamescopeSession.enabe = true; + gamescopeSession.enable = true; }; programs.gamescope = { diff --git a/modules/sddm/default.nix b/modules/sddm/default.nix deleted file mode 100644 index 66fb369..0000000 --- a/modules/sddm/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, lib, config, ... }: lib.mkIf(config.withNiri or config.withPlasma or config.withGnome){ - services.displayManager.sddm = { - enable = true; - wayland = { - enable = true; - compositor = "kwin"; - }; - theme = "where_is_my_sddm_theme"; - }; - - environment.systemPackages = [ (pkgs.where-is-my-sddm-theme.override ({ themeConfig = builtins.readFile ./sddm-theme.conf; })) ]; -} diff --git a/modules/sddm/sddm-theme.conf b/modules/sddm/sddm-theme.conf deleted file mode 100644 index a14a42b..0000000 --- a/modules/sddm/sddm-theme.conf +++ /dev/null @@ -1,39 +0,0 @@ -[General] -# Password mask character -passwordCharacter=* -# Mask password characters or not ("true" or "false") -passwordMask=true -# value "1" is all display width, "0.5" is a half of display width etc. -passwordInputWidth=0.5 -# Background color of password input -passwordInputBackground= -# Radius of password input corners -passwordInputRadius= -# "true" for visible cursor, "false" -passwordInputCursorVisible=false -# Font size of password (in points) -passwordFontSize=96 -passwordCursorColor=random -passwordTextColor= - -# Show or not sessions choose label -showSessionsByDefault=false -# Font size of sessions choose label (in points). -sessionsFontSize=24 - -# Show or not users choose label -showUsersByDefault=false -# Font size of users choose label (in points) -usersFontSize=48 - -# Path to background image -background= -# Or use just one color -backgroundFill=#1f1d2e -backgroundFillMode=aspect - -# Default text color for all labels -basicTextColor=#e0def4 - -# Radius of background blur -blurRadius=