From 54ec124ae568dac37a11348ce45e6f21737ad556 Mon Sep 17 00:00:00 2001
From: "quentin@aristote.fr" <quentin@aristote.fr>
Date: Sun, 1 Dec 2024 22:36:02 +0100
Subject: nixos: deprecate 24.05

---
 modules/nixos/personal/gui.nix | 37 ++++++++++++-------------------------
 modules/nixos/personal/nix.nix | 13 ++++---------
 modules/nixos/rss-bridge.nix   | 11 +++--------
 3 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/modules/nixos/personal/gui.nix b/modules/nixos/personal/gui.nix
index e313117..3b02b39 100644
--- a/modules/nixos/personal/gui.nix
+++ b/modules/nixos/personal/gui.nix
@@ -48,32 +48,19 @@ in {
       };
     }
     # fragile conf
-    (lib.mkIf cfg.i3.enable (
-      lib.mkMerge [
-        {
-          services = {
-            xserver = {
-              desktopManager.xfce = {
-                noDesktop = true;
-                enableXfwm = false;
-              };
-              windowManager.i3.enable = true;
-            };
+    (lib.mkIf cfg.i3.enable {
+      services = {
+        displayManager.defaultSession = "xfce+i3";
+        libinput.enable = true;
+        xserver = {
+          desktopManager.xfce = {
+            noDesktop = true;
+            enableXfwm = false;
           };
-        }
-        (
-          let
-            conf = {
-              displayManager.defaultSession = "xfce+i3";
-              libinput.enable = true;
-            };
-          in
-            if (builtins.compareVersions lib.trivial.version "23.11" > 0)
-            then {services = conf;}
-            else {services.xserver = conf;}
-        )
-      ]
-    ))
+          windowManager.i3.enable = true;
+        };
+      };
+    })
     (lib.mkIf cfg.stylix.enable ({
         assertions = let
           missingArgAssertion = name: {
diff --git a/modules/nixos/personal/nix.nix b/modules/nixos/personal/nix.nix
index 1236357..773c595 100644
--- a/modules/nixos/personal/nix.nix
+++ b/modules/nixos/personal/nix.nix
@@ -73,20 +73,15 @@ in {
           path = [pkgs.git];
           personal.monitor = true;
         };
-        nixos-upgrade = let
-          priorize =
-            if (builtins.compareVersions lib.trivial.version "24.11" > 0)
-            then x: x
-            else lib.mkForce;
-        in {
+        nixos-upgrade = {
           preStart = "${pkgs.host}/bin/host firecat53.net"; # Check network connectivity
           serviceConfig = {
             Restart = "on-failure";
-            RestartSec = priorize "120";
+            RestartSec = lib.mkForce "120";
           };
           unitConfig = {
-            StartLimitIntervalSec = priorize 600;
-            StartLimitBurst = priorize 2;
+            StartLimitIntervalSec = lib.mkForce 600;
+            StartLimitBurst = lib.mkForce 2;
           };
           after = ["flake-update.service"];
           wants = ["flake-update.service"];
diff --git a/modules/nixos/rss-bridge.nix b/modules/nixos/rss-bridge.nix
index 3aec1c1..a6fcdb7 100644
--- a/modules/nixos/rss-bridge.nix
+++ b/modules/nixos/rss-bridge.nix
@@ -41,14 +41,9 @@ in {
     };
   };
 
-  config.services.rss-bridge = let
-    whitelist =
-      lib.mkIf cfg.enable
-      (map (bridge: bridge.name) cfg.extraBridges);
-  in
-    if builtins.compareVersions lib.trivial.version "23.11" <= 0
-    then {inherit whitelist;}
-    else {config.system.enabled_bridges = whitelist;};
+  config.services.rss-bridge.config.system.enabled_bridges =
+    lib.mkIf cfg.enable
+    (map (bridge: bridge.name) cfg.extraBridges);
   config.services.nginx = lib.mkIf (cfg.virtualHost != null) {
     virtualHosts.${cfg.virtualHost}.root =
       lib.mkIf (cfg.extraBridges != [])
-- 
cgit v1.2.3