diff --git a/nixos.nix b/nixos.nix index d5604f1..5bbd4b2 100644 --- a/nixos.nix +++ b/nixos.nix @@ -255,7 +255,8 @@ in services.displayManager.sddm = { enable = true; wayland.enable = true; - theme = "${import ./theming/sddm { inherit pkgs; }}"; + theme = "catppuccin-frappe"; + package = pkgs.kdePackages.sddm; }; # Enable Hyprland @@ -396,6 +397,15 @@ in wl-clipboard xclip zoxide + (catppuccin-sddm.override # So SDDM finds the theme files. + { + flavor = "frappe"; + font = "FantasqueSansM Nerd Font"; + fontSize = "12"; + background = "${./theming/sddm/Background.jpg}"; + loginBackground = true; + } + ) # Networking gping diff --git a/theming/sddm/default.nix b/theming/sddm/default.nix deleted file mode 100644 index 6f79482..0000000 --- a/theming/sddm/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs }: - -let - image = ./Background.jpg; -in -pkgs.stdenv.mkDerivation { - name = "sddm-theme"; - src = pkgs.fetchFromGitHub { - owner = "MarianArlt"; - repo = "sddm-sugar-dark"; - rev = "ceb2c455663429be03ba62d9f898c571650ef7fe"; - sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy"; - }; - installPhase = '' - mkdir -p $out - cp -R ./* $out/ - cd $out/ - rm Background.jpg - cp -r ${image} $out/Background.jpg - ''; -}