From 97633af170876f591b1b93fb8b3224a7a241b3a6 Mon Sep 17 00:00:00 2001 From: Finn Markwitz Date: Mon, 5 Jan 2026 18:53:52 +0000 Subject: [PATCH] chore(OS Update): 25.11 chore: Replaced scikitlearn with scikit-learn chore: removed gitAndTools chore: Flake Update chore: Replaced vaapiVdpau with libva-vdpau-driver chore: Update Nixpkgs to 25.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- machines/core/core.nix | 1 - machines/jupiter/hardware-configuration.nix | 2 +- modules/environments/development/default.nix | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index e04c355..88a3cd3 100644 --- a/flake.lock +++ b/flake.lock @@ -240,16 +240,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index c44afad..8785dae 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/machines/core/core.nix b/machines/core/core.nix index f6d8eaa..4f9f8cf 100644 --- a/machines/core/core.nix +++ b/machines/core/core.nix @@ -16,7 +16,6 @@ fzf gettext git - gitAndTools.delta gptfdisk htop jq diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 7d482e8..ec735fd 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -33,7 +33,7 @@ extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD #vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl ]; }; diff --git a/modules/environments/development/default.nix b/modules/environments/development/default.nix index af1e151..834b529 100644 --- a/modules/environments/development/default.nix +++ b/modules/environments/development/default.nix @@ -28,7 +28,7 @@ in pandas pillow plotly - scikitlearn + scikit-learn scipy tqdm # progressbar in pandas wheel # python development