Merge branch 'trunk' of ssh://git.subsonics.nl:2222/andreas/nixos-config into trunk

wip - buildable state
bump kernel
2026-03-22 03:04:37 +01:00 · 2026-03-17 02:36:26 +01:00 · 2026-03-16 16:26:48 +01:00
12 changed files with 86 additions and 136 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1774186997,
-        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
+        "lastModified": 1772290697,
+        "narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
+        "rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
        "type": "github"
      },
      "original": {
@@ -46,11 +46,11 @@
    "cachyos-kernel": {
      "flake": false,
      "locked": {
-        "lastModified": 1776608760,
-        "narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=",
+        "lastModified": 1773425695,
+        "narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=",
        "owner": "CachyOS",
        "repo": "linux-cachyos",
-        "rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a",
+        "rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628",
        "type": "github"
      },
      "original": {
@@ -62,11 +62,11 @@
    "cachyos-kernel-patches": {
      "flake": false,
      "locked": {
-        "lastModified": 1776680283,
-        "narHash": "sha256-wSHtct0KwbhFh9xYYp1ABaBsHE/K/1+oyrqHbIdiWFE=",
+        "lastModified": 1773430072,
+        "narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=",
        "owner": "CachyOS",
        "repo": "kernel-patches",
-        "rev": "21c93f820124a8e7046f1e358739e1a14f6b700b",
+        "rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a",
        "type": "github"
      },
      "original": {
@@ -196,11 +196,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -313,11 +313,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776777932,
-        "narHash": "sha256-0R3Yow/NzSeVGUke5tL7CCkqmss4Vmi6BbV6idHzq/8=",
+        "lastModified": 1773681856,
+        "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5d5640599a0050b994330328b9fd45709c909720",
+        "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
        "type": "github"
      },
      "original": {
@@ -334,11 +334,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776184304,
-        "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
+        "lastModified": 1773422513,
+        "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
+        "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056",
        "type": "github"
      },
      "original": {
@@ -382,11 +382,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1776710308,
-        "narHash": "sha256-rrdCcEXukj2CDjsiOVPYb9LpTKzB89sIicBqoOBK3Xs=",
+        "lastModified": 1773597464,
+        "narHash": "sha256-3SVrc1AMkY1UE36MD4qvmTkY/ZToK2F55Afut5Qm5F8=",
        "owner": "xddxdd",
        "repo": "nix-cachyos-kernel",
-        "rev": "8c8219b1f4822932baea710948da7963f50e9739",
+        "rev": "30468236d5cdd9cb5dea6e757159e04816439146",
        "type": "github"
      },
      "original": {
@@ -404,11 +404,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776692876,
-        "narHash": "sha256-7Q05rUgwbkJnjxIJyi8bHUG+XnyZqLxFJz7c8RncpeU=",
+        "lastModified": 1773603777,
+        "narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "51b302c28dbf904a5c341be005eebe0779cf4f16",
+        "rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7",
        "type": "github"
      },
      "original": {
@@ -436,11 +436,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1774748309,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
        "type": "github"
      },
      "original": {
@@ -451,11 +451,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1776635459,
-        "narHash": "sha256-3UVWm751p/8VAY1Mq+DgSTCv9HpMmdB2byhnRrVKflk=",
+        "lastModified": 1773563071,
+        "narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8d8538e67e516362d9d09ee5d3ce73dce944612b",
+        "rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae",
        "type": "github"
      },
      "original": {
@@ -467,11 +467,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1776548001,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "lastModified": 1773646010,
+        "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
        "type": "github"
      },
      "original": {
@@ -591,11 +591,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776771786,
-        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+        "lastModified": 1773698643,
+        "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=",
        "owner": "mic92",
        "repo": "sops-nix",
-        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+        "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044",
        "type": "github"
      },
      "original": {
@@ -658,11 +658,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776790993,
-        "narHash": "sha256-TxDU/PFKoOYm+ncWXyI2vurKQPqu54gMlCRzx5sGnZc=",
+        "lastModified": 1773695806,
+        "narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "3f4f36b17ceeda27fc4953e8bc29637333508c05",
+        "rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3",
        "type": "github"
      },
      "original": {
--- a/modules/nixos/desktop-environment/default.nix
+++ b/modules/nixos/desktop-environment/default.nix
@@ -55,19 +55,8 @@ in {
      services.displayManager.autoLogin.enable = false;
      networking.firewall.allowedTCPPorts = [ 
        3389 
-        3390
+        3390 
      ];
-
-      # users.users.andreas.extraGroups = [ "sambashare" ];    
-      # Enable Avahi (mDNS/DNS-SD) for discovery
-      services.avahi = {
-        enable = true;
-        nssmdns4 = true;
-        openFirewall = true;
-      };
-      # Enable GNOME sharing services
-      services.gnome.gnome-user-share.enable = true;
-
      environment.systemPackages = with pkgs; [
        gnome-tweaks
        gnome-software
--- a/modules/nixos/steam/default.nix
+++ b/modules/nixos/steam/default.nix
@@ -52,15 +52,14 @@
        "-r" "172"
        "-e" # Enable steam integration
        "--steam"
-        "--prefer-outpout DP-4"
        "--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
      ];
      env = {
-        # WLR_RENDERER = "vulkan";
-        # DXVK_HDR = "0 ";
-        # ENABLE_GAMESCOPE_WSI = "0";
-        # WINE_FULLSCREEN_FSR = "1";
-        # SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
+        WLR_RENDERER = "vulkan";
+        DXVK_HDR = "0 ";
+        ENABLE_GAMESCOPE_WSI = "0";
+        WINE_FULLSCREEN_FSR = "1";
+        SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
      };
    };
    
@@ -72,7 +71,7 @@
        ];
        extraEnv = {
          # SDL_VIDEODRIVER = "wayland,x11";
-          # SDL_VIDEODRIVER = "x11,wayland";
+          SDL_VIDEODRIVER = "x11";
        };
      };
      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
--- a/overlays/libvirt-python313-fix/default.nix
+++ b/overlays/libvirt-python313-fix/default.nix
@@ -0,0 +1,28 @@
+{ ... }:
+
+final: prev:
+let
+  python313ForCeph =
+    let
+      base = final.python313;
+    in
+    base
+    // {
+      override = args:
+        base.override (args // {
+          packageOverrides = self: super:
+            (if args ? packageOverrides then args.packageOverrides self super else { })
+            // {
+              # Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13.
+              cython_0 = super.cython;
+            };
+        });
+    };
+in {
+  # Work around nixos-unstable eval failure:
+  # sphinx-9.1.0 not supported for interpreter python3.11
+  # (seen through libvirtd -> qemu_full -> ceph Python dependency chain).
+  ceph = prev.ceph.override {
+    python311 = python313ForCeph;
+  };
+}
--- a/overlays/mesa-gcc/default.nix
+++ b/overlays/mesa-gcc/default.nix
@@ -1,38 +0,0 @@
-{ ... }:
-
-final: prev: {
-  mesa = (prev.mesa.overrideAttrs (old: rec {
-    version = "git-unstable-2026-04-02";
-    src = prev.fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      owner = "mesa";
-      repo = "mesa";
-      rev = "72e9f9a760a5dd81a74497f1daef054af1b6b827";
-      hash = "sha256-81V5RdLSLYeGJ/wh5H8L6vq+QdR6yMkJxDV+6Yf5FPk=";
-    };
-    patches = [];
-    buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [ 
-      clang-unwrapped
-      libclang
-    ]);
-    
-    # Create symlinks to clang libraries so meson can find them
-    preConfigure = (old.preConfigure or "") + ''
-      mkdir -p $NIX_BUILD_TOP/clang-libs
-      for lib in ${prev.llvmPackages_21.clang-unwrapped.lib}/lib/*.a; do
-        ln -sf "$lib" "$NIX_BUILD_TOP/clang-libs/"
-      done
-      export LIBRARY_PATH="$NIX_BUILD_TOP/clang-libs:''${LIBRARY_PATH:-}"
-      export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-    '';
-    
-    mesonFlags = 
-      (builtins.filter (flag: 
-        !(prev.lib.hasPrefix "-Dclang-libdir=" flag) &&
-        flag != "--sysconfdir=/etc"
-      ) old.mesonFlags) ++ [
-      "-Dsysconfdir=${placeholder "out"}/etc"
-    ] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
-  }));
-}
-
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -139,7 +139,7 @@
    ntfs3g
    htop
    rivalcfg
-    blender
+    
    reaper
    discord
    betterdiscordctl
@@ -171,7 +171,9 @@
  virtualisation.libvirtd = {
    enable = true;
    qemu = {
-      package = pkgs.qemu;
+      package = pkgs.qemu_full.override {
+        cephSupport = false;
+      };
      runAsRoot = true;
      swtpm.enable = true;
      vhostUserPackages = [ pkgs.virtiofsd ];
@@ -194,14 +196,13 @@
  # Enable the OpenSSH daemon.
  services.openssh.enable = true;

-  # Open ports in the .
+  # Open ports in the firewall.
  networking.firewall.allowedTCPPorts = [
    24800 #Synergy
    53317 #localsend
    3390 #rdp
    9090
    8000
-    40122
  ];
  networking.firewall.allowedUDPPorts = [
    24800 #Synergy
@@ -209,7 +210,6 @@
    3390 #rdp
    9090
    8000
-    40122
  ];
  networking.firewall.trustedInterfaces = [ "virbr0" ];
  networking.nat = {
@@ -233,8 +233,7 @@
      }
    ];
  };
-  services.mullvad-vpn.enable = true;
-  services.mullvad-vpn.package = pkgs.mullvad-vpn;
+
  # Or disable the firewall altogether.
  # networking.firewall.enable = false;

--- a/systems/x86_64-linux/drivebystation-nix/default.nix
+++ b/systems/x86_64-linux/drivebystation-nix/default.nix
@@ -45,7 +45,6 @@ in
      my-namespace.desktop-environment.xfce.enable = true;
      my-namespace.desktop-environment.gnome.enable = true;
      my-namespace.desktop-environment.kde.enable = true;
-      my-namespace.desktop-environment.hyprland.enable = true;
      my-namespace.desktop-environment.cosmic.enable = true;
      my-namespace.performance-tuning.enable = true;
      my-namespace.file-organization.enable = true;
--- a/systems/x86_64-linux/drivebystation-nix/hardware/acer-monitor-edid.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/acer-monitor-edid.nix
@@ -1,9 +1,7 @@
 { config, lib, pkgs, ... }:
 {
  # boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
-  boot.kernelParams = [ 
-    "drm.edid_firmware=DP-2:edid/edid.bin,DP-4:edid/edid.bin" 
-  ];
+  boot.kernelParams = [ "drm.edid_firmware=DP-2:edid/edid.bin" ];


  hardware.firmware = [
--- a/systems/x86_64-linux/drivebystation-nix/hardware/firmware/KG271-edid.bin
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/firmware/KG271-edid.bin
--- a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix
@@ -27,7 +27,7 @@
    "module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
  ];
  services.switcherooControl.enable = true;
-  # environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
+  environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
  hardware.intel-gpu-tools.enable = true;
  hardware.graphics = {
    enable = true;
@@ -53,13 +53,6 @@
    "nvidia_uvm"
  ];

-  # Mark Arc B580 as a discrete Intel GPU for switcheroo-control and
-  # keep runtime PCI power management enabled for the device.
-  services.udev.extraRules = ''
-    ACTION=="add|bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xe20b", TEST=="power/control", ATTR{power/control}="auto"
-    SUBSYSTEM=="drm", DRIVERS=="xe", ATTRS{vendor}=="0x8086", ATTRS{device}=="0xe20b", TAG+="switcheroo-discrete-gpu"
-  '';
-
  environment.variables = {
    # Force Intel GPU for all graphics operations
    KWIN_DRM_DEVICES = "/dev/dri/card0";
@@ -127,7 +120,4 @@
    clinfo
    vulkan-tools
  ];
-  services.xserver.deviceSection = ''
-    Option "TearFree" "false"
-  '';
 }
--- a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/passthrough_nvidia.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/passthrough_nvidia.nix
@@ -17,23 +17,9 @@
  boot.extraModprobeConfig = ''
    options vfio-pci ids=10de:1b81,10de:10f0
  '';
-  boot.initrd.systemd = {
-    enable = true;
-    services.initrd-vfio-pci-nvidia = {
-      description = "vfio-pci predevice init";
-      wantedBy = [ "initrd.target" ];
-      # Match 'preDeviceCommands' by running early
-      before = [ "sysroot.mount" ]; 
-      
-      unitConfig.DefaultDependencies = "no";
-      serviceConfig.Type = "oneshot";
-      
-      # Place your original shell commands here
-      script = ''
-        modprobe vfio-pci
-      '';
-    };
-  };
+  boot.initrd.preDeviceCommands = ''
+    modprobe vfio-pci
+  '';
  # # EARLY and deterministic binding
  # boot.initrd.preDeviceCommands = ''
  #   echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind
--- a/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix
@@ -33,7 +33,7 @@

    serviceConfig = {
      Type = "oneshot";
-      ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp10s0 eee off";
+      ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp75s0 eee off";
      RemainAfterExit = true;
    };
  };
Author	SHA1	Message	Date
Andreas Schaafsma	cb986e30b2	Merge branch 'trunk' of ssh://git.subsonics.nl:2222/andreas/nixos-config into trunk	2026-03-22 03:04:37 +01:00
Andreas Schaafsma	aa20fba049	wip - buildable state	2026-03-17 02:36:26 +01:00
Andreas Schaafsma	f28cacad75	bump kernel	2026-03-16 16:26:48 +01:00