6 files changed, 42 insertions, 88 deletions
diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix
index 790f4ba..b4d4ca3 100644
--- a/modules/darwin/desktop/fonts.nix
+++ b/modules/darwin/desktop/fonts.nix
@@ -15,6 +15,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    fonts.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
+    fonts.packages = [ pkgs.nerd-fonts.fira-code ];
   };
 }
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index 9b634ea..8ca4cae 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -20,16 +20,13 @@ in
       enableDefaultPackages = true;
 
       packages = with pkgs; [
-        (nerdfonts.override {
-          fonts = [
-            "FiraCode"
-            "Hack"
-            "Noto"
-          ];
-        })
         noto-fonts
         noto-fonts-color-emoji
         noto-fonts-cjk-sans
+
+        nerd-fonts.fira-code
+        nerd-fonts.hack
+        nerd-fonts.noto
       ];
 
       fontconfig = {
diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix
index 019e2a8..93505ee 100644
--- a/modules/nixos/desktop/niri/default.nix
+++ b/modules/nixos/desktop/niri/default.nix
@@ -6,70 +6,48 @@
 }:
 let
   cfg = config.desktop.niri;
-
-  inherit (lib) version;
-  minVersion = "24.11";
-  hasNiri = lib.versionAtLeast version minVersion;
 in
 {
   options.desktop.niri = {
     enable = lib.mkEnableOption "Niri desktop settings";
   };
 
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
-        environment = {
-          sessionVariables = {
-            NIXOS_OZONE_WL = "1"; # Niri doesn't have native XWayland support
-          };
-
-          systemPackages = with pkgs; [
-            # Terminal
-            alacritty
-            # Media player
-            celluloid
-            # PDF viewer
-            evince
-            # Application runner
-            fuzzel
-            # Image viewer
-            loupe
-            # Notification daemon
-            mako
-            # Polkit agent
-            pantheon.pantheon-agent-polkit
-            # Screen locker
-            swaylock
-            # Trash manager
-            trashy
-          ];
-        };
+  config = lib.mkIf cfg.enable {
+    environment = {
+      sessionVariables = {
+        NIXOS_OZONE_WL = "1"; # Niri doesn't have native XWayland support
+      };
 
-        services.greetd = {
-          enable = true;
-          settings = {
-            default_session.command = toString [
-              (lib.getExe pkgs.greetd.tuigreet)
-              "--time"
-            ];
-          };
-        };
-      }
+      systemPackages = with pkgs; [
+        # Terminal
+        alacritty
+        # Media player
+        celluloid
+        # PDF viewer
+        evince
+        # Application runner
+        fuzzel
+        # Image viewer
+        loupe
+        # Notification daemon
+        mako
+        # Polkit agent
+        pantheon.pantheon-agent-polkit
+        # Screen locker
+        swaylock
+        # Trash manager
+        trashy
+      ];
+    };
 
-      # TODO: Remove when 24.11 becomes stable
-      (
-        if hasNiri then
-          {
-            programs.niri.enable = true;
-          }
-        else
-          {
-            warnings = [
-              "You have enabled Niri when it is not available on NixOS ${version}. Please upgrade to at least NixOS ${minVersion}"
-            ];
-          }
-      )
-    ]
-  );
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session.command = toString [
+          (lib.getExe pkgs.greetd.tuigreet)
+          "--time"
+        ];
+      };
+    };
+  };
 }
diff --git a/modules/nixos/traits/24.05-compat.nix b/modules/nixos/traits/24.05-compat.nix
deleted file mode 100644
index d275f9c..0000000
--- a/modules/nixos/traits/24.05-compat.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# collection of fun workarounds for the stable branch of nixos
-{ lib, ... }:
-{
-  imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
-    # https://github.com/NixOS/nixpkgs/pull/320228
-    (lib.mkAliasOptionModule
-      [
-        "hardware"
-        "graphics"
-        "extraPackages"
-      ]
-      [
-        "hardware"
-        "opengl"
-        "extraPackages"
-      ]
-    )
-  ];
-}
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index 119b527..a7357ee 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -1,7 +1,5 @@
 {
   imports = [
-    ./24.05-compat.nix # TODO: remove when 24.11 is stable
-
     ./arm-builder.nix
     ./auto-upgrade.nix
     ./containers.nix
diff --git a/modules/nixos/traits/nvidia.nix b/modules/nixos/traits/nvidia.nix
index 6e6fdb5..2ab0f5b 100644
--- a/modules/nixos/traits/nvidia.nix
+++ b/modules/nixos/traits/nvidia.nix
@@ -32,7 +32,7 @@ in
             boot = {
               # required for GSP firmware
               kernelParams = [ "nouveau.config=NvGspRm=1" ];
-              # we want early KMS 
+              # we want early KMS
               # https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
               initrd.kernelModules = [ "nouveau" ];
             };