system: cleanup deprecated xserver displaManager configs

flake.nix

@@ -125,9 +125,6 @@
           inherit specialArgs;
           modules = common_modules ++ [
             ./hosts/monolith
-            ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
-            ./system/nix-serve.nix
           ];
         };
         double-rainbow = lib.nixosSystem {

hosts/monolith/default.nix

@@ -27,6 +27,8 @@ in
     ./factorio-server.nix
     ./nebula-vpn.nix
     ./minio.nix
+    ./monolith-forgejo-runner.nix
+    ./monolith-gitlab-runner.nix
   ];
   boot.initrd.availableKernelModules = [
     "nvme"

hosts/monolith/monolith-gitlab-runner.nix

@@ -5,7 +5,10 @@
   ...
 }:
 let
-  inherit (pkgs.callPackage ./gitlab-runner.nix { inherit inputs; }) mkNixRunner mkNixRunnerFull;
+  inherit (pkgs.callPackage ../../system/gitlab-runner.nix { inherit inputs; })
+    mkNixRunner
+    mkNixRunnerFull
+    ;
 in
 {
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
@@ -38,23 +41,11 @@ in
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;
 
   sops.secrets = {
-    "gitlab-runners/thoreb-telemetria-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/thoreb-itinerario-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/docker-images-token" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-gitlab-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pk" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pub" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
+    "gitlab-runners/thoreb-telemetria-nix" = { };
+    "gitlab-runners/thoreb-itinerario-nix" = { };
+    "gitlab-runners/docker-images-token" = { };
+    "gitlab-runners/wopus-gitlab-nix" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pk" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pub" = { };
   };
 }

system/gnome.nix

@@ -8,18 +8,16 @@
   options.my.gnome.enable = lib.mkEnableOption { };
 
   config = lib.mkIf config.my.gnome.enable {
-    services.xserver = {
+    services.xserver.enable = true;
+    services.displayManager.gdm.enable = true;
+    services.desktopManager.gnome = {
       enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome = {
-        enable = true;
-        # Enable VRR (Variable Refresh Rate)
-        extraGSettingsOverridePackages = with pkgs; [ mutter ];
-        extraGSettingsOverrides = ''
-          [org.gnome.mutter]
-          experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-        '';
-      };
+      # Enable VRR (Variable Refresh Rate)
+      extraGSettingsOverridePackages = with pkgs; [ mutter ];
+      extraGSettingsOverrides = ''
+        [org.gnome.mutter]
+        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
+      '';
     };
 
     # Workaround for https://github.com/NixOS/nixpkgs/issues/103746

system/kde.nix

@@ -11,8 +11,8 @@
     # Enable the X11 windowing system.
     services.xserver.enable = true;
     # Enable the KDE Desktop Environment.
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
+    services.displayManager.sddm.enable = true;
+    services.desktopManager.plasma6.enable = true;
     # services.xserver.displayManager.autologin.user = "lelgenio";
     programs.dconf.enable = true;
   };

system/nix-serve.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = config.sops.secrets."nix-serve/private-key".path;
-  };
-
-  sops.secrets."nix-serve/private-key" = { };
-}