2023-03-21

2 files changed, 13 insertions, 18 deletions

diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index fe9c794..ea36b91 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -39,7 +39,7 @@ in {
           sd
         ];
 
-        sessionVariables.LOKI_ADDR = "https://loki.${config.networking.domain}";
+        sessionVariables.LOKI_ADDR = "https://loki.shire.net";
       };
 
       accounts.email = {
diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix
index a430294..17fcf03 100644
--- a/modules/nixos/kde.nix
+++ b/modules/nixos/kde.nix
@@ -26,24 +26,19 @@ in {
     };
 
     services.xserver = {
-      desktopManager.plasma5 = {
-        enable = true;
-        excludePackages = with pkgs.plasma5Packages; [
-          elisa
-          gwenview
-          khelpcenter
-          okular
-          print-manager
-        ];
-      };
-      displayManager = {
-        sddm.enable = true;
-
-        # NOTE https://github.com/NixOS/nixpkgs/pull/199881
-        setupCommands = lib.mkForce "";
-      };
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [pinentry-qt];
+    environment = {
+      systemPackages = with pkgs; [pinentry-qt];
+      plasma5.excludePackages = with pkgs.plasma5Packages; [
+        elisa
+        gwenview
+        khelpcenter
+        okular
+        print-manager
+      ];
+    };
   };
 }