transition to nixos stable

update millennium
module for recovering shitty realtek controller when it gets stuck in bugged power state
2026-10-17 06:50:58 +02:00 · 2026-10-15 15:08:12 +02:00 · 2026-10-15 10:48:08 +02:00 · 2026-10-15 08:52:31 +02:00 · 2026-09-30 19:54:22 +02:00 · 2026-09-30 19:53:54 +02:00
14 changed files with 508 additions and 106 deletions
@@ -0,0 +1,61 @@
+# NixOS configuration
+
+The default package set is NixOS 26.05. Home Manager and AAGL use their
+matching 26.05 release branches. `drivebystation-nix` uses the standard
+`pkgs.linuxPackages` kernel from stable, including matching external modules.
+
+## Packages from unstable
+
+`inputs.nixpkgs-unstable` is a separate package set, pinned in `flake.lock`.
+Select individual applications explicitly, as with Trilium and JetBrains
+Toolbox in the desktop host:
+
+```nix
+unstablePkgs.trilium-desktop
+```
+
+The host defines `unstablePkgs` by importing the separate input with
+`allowUnfree = true`. Use `pkgs.<name>` for stable packages. Unstable
+applications retain their own dependencies; the system package set stays on
+stable.
+
+Update the stable inputs and the application exceptions independently:
+
+```sh
+nix flake update nixpkgs home-manager aagl
+nix flake update nixpkgs-unstable
+```
+
+The existing Mutter tearing override remains experimental. Its compatibility
+and B580 graphics behavior require testing when changing the desktop stack.
+
+## Validate and boot
+
+```sh
+nix build .#nixosConfigurations.drivebystation-nix.config.system.build.toplevel --no-link
+sudo nixos-rebuild boot --flake .#drivebystation-nix
+```
+
+Only run the boot command after the build succeeds. Keep the previous working
+generation available in the boot menu, then test networking, graphics, and
+the webcam loopback after reboot. Git restores configuration sources; booting
+the previous generation restores the previous system closure.
+
+Whole-flake checks currently also evaluate an unfinished WSL host referencing
+the disabled `nixos-wsl` input. Validate the desktop target directly until that
+separate host configuration is repaired.
+
+## Migration validation (2026-10-17)
+
+The complete `drivebystation-nix` system built successfully without activation.
+Its closure contains Linux 6.18.56, patched Mutter 50.5, GNOME Shell 50.5,
+libdrm 2.4.133, r8125 9.016.01, and v4l2loopback 0.15.3. The explicit unstable
+applications are Trilium 0.106.0 and JetBrains Toolbox 3.8.1.88030.
+
+Nix syntax and Git whitespace checks pass. `nix flake check --no-build` stops
+at the existing WSL input error described above. The edited Nix files retain
+the repository's existing formatting; `nixpkgs-fmt --check` reports formatting
+differences, including on the original flake before migration.
+
+Boot, networking, B580 graphics, and tearing behavior still require runtime
+testing. The migration does not add Intel tearing kernel patches.
@@ -60,15 +60,16 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1787517695,
-        "narHash": "sha256-Z119G3qLJx22frNHO3/seMs7fCCvxe9NJJRfN4Jadew=",
+        "lastModified": 1789138195,
+        "narHash": "sha256-cvK9QXAzcgYYg6WsMSfzSE78QyCbNoRMF25GIZ0pz1s=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "4bb57072d963aa47f14894383a5560cf290e296a",
+        "rev": "decd5655d94eec05b6d5beacb9a652f8ca95344e",
        "type": "github"
      },
      "original": {
        "owner": "ezKEa",
+        "ref": "release-26.05",
        "repo": "aagl-gtk-on-nix",
        "type": "github"
      }
@@ -90,6 +91,27 @@
        "type": "github"
      }
    },
+    "codex-desktop": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791562553,
+        "narHash": "sha256-uyLpIxJv9lqy1pgGUd0C/RZvqWyFqbwR0Tq7E+UX0VM=",
+        "owner": "ilysenko",
+        "repo": "codex-desktop-linux",
+        "rev": "443cb5d52ed781cac6cc7083780abb058cf93678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ilysenko",
+        "repo": "codex-desktop-linux",
+        "type": "github"
+      }
+    },
    "crane": {
      "locked": {
        "lastModified": 1781825982,
@@ -138,22 +160,6 @@
      }
    },
    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1650374568,
@@ -169,34 +175,16 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1788306937,
-        "narHash": "sha256-lbrI1UYVpFgKSsyrU9oeF7FHfnu8nLD9ja0ou9f2rxk=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f16b25b8c3d2809b87925d0b76652d7821a75c68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -207,7 +195,7 @@
    },
    "flake-utils-plus": {
      "inputs": {
-        "flake-utils": "flake-utils"
+        "flake-utils": "flake-utils_2"
      },
      "locked": {
        "lastModified": 1715533576,
@@ -224,6 +212,24 @@
        "type": "github"
      }
    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@@ -270,15 +276,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1788355065,
-        "narHash": "sha256-gAz5oTI7ur34CfuakQduiQd/2ZhO62Bn2XXg08nZYYQ=",
+        "lastModified": 1791938526,
+        "narHash": "sha256-yNYK2pdk3bCtJrpblrNYA6hZKdybWUeyTtx74+OEJFo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d9d750e4fc11c10cab2da677bdd31e427f3a3a71",
+        "rev": "32904dfe1cf86039f3c8c9f41f94e1cfd76dbb34",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -362,65 +369,86 @@
        "type": "github"
      }
    },
-    "nix-cachyos-kernel": {
+    "millennium": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
+        "millennium-src": "millennium-src",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-bun": "nixpkgs-bun"
      },
      "locked": {
-        "lastModified": 1788379544,
-        "narHash": "sha256-EMfRomvn1lAErvY/Q3bQL+PwEi+5hbBwI0ZI5SRC/WM=",
-        "owner": "xddxdd",
-        "repo": "nix-cachyos-kernel",
-        "rev": "d1c3cadc796061778cf7f62bdbfaf68cf3c3c654",
+        "dir": "packages/nix",
+        "lastModified": 1792022604,
+        "narHash": "sha256-xyl3KTB+j4W3dAxQVSolNJCQZOasDnCLB3Dr14adBmU=",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "22af2f453777a925fb398a3dab60a407e66aa83f",
        "type": "github"
      },
      "original": {
-        "owner": "xddxdd",
-        "ref": "release",
-        "repo": "nix-cachyos-kernel",
+        "dir": "packages/nix",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "type": "github"
+      }
+    },
+    "millennium-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1791947497,
+        "narHash": "sha256-sNpoyJ+IjrTiDGfX2QiKVg4jkrJR7n9PdBeOYJSS4n8=",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "401d532543a0fbff469653ccba802bdd7e45f861",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "401d532543a0fbff469653ccba802bdd7e45f861",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1788329703,
-        "narHash": "sha256-fHvRW4JUchuw6QNzQ50BfzeYe0TnjKml1V8PVRjntSI=",
+        "lastModified": 1791883866,
+        "narHash": "sha256-yvkDdToRZ4IgPc9tSBzzCYJvTLf8n5eE3rgUkpCuD5A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "090e478bd64824e2122328df47a7efb74fdaf0c1",
+        "rev": "a033e66ab94a6bedf2c3d58d93a36319d3cbbbaf",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs-lib": {
+    "nixpkgs-bun": {
      "locked": {
-        "lastModified": 1788057806,
-        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
+        "lastModified": 1790822859,
+        "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1788179007,
-        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
+        "lastModified": 1791956154,
+        "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
+        "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044",
        "type": "github"
      },
      "original": {
@@ -430,7 +458,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
      "locked": {
        "lastModified": 1789286504,
        "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
@@ -489,10 +517,13 @@
    "root": {
      "inputs": {
        "aagl": "aagl",
+        "codex-desktop": "codex-desktop",
        "home-manager": "home-manager",
        "lanzaboote": "lanzaboote",
-        "nix-cachyos-kernel": "nix-cachyos-kernel",
-        "nixpkgs": "nixpkgs_2",
+        "millennium": "millennium",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "simple-wallpaper-engine": "simple-wallpaper-engine",
        "snowfall-lib": "snowfall-lib",
        "sops-nix": "sops-nix",
        "wallpaperengine": "wallpaperengine",
@@ -507,11 +538,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1785476452,
-        "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
+        "lastModified": 1785907205,
+        "narHash": "sha256-Ds1vTi53af4wDMAveSR/K0JnywDslLwmgwhVIiwnNmY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
+        "rev": "c5cb13481d718fac906aa9cfd85f9b60e1a546cb",
        "type": "github"
      },
      "original": {
@@ -541,9 +572,30 @@
        "type": "github"
      }
    },
+    "simple-wallpaper-engine": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1772136897,
+        "narHash": "sha256-2RBgZWq80zXVWyOswUlDaoRZtaeT6pBkbNCLdAzLYoY=",
+        "owner": "Maxnights",
+        "repo": "simple-linux-wallpaperengine-gui",
+        "rev": "43ae644754a0a5e96c8ddb9077843643b74f9acc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Maxnights",
+        "repo": "simple-linux-wallpaperengine-gui",
+        "type": "github"
+      }
+    },
    "snowfall-lib": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
        "flake-utils-plus": "flake-utils-plus",
        "nixpkgs": [
          "nixpkgs"
@@ -615,6 +667,54 @@
        "type": "github"
      }
    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "wallpaperengine": {
      "inputs": {
        "Catch2": "Catch2",
@@ -624,13 +724,13 @@
        "glslang-WallpaperEngine": "glslang-WallpaperEngine",
        "json": "json",
        "kissfft": "kissfft",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
        "quickjs": "quickjs",
        "stb": "stb"
      },
      "locked": {
-        "lastModified": 1789783126,
-        "narHash": "sha256-z6rSxx9Hz68EEJ1suug52MO/PQhMGPamSwX0FmMDgx4=",
+        "lastModified": 1790172262,
+        "narHash": "sha256-gTnF4besYxSEFx0GTA35+/k81nE7WwvTIyJbIs1p20k=",
        "path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine",
        "type": "path"
      },
@@ -3,7 +3,9 @@

  inputs = {
    # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Use nixos-unstable for latest kernel and packages
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
+    # Application exceptions; keep the system and graphics stack on stable.
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    # nixos-wsl = {
    #   url = "github:nix-community/NixOS-WSL/main";
    #   inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +29,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    # anikki = {
@@ -43,11 +45,22 @@
    #   inputs.nixpkgs.follows = "nixpkgs";
    # };
    aagl = {
-      url = "github:ezKEa/aagl-gtk-on-nix";
+      url = "github:ezKEa/aagl-gtk-on-nix/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
    wallpaperengine.url = "path:/home/andreas/Projects/linwallpaap/linux-wallpaperengine";
+    simple-wallpaper-engine = {
+      url = "github:Maxnights/simple-linux-wallpaperengine-gui";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    millennium = {
+      url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    codex-desktop = {
+      url = "github:ilysenko/codex-desktop-linux";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = inputs:
@@ -88,9 +101,7 @@
      src = ./.;
      
      overlays = with inputs; [
-        # Use the exact kernel versions as defined in this repo.
-        # Guarantees you have binary cache.
-        nix-cachyos-kernel.overlays.pinned
+        inputs.millennium.overlays.default
      ];
      
      nixos = with inputs; [
@@ -6,6 +6,15 @@
 }:
 let
  inherit (lib.my-namespace) enabled;
+  system = pkgs.stdenv.hostPlatform.system;
+  simpleWallpaperEngine =
+    inputs.simple-wallpaper-engine.packages.${system}.default.override {
+      # The upstream GUI package otherwise puts nixpkgs' unmodified
+      # linux-wallpaperengine in its wrapped PATH.
+      pkgs = pkgs // {
+        linux-wallpaperengine = inputs.wallpaperengine.packages.${system}.default;
+      };
+    };
 in
 {
  imports = [
@@ -29,13 +38,19 @@ in
      pkgs.hyfetch
      pkgs.libreoffice
      pkgs.localsend
+      simpleWallpaperEngine
      # pkgs.vesktop
      pkgs.obsidian
      inputs.zen-browser.packages.x86_64-linux.default    
      # inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default # Archived.
    ];
  };
-  
+  xdg.autostart = {
+    enable = true;
+    entries = [
+      "${simpleWallpaperEngine}/share/applications/simple-wallpaper-engine-autostart.desktop"
+    ];
+  };
  # Auto-start linux-wallpaperengine for dual monitors via XDG autostart
  # xdg.configFile."autostart/linux-wallpaperengine.desktop".text = ''
  #   [Desktop Entry]
@@ -83,9 +83,11 @@ in {

      environment.systemPackages = with pkgs; [
        gnome-tweaks
+        ptyxis
        gnome-software
        gnomeExtensions.pop-shell
        gnome-remote-desktop
+        dconf-editor
        glib-networking # Required gnome-remote-desktop dependency
      ];
      systemd.user.services.gnome-remote-desktop.environment = {
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
+let
+  cfg = config.${namespace}.distrobox;
+in
+{
+  options.${namespace}.distrobox = {
+    enable = lib.mkEnableOption "Distrobox with a Podman container backend";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.distrobox ];
+
+    virtualisation.podman.enable = true;
+  };
+}
@@ -43,7 +43,7 @@ in
          age
          wget
          sops
-          # bitwarden-desktop #replaced bitwarden
+          bitwarden-desktop #replaced bitwarden
          bitwarden-cli
          cowsay
          remmina
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, namespace, ... }:
+let
+  cfg = config.${namespace}.rtl8125-recovery;
+  recovery = pkgs.writeShellApplication {
+    name = "rtl8125-recover";
+    runtimeInputs = with pkgs; [ coreutils gnugrep pciutils ethtool systemd ];
+    text = builtins.readFile ./recover.sh;
+  };
+in {
+  options.${namespace}.rtl8125-recovery = {
+    enable = lib.mkEnableOption "RTL8125 PCI recovery after boot and resume";
+    pciAddress = lib.mkOption {
+      type = lib.types.str;
+      default = "0000:0a:00.0";
+      description = "PCI address of the onboard RTL8125 controller.";
+    };
+    bridgeAddress = lib.mkOption {
+      type = lib.types.str;
+      default = "0000:06:03.0";
+      description = "Immediate parent PCI bridge of the controller.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.rtl8125-recovery = {
+      description = "Recover RTL8125 from failed PCI power restoration";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "NetworkManager.service" ];
+      environment = {
+        NIC_PCI = cfg.pciAddress;
+        NIC_BRIDGE = cfg.bridgeAddress;
+      };
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = lib.getExe recovery;
+        TimeoutStartSec = "90s";
+        StateDirectory = "rtl8125-recovery";
+        StateDirectoryMode = "0700";
+        UMask = "0077";
+      };
+    };
+
+    # sleep.target is stopped after resume. Queue recovery separately so its
+    # grace period does not hold up the sleep transaction or user sessions.
+    systemd.services.rtl8125-resume = {
+      description = "Queue RTL8125 recovery after waking";
+      wantedBy = [ "sleep.target" ];
+      before = [ "sleep.target" ];
+      unitConfig.StopWhenUnneeded = true;
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.coreutils}/bin/true";
+        ExecStop = "${pkgs.systemd}/bin/systemctl --no-block start rtl8125-recovery.service";
+      };
+    };
+  };
+}
@@ -0,0 +1,89 @@
+# Called once after boot or resume. No network access is required.
+set -euo pipefail
+nic="/sys/bus/pci/devices/$NIC_PCI"
+bridge="/sys/bus/pci/devices/$NIC_BRIDGE"
+log() { echo "rtl8125-recovery: $*"; }
+
+# Let normal PCI and network resume finish before diagnosing anything.
+sleep 10
+if [[ ! -d "$bridge" ]]; then
+    log "Parent bridge $NIC_BRIDGE is absent; refusing recovery."
+    exit 1
+fi
+if [[ $(cat "$bridge/vendor") != 0x1022 || $(cat "$bridge/device") != 0x43f5 ]]; then
+    log "Parent bridge identity changed; refusing recovery."
+    exit 1
+fi
+
+if [[ -d "$nic" ]]; then
+    if [[ $(cat "$nic/vendor") != 0x10ec || $(cat "$nic/device") != 0x8125 ]]; then
+        log "Device at $NIC_PCI is not an RTL8125; refusing recovery."
+        exit 1
+    fi
+    if [[ $(dirname "$(readlink -f "$nic")") != "$(readlink -f "$bridge")" ]]; then
+        log "NIC is no longer directly below the configured bridge; refusing recovery."
+        exit 1
+    fi
+    power=$(cat "$nic/power_state")
+    command=$(timeout 5 setpci -s "$NIC_PCI" COMMAND 2>/dev/null || true)
+    # Both memory decoding and bus mastering should be enabled on this host.
+    # Disconnected cables do not disable these PCI command bits.
+    if [[ "$power" != D3cold && "$command" =~ ^[[:xdigit:]]{4}$ ]] &&
+        (( (16#$command & 6) == 6 )); then
+        log "PCI state healthy ($power, COMMAND=$command); no recovery needed."
+        exit 0
+    fi
+    # An administratively disabled NIC should not be automatically reset.
+    netdirs=("$nic"/net/*)
+    if [[ -e "${netdirs[0]}/flags" ]]; then
+        flags=$(cat "${netdirs[0]}/flags")
+        if (( (flags & 1) == 0 )); then
+            log "Interface is administratively down; leaving it alone."
+            exit 0
+        fi
+    fi
+    log "Failed PCI state: power=$power COMMAND=$command."
+else
+    log "NIC missing; attempting one rescan of its known bridge."
+fi
+
+# Retain evidence from the latest failure without accumulating unlimited logs.
+evidence="${STATE_DIRECTORY:-/var/lib/rtl8125-recovery}/last-failure.log"
+mkdir -p "$(dirname "$evidence")"
+{
+    date -Is
+    timeout 5 lspci -s "$NIC_PCI" -vv || true
+    timeout 5 lspci -s "$NIC_BRIDGE" -vv || true
+    journalctl -b -k --since '10 minutes ago' -n 250 --no-pager || true
+} > "$evidence" 2>&1
+
+# This is the remove/rescan recovery that worked on this machine. Never reset
+# or remove the parent bridge, which could affect other hardware.
+if [[ -d "$nic" ]]; then
+    echo 1 > "$nic/remove"
+fi
+echo 1 > "$bridge/rescan"
+
+for ((attempt=0; attempt<20; attempt++)); do
+    netdirs=("$nic"/net/*)
+    if [[ -e "${netdirs[0]}/ifindex" ]]; then
+        iface=$(basename "${netdirs[0]}")
+        power=$(cat "$nic/power_state")
+        command=$(timeout 5 setpci -s "$NIC_PCI" COMMAND 2>/dev/null || true)
+        if [[ "$power" == D0 && "$command" =~ ^[[:xdigit:]]{4}$ ]] &&
+            (( (16#$command & 6) == 6 )); then
+            # NetworkManager also reapplies the saved profile. Explicitly
+            # restore WoL here so recovery does not depend on its timing.
+            ethtool -s "$iface" wol g
+            if ! ethtool "$iface" | grep -Eq '^[[:space:]]*Wake-on: g$'; then
+                log "PCI recovered, but magic-packet WoL could not be confirmed."
+                exit 1
+            fi
+            log "Recovered $iface in D0; magic-packet WoL enabled. Evidence: $evidence"
+            exit 0
+        fi
+    fi
+    sleep 1
+done
+log "Recovery did not restore operational PCI state; no further attempt this invocation."
+exit 1
@@ -43,7 +43,14 @@

    hardware.uinput.enable = true;
    users.users.andreas.extraGroups = [ "input" ];
-    
+    # Explicitly register the desktop MIME scheme handler
+    xdg.mime = {
+      enable = true;
+      defaultApplications = {
+        "x-scheme-handler/steam" = [ "steam.desktop" ];
+        "x-scheme-handler/steamlink" = [ "steam.desktop" ];
+      };
+    };
    programs.gamescope.enable = true;
    programs.steam.gamescopeSession = {
      enable = true;
@@ -67,7 +74,7 @@
    
    programs.steam = {
      enable = true;
-      package = pkgs.steam.override {
+      package = pkgs.millennium-steam.override {
        extraPkgs = pkgs: with pkgs; [
          gamemode
          noto-fonts-color-emoji
@@ -15,6 +15,9 @@
  ];


+  # Use the default kernel maintained by the stable nixpkgs release.
+  boot.kernelPackages = pkgs.linuxPackages;
+
  # Bootloader.
  # boot.loader.systemd-boot.enable = true; # managed by lanzaboote
  boot.loader.efi.canTouchEfiVariables = true;
@@ -46,7 +49,28 @@
    LC_TELEPHONE = "nl_NL.UTF-8";
    LC_TIME = "nl_NL.UTF-8";
  };
+  system.activationScripts."stremio-mpv-flatpak-patch" = {
+      text = ''
+        # 1. Provide the symlink where Stremio's player engine queries
+        mkdir -p /usr/bin
+        ln -sf /run/current-system/sw/bin/mpv /usr/bin/mpv

+        # 2. Locate and patch the runtime server.js file inside the active Flatpak installation
+        TARGET_FILE="/var/lib/flatpak/app/com.stremio.Stremio/current/active/files/opt/stremio/server.js"
+        
+        if [ -f "$TARGET_FILE" ]; then
+          # Make sure the file is writable momentarily for the patch
+          chmod +w "$TARGET_FILE"
+          
+          # Inject the flatpak-spawn sequence into the linux player profile
+          sed -i 's|linux:{path:\["\/usr\/bin\/mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
+          sed -i 's|linux:{path:\["mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
+          
+          # Restore permissions
+          chmod -w "$TARGET_FILE"
+        fi
+      '';
+    };
  services = {
    # Enable Gnome Session
    displayManager.gdm.enable = true;
@@ -59,6 +83,7 @@

    displayManager.cosmic-greeter.enable = false;
    displayManager.defaultSession = "gnome";
+    # Clear the sandbox restriction dynamically
    
    xserver = {
      enable = true; # Enable the deprecated X11 teletype terminal connection system. 
@@ -244,7 +269,7 @@

  services.mullvad-vpn = {
    enable = true;
-    gui.enable = true;
+    package = pkgs.mullvad-vpn;
  };

  fonts = {
@@ -29,6 +29,11 @@ let
  # inherit (lib.my-namespace) systemPackages;
  inherit pkgs;
  installedPackages = lib.my-namespace.mkPackages pkgs;
+  # Explicit application exceptions; all other packages use stable pkgs.
+  unstablePkgs = import inputs.nixpkgs-unstable {
+    system = pkgs.stdenv.hostPlatform.system;
+    config.allowUnfree = true;
+  };
 in
 {
  # inherit system;
@@ -43,7 +48,8 @@ in
      programs.linux-wallpaperengine.enable = true;
      system.stateVersion = "26.05";
      nix.settings.experimental-features = [ "nix-command" "flakes" ];
-      # Define a user account. Don't forget to set a password with ‘passwd’.
+      # Distrobox
+      my-namespace.distrobox.enable = true;
      # Desktops
      my-namespace.desktop-environment.cinnamon.enable = true;
      my-namespace.desktop-environment.xfce.enable = false;
@@ -52,12 +58,14 @@ in
      my-namespace.desktop-environment.hyprland.enable = false;
      my-namespace.desktop-environment.cosmic.enable = false;
      my-namespace.performance-tuning.enable = true;
+      my-namespace.rtl8125-recovery.enable = true;
      my-namespace.file-organization.enable = true;
      # GNOME-keyring
      my-namespace.gnome-keyring.enable = true;
      # CS Tools
      my-namespace.cs-tools.enable = true;
      
+      # Define a user account. Don't forget to set a password with ‘passwd’.
      users.users.andreas = {
        isNormalUser = true;
        description = "Andreas Schaafsma";
@@ -84,16 +92,23 @@ in
          spotify
          appimage-run  
          prismlauncher #replaces broken minecraft package
-          trilium-desktop
+          unstablePkgs.trilium-desktop
          terraform
          virt-manager
          nil
          codex
+          inputs.codex-desktop.packages.${pkgs.stdenv.hostPlatform.system}.codex-desktop
          #  thunderbird
        ];
        
      };

+      programs.appimage = {
+        enable = true;
+        binfmt = true;
+      };
+
+
      programs.anime-game-launcher.enable = true; # Adds launcher and /etc/hosts rules
      programs.anime-games-launcher.enable = true;

@@ -159,6 +174,8 @@ in
        my-namespace.rounded-windows-bms
        my-namespace.cs-demo-manager
        vscode-modernized
+        zed-editor
+        unstablePkgs.jetbrains-toolbox

        (pkgs.writeShellScriptBin "switch-to-desktop" ''
          #!/bin/sh
@@ -220,9 +237,9 @@ in
      # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
      # If no user is logged in, the machine will power down after 20 minutes.

-      systemd.targets.sleep.enable = false;
-      systemd.targets.suspend.enable = false;
-      systemd.targets.hibernate.enable = false;
-      systemd.targets.hybrid-sleep.enable = false;
+      # systemd.targets.sleep.enable = false;
+      # systemd.targets.suspend.enable = false;
+      # systemd.targets.hibernate.enable = false;
+      # systemd.targets.hybrid-sleep.enable = false;
    };
 }
@@ -14,11 +14,7 @@
      ./acer-monitor-edid.nix
      ./samsung-monitor-edid.nix
    ];
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
  hardware.enableRedistributableFirmware = true;
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
-  # boot.kernelPackages = pkgs.linuxPackages;
  boot.loader.efi.canTouchEfiVariables = true;  
  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
  boot.kernelModules = [ "kvm-amd" "r8125" "4vl2loopback" ];
@@ -54,6 +54,6 @@ in

    # Temporarily expose whether async atomic commits reach KMS or fall back
    # to synchronized presentation. Remove this after collecting the log.
-    MUTTER_DEBUG = lib.mkDefault "kms";
+    # MUTTER_DEBUG = lib.mkDefault "kms";
  };
 }
Author	SHA1	Message	Date
andreas	7c00c133ab	transition to nixos stable	2026-10-17 06:50:58 +02:00
andreas	3062ef1608	update millennium	2026-10-15 15:08:12 +02:00
andreas	ac7a47c26a	module for recovering shitty realtek controller when it gets stuck in bugged power state	2026-10-15 10:48:08 +02:00
andreas	74d3d6870d	WIP	2026-10-15 08:52:31 +02:00
andreas	ac9eeb1f1c	enable millennium for steam	2026-09-30 19:54:22 +02:00
andreas	666b7ab737	move comment to appropriate block	2026-09-30 19:53:54 +02:00
andreas	bcfada020b	enable distrobox	2026-09-30 19:53:42 +02:00
andreas	d79713972e	don't disable power saving	2026-09-30 17:53:28 +02:00
andreas	441d029eb6	enable ptyxis terminal on gnome	2026-09-30 17:53:08 +02:00
andreas	17933af881	fix log spam	2026-09-30 15:40:46 +02:00
andreas	c4693f0ee6	fix url handlers for steam	2026-09-30 02:27:58 +02:00
andreas	813e474bc1	add wp engine gui	2026-09-28 01:04:34 +02:00