From 90cd4bdd841b0a858cf812287c37f5e8aec0c639 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Sat, 9 Aug 2025 20:14:31 +0800 Subject: [PATCH] feat(sddm): use cattpuccin --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ modules/desktop/style/default.nix | 13 +++++++++++++ modules/desktop/wm/niri/default.nix | 6 ------ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0935654..3d563eb 100644 --- a/flake.lock +++ b/flake.lock @@ -98,6 +98,26 @@ "type": "github" } }, + "catppuccin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754950929, + "narHash": "sha256-75hsUMshZ5ZlO/X2JWfZqKHPM66uhUNsDG/Zozwh/xs=", + "owner": "catppuccin", + "repo": "nix", + "rev": "45512611f1537c75e439d508409efc6901286645", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -1031,6 +1051,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "chaotic": "chaotic", "darkly": "darkly", "fenix": "fenix", diff --git a/flake.nix b/flake.nix index c91bdca..7cdf81f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,9 @@ zen.url = "github:0xc000022070/zen-browser-flake"; zen.inputs.nixpkgs.follows = "nixpkgs"; + catppuccin.url = "github:catppuccin/nix"; + catppuccin.inputs.nixpkgs.follows = "nixpkgs"; + infuse.url = "git+https://codeberg.org/amjoseph/infuse.nix"; infuse.flake = false; @@ -198,6 +201,7 @@ inputs.impermanence.nixosModules.impermanence inputs.home-manager.nixosModules.default inputs.niri.nixosModules.niri + inputs.catppuccin.nixosModules.catppuccin home pkgsConf ]; diff --git a/modules/desktop/style/default.nix b/modules/desktop/style/default.nix index c53f82f..2dc6bcf 100644 --- a/modules/desktop/style/default.nix +++ b/modules/desktop/style/default.nix @@ -12,6 +12,19 @@ lib.my.makeSwitch { "style" ]; config' = { + catppuccin.sddm = { + enable = true; + font = "Jetbrains Mono"; + fontSize = "18"; + }; + services.displayManager.sddm = { + package = pkgs.kdePackages.sddm; + settings.Theme = { + CursorTheme = "breeze-dark"; + CursorSize = 24; + }; + }; + my.home = { stylix = { enable = true; diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index 0997cfa..95c6f07 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -2,7 +2,6 @@ args@{ lib, config, pkgs, - username, ... }: let @@ -49,14 +48,9 @@ in package = pkg; }; services.displayManager = { - autoLogin = { - enable = true; - user = username; - }; sddm = { enable = true; wayland.enable = true; - autoLogin.relogin = true; }; }; my.home = {