pederbs/config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

asdjkl

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-11-19 17:56:45 +01:00
parent 1c14c69963
commit d911acd86e
9 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/gpu/cuda-common.nix
View File

@@ -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

6
hardware/gpu/intel.nix
View File

@@ -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;
})

4
hardware/gpu/rocm.nix
View File

@@ -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;
})

4
profiles/base/locale-no.nix
View File

@@ -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 = "";
})

2
profiles/base/nix.nix
View File

@@ -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"

4
profiles/desktop/lutris.nix
View File

@@ -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 ];

5
profiles/desktop/sound/pipewire.nix
View File

@@ -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;
}

4
profiles/desktop/steam.nix
View File

@@ -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 ];

3
profiles/sshd/default.nix
View File

@@ -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;
}