summaryrefslogtreecommitdiff
path: root/modules/nixos/traits
diff options
context:
space:
mode:
Diffstat (limited to 'modules/nixos/traits')
-rw-r--r--modules/nixos/traits/24.05-compat.nix19
-rw-r--r--modules/nixos/traits/default.nix2
-rw-r--r--modules/nixos/traits/nvidia.nix2
3 files changed, 1 insertions, 22 deletions
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" ];
};