Skip to content

Commit ffa509e

Browse files
committed
Update SDDM
1 parent f9e011b commit ffa509e

File tree

7 files changed

+34
-11
lines changed

7 files changed

+34
-11
lines changed

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
username = "athena";
1313
theme = "temple";
1414
desktop = "gnome";
15-
dmanager = "gdm";
15+
dmanager = "sddm";
1616
mainShell = "fish";
1717
terminal = "kitty";
1818
browser = "firefox";

nixos/configuration.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let
1212
hostname = "athenaos";
1313
theme = "temple";
1414
desktop = "gnome";
15-
dmanager = "gdm";
15+
dmanager = "sddm";
1616
mainShell = "fish";
1717
terminal = "kitty";
1818
browser = "firefox";

nixos/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ in {
6767
};
6868

6969
displayManager = lib.mkOption {
70-
type = with lib.types; nullOr (enum [ "gdm" "lightdm" ]);
71-
default = "lightdm";
70+
type = with lib.types; nullOr (enum [ "gdm" "lightdm" "sddm" ]);
71+
default = "sddm";
7272
description = ''
7373
The display manager to use.
7474
'';

nixos/home-manager/desktops/gnome/default.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ in {
5858
]);
5959
};
6060

61+
fonts.packages = fontList;
62+
6163
# ---- Home Configuration ----
6264

6365
home-manager.users.${config.athena.homeManagerUser} = { pkgs, ...}: {
64-
home.packages = gnomeExtensionsList ++ fontList;
66+
home.packages = gnomeExtensionsList;
6567
dconf.settings = {
6668
"org/gnome/desktop/background" = {
6769
picture-uri = "file:///run/current-system/sw/share/backgrounds/athena/"+backgroundTheme;

nixos/modules/dms/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
imports = [
33
./gdm
44
./lightdm
5+
./sddm
56
];
67
}

nixos/modules/dms/sddm/default.nix

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{ lib, config, pkgs, ... }: {
2+
config = lib.mkIf (config.athena.displayManager == "sddm") {
3+
services.displayManager.sddm = {
4+
package = pkgs.kdePackages.sddm;
5+
enable = true;
6+
theme = "sddm-astronaut-theme";
7+
wayland.enable = true;
8+
extraPackages = with pkgs; [
9+
kdePackages.qtsvg
10+
kdePackages.qtmultimedia
11+
kdePackages.qtvirtualkeyboard
12+
];
13+
};
14+
environment.systemPackages = with pkgs; [
15+
(sddm-astronaut.override {
16+
embeddedTheme = "cyberpunk";
17+
})
18+
];
19+
};
20+
}

0 commit comments

Comments
 (0)