From 94a1dc2b5411d94aa077505f84f3fe2fe43882da Mon Sep 17 00:00:00 2001 From: Adrian G L Date: Tue, 25 Jun 2024 22:51:48 +0200 Subject: [PATCH] dm fixes --- profiles/desktop.nix | 15 ++++++++------- profiles/sway.nix | 10 ---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 6b559a0..7e1a2e4 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -33,6 +33,9 @@ imports = nerdfonts ubuntu_font_family + + where-is-my-sddm-theme + ]; # Enable CUPS to print documents. @@ -42,9 +45,12 @@ imports = services.displayManager = { enable = true; + sessionPackages = with pkgs; [ sway ]; sddm = { enable = true; + theme = "${pkgs.where-is-my-sddm-theme}"; wayland.enable = true; + wayland.compositor = "kwin"; autoNumlock = true; enableHidpi = true; }; @@ -57,14 +63,9 @@ imports = # Configure keymap in X11 services.xserver.xkb = { - layout = "no"; - variant = ""; + layout = "us,no"; + variant = ","; }; - - - #TODO: add sway with home manager to get proper dotfiles. Possibly in its own sway file. - #TODO: add hyperland. - } diff --git a/profiles/sway.nix b/profiles/sway.nix index 00f36ef..1931b93 100644 --- a/profiles/sway.nix +++ b/profiles/sway.nix @@ -68,16 +68,6 @@ imports = qt.platformTheme = "qt5ct"; - - # Configure keymap in X11 - services.xserver = { - layout = "no"; - xkbVariant = ""; - }; - - - #TODO: add sway config with home manager to get proper dotfiles. - }