From d911acd86e53258c1fc9613b15a7c37d238288d4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 19 Nov 2025 17:56:45 +0100 Subject: [PATCH] asdjkl --- hardware/gpu/cuda-common.nix | 8 ++++---- hardware/gpu/intel.nix | 6 +++--- hardware/gpu/rocm.nix | 4 ++-- profiles/base/locale-no.nix | 4 ++-- profiles/base/nix.nix | 2 +- profiles/desktop/lutris.nix | 4 ++-- profiles/desktop/sound/pipewire.nix | 5 +++-- profiles/desktop/steam.nix | 4 ++-- profiles/sshd/default.nix | 3 ++- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/hardware/gpu/cuda-common.nix b/hardware/gpu/cuda-common.nix index fe74a62..147f8ca 100644 --- a/hardware/gpu/cuda-common.nix +++ b/hardware/gpu/cuda-common.nix @@ -4,12 +4,12 @@ # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/nvidia/prime.nix lib.mkMerge [ -(lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { +(lib.mkIf (lib.versionOlder lib.version "24.11") { hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; }) -(lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { +(lib.mkIf (lib.versionAtLeast lib.version "24.11") { hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; @@ -40,8 +40,8 @@ lib.mkMerge [ ]; } -/* lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { */ -(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { +/* lib.mkIf (lib.versionAtLeast lib.version "24.11") { */ +(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") { programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; # adding "cuda", "opengl" and "nvidia-gpu" ^ overrides the implicit defaults diff --git a/hardware/gpu/intel.nix b/hardware/gpu/intel.nix index 9469fe5..2bca2bb 100644 --- a/hardware/gpu/intel.nix +++ b/hardware/gpu/intel.nix @@ -5,7 +5,7 @@ let intel-media-driver # not added due to collision # https://github.com/NixOS/nixos-hardware/issues/1170 - (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") + (if (lib.versionOlder lib.version "23.11") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl @@ -35,12 +35,12 @@ lib.mkMerge [ }; } -(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionOlder lib.version "24.11") { hardware.opengl.driSupport = true; hardware.opengl.enable = true; hardware.opengl.extraPackages = extraPackages; }) -(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") { hardware.graphics.enable = true; hardware.graphics.extraPackages = extraPackages; }) diff --git a/hardware/gpu/rocm.nix b/hardware/gpu/rocm.nix index 0a77349..ce1b098 100644 --- a/hardware/gpu/rocm.nix +++ b/hardware/gpu/rocm.nix @@ -8,12 +8,12 @@ config = lib.mkMerge [ - (lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { + (lib.mkIf (lib.versionOlder lib.version "24.11") { hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; }) - (lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { + (lib.mkIf (lib.versionAtLeast lib.version "24.11") { hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; }) diff --git a/profiles/base/locale-no.nix b/profiles/base/locale-no.nix index 2596cfc..9894a14 100644 --- a/profiles/base/locale-no.nix +++ b/profiles/base/locale-no.nix @@ -14,11 +14,11 @@ i18n.extraLocaleSettings.LC_TIME = "nb_NO.UTF-8"; console.keyMap = "no"; } -(lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.05") { +(lib.mkIf (lib.versionAtLeast lib.version "24.05") { services.xserver.xkb.layout = "no"; services.xserver.xkb.variant = ""; }) -(lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") { +(lib.mkIf (lib.versionOlder lib.version "24.05") { services.xserver.layout = "no"; services.xserver.xkbVariant = ""; }) diff --git a/profiles/base/nix.nix b/profiles/base/nix.nix index 77645f3..ec7363b 100644 --- a/profiles/base/nix.nix +++ b/profiles/base/nix.nix @@ -62,7 +62,7 @@ lib.mkIf ( pkgs.stdenv.hostPlatform.system == "x86_64-linux" - && (lib.versionOlder (lib.versions.majorMinor lib.version) "25.05") + && (lib.versionOlder lib.version "25.05") ) [ "nixos-test" diff --git a/profiles/desktop/lutris.nix b/profiles/desktop/lutris.nix index c2297ed..2013dce 100644 --- a/profiles/desktop/lutris.nix +++ b/profiles/desktop/lutris.nix @@ -30,13 +30,13 @@ lib.mkMerge [ ]; } -(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionOlder lib.version "24.11") { hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; }) -(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") { hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; diff --git a/profiles/desktop/sound/pipewire.nix b/profiles/desktop/sound/pipewire.nix index ad29bc4..b73508c 100644 --- a/profiles/desktop/sound/pipewire.nix +++ b/profiles/desktop/sound/pipewire.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - hardware.pulseaudio.enable = false; # gnome defaults it to true + services.pulseaudio.enable = false; # gnome defaults it to true #sound.enable = true # alsa? likely conflicts with pipewire #sound.mediaKeys.enable = true # alsa? only enable if headless @@ -21,5 +21,6 @@ # carla # VST (TODO: move into a DAW profile?) # TODO: build broken ]; - security.rtkit.enable = true; # optional + # optional, allows Pipewire to use the realtime scheduler for increased performance. + security.rtkit.enable = true; } diff --git a/profiles/desktop/steam.nix b/profiles/desktop/steam.nix index 293a693..e435c68 100644 --- a/profiles/desktop/steam.nix +++ b/profiles/desktop/steam.nix @@ -82,13 +82,13 @@ lib.mkMerge [ #services.joycond.enable = true; } -(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionOlder lib.version "24.11") { hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; }) -(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { +(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") { hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; diff --git a/profiles/sshd/default.nix b/profiles/sshd/default.nix index a7be93b..95519aa 100644 --- a/profiles/sshd/default.nix +++ b/profiles/sshd/default.nix @@ -1,7 +1,8 @@ +{ lib, ...}: { services.openssh.enable = true; services.openssh.settings.X11Forwarding = true; services.openssh.settings.PasswordAuthentication = false; services.openssh.settings.KbdInteractiveAuthentication = false; - services.fail2ban.enable = true; + services.fail2ban.enable = lib.mkDefault true; }