From 1daa246ecd57b81b98b84df6b33f736c90464648 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 8 Nov 2024 17:23:02 +0100 Subject: [PATCH 1/4] modules: sddm: enable wayland by default --- modules/sddm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/sddm.nix b/modules/sddm.nix index 41941ba..d35ec12 100644 --- a/modules/sddm.nix +++ b/modules/sddm.nix @@ -18,6 +18,7 @@ in { services.displayManager.sddm = { enable = true; theme = "sugar-candy"; + wayland.enable = true; }; environment.systemPackages = builtins.attrValues { From 36f51a94c2005e85174d24f31edcb22ce5138ed0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 8 Nov 2024 17:23:32 +0100 Subject: [PATCH 2/4] modules: sddm: switch to catppuccin theme --- modules/sddm.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/sddm.nix b/modules/sddm.nix index d35ec12..de57ae5 100644 --- a/modules/sddm.nix +++ b/modules/sddm.nix @@ -17,22 +17,15 @@ in { config = mkIf cfg.enable { services.displayManager.sddm = { enable = true; - theme = "sugar-candy"; + theme = "catppuccin-latte"; wayland.enable = true; }; - environment.systemPackages = builtins.attrValues { - inherit - (pkgs.packages) - sddm-sugar-candy - ; - - inherit - (pkgs.libsForQt5.qt5) - qtgraphicaleffects - qtquickcontrols2 - qtsvg - ; - }; + environment.systemPackages = [ + (pkgs.catppuccin-sddm.override + { + flavor = "latte"; + }) + ]; }; } From 4e91ecee7bbdc216416427784888f4e5663b6348 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 8 Nov 2024 17:48:30 +0100 Subject: [PATCH 3/4] talos: switch back to default sddm setup --- hosts/talos/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 02dff05..5264e2b 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -130,7 +130,6 @@ }; my.gui.enable = true; - my.displayManager.sddm.enable = lib.mkForce false; hardware.bluetooth = { enable = true; @@ -157,10 +156,6 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; services.desktopManager.plasma6.enable = true; services.power-profiles-daemon.enable = true; From 9d05ec3f405a8db2b70bbec58d276563e555aa04 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 15 Nov 2024 13:40:24 +0100 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7' (2024-11-06) → 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06) → 'github:NixOS/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1d51867..663a3bd 100644 --- a/flake.lock +++ b/flake.lock @@ -193,11 +193,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": {