fix(build): adapt to xserver.displaymanager path change

Drops redundant options since GNS now defaults to Wayland.
dr460nf1r3 · Apr 12, 2024 · 407869f · 407869f
1 parent 8be9a82
commit 407869f
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 85 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/images/iso.nix b/nixos/images/iso.nix
@@ -13,7 +13,7 @@
   garuda.home-manager.modules = [../../home-manager/desktops.nix];
 
   # CD's may use autologin for convenience
-  services.xserver.displayManager.sddm.settings = {
+  services.displayManager.sddm.settings = {
     Autologin = {
       User = "nixos";
       Session = "plasma";

diff --git a/nixos/modules/locales.nix b/nixos/modules/locales.nix
@@ -6,7 +6,6 @@
 }:
 with lib; let
   cfg = config.dr460nixed.locales;
-  cfgDesktops = config.dr460nixed.desktops;
   de = "de_DE.UTF-8";
   defaultLocale = "en_GB.UTF-8";
   terminus-variant = "120n";
@@ -64,11 +63,5 @@ in {
       font = "${pkgs.terminus_font}/share/consolefonts/ter-${terminus-variant}.psf.gz";
       keyMap = "de";
     };
-
-    # X11 keyboard layout
-    services.xserver.xkb = mkIf cfgDesktops.enable {
-      layout = "de";
-      variant = "";
-    };
   };
 }
diff --git a/nixos/nixos-wsl/nixos-wsl.nix b/nixos/nixos-wsl/nixos-wsl.nix
@@ -31,6 +31,10 @@
   # Required by nixos-wsl
   networking.nftables.enable = lib.mkForce false;
 
+  # Suppress warning about this one having no effect
+  # we ship adblocking capabilities here usually
+  networking.extraHosts = lib.mkForce [];
+
   # Use the newer Docker 24
   virtualisation = {
     docker = {

diff --git a/nixos/tv-nixos/tv-nixos.nix b/nixos/tv-nixos/tv-nixos.nix
@@ -57,11 +57,9 @@
   nixpkgs.config.permittedInsecurePackages = ["electron-24.8.6"];
 
   # Yes, autologin on this one
-  services.xserver.displayManager.sddm.settings = {
-    Autologin = {
-      User = "nico";
-      Session = "plasma";
-    };
+  services.displayManager.sddm.settings.Autologin = {
+    User = "nico";
+    Session = "plasma";
   };
 
   # Provide a reverse proxy for our services

diff --git a/template/nixos/modules/locales.nix b/template/nixos/modules/locales.nix
@@ -6,7 +6,6 @@
 }:
 with lib; let
   cfg = config.dr460nixed.locales;
-  cfgDesktops = config.dr460nixed.desktops;
   de = "de_DE.UTF-8";
   defaultLocale = "en_GB.UTF-8";
   terminus-variant = "120n";
@@ -64,11 +63,5 @@ in {
       font = "${pkgs.terminus_font}/share/consolefonts/ter-${terminus-variant}.psf.gz";
       keyMap = "de";
     };
-
-    # X11 keyboard layout
-    services.xserver.xkb = mkIf cfgDesktops.enable {
-      layout = "de";
-      variant = "";
-    };
   };
 }