From 5cbf3ac32e3f63c610d892378d8e2bcb1b82c934 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 7 May 2025 09:32:11 -0600 Subject: [PATCH] [NixOS] Bump nixpkgs --- dotfiles/config/taffybar/taffybar | 2 +- nixos/base.nix | 4 +- nixos/configuration.nix | 1 - nixos/flake.lock | 106 +++++++++++++++--------------- nixos/flake.nix | 2 +- nixos/nix.nix | 2 + nixos/nvidia.nix | 10 +-- nixos/overlay.nix | 28 ++++---- nixos/wsl.nix | 1 - 9 files changed, 78 insertions(+), 78 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index f14fe6d9..f6110354 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit f14fe6d9f1800d9e9a4cf2e4313f2b0b978a4bd6 +Subproject commit f6110354b8c98361c99fb44ac3e007a4c9f3e44b diff --git a/nixos/base.nix b/nixos/base.nix index 10c71600..00c1bca4 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -66,8 +66,8 @@ makeEnable config "myModules.base" true { defaultLocale = "en_US.UTF-8"; }; - # Update timezone automatically - services.tzupdate.enable = true; + # # Update timezone automatically + # services.tzupdate.enable = true; # TODO: Add a comment explaining what this does. services.locate.enable = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 07e4ff8b..33109d98 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -60,6 +60,5 @@ myModules.games.enable = true; myModules.syncthing.enable = true; myModules.fonts.enable = true; - myModules.nixified-ai.enable = false; }; } diff --git a/nixos/flake.lock b/nixos/flake.lock index 97f1142a..1f4fc48d 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -455,14 +455,14 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", - "zig2nix": "zig2nix" + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1741594465, - "narHash": "sha256-8a/QIgNwV8VGn8JIiACmVVEdue+U3juiMSAO1DEUTC4=", + "lastModified": 1745607661, + "narHash": "sha256-72OO+/vP4h7uiZ1gdGmFf1z+17NxCt8dhrRD+mltW44=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "95daca616db5c24d7bb37fd5a3ac2f8762bb4ead", + "rev": "38445dca2ac2af176c7f3b205d88d697cf8c89c8", "type": "github" }, "original": { @@ -982,11 +982,11 @@ ] }, "locked": { - "lastModified": 1741579508, - "narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=", + "lastModified": 1745593878, + "narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=", "owner": "nix-community", "repo": "home-manager", - "rev": "744f749dd6fbc1489591ea370b95156858629cb9", + "rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a", "type": "github" }, "original": { @@ -1126,11 +1126,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1741468019, - "narHash": "sha256-gTfawMzGQY5VwzBHQu+FDI7uC9UzlmO18/WGgXkxjQw=", + "lastModified": 1745587317, + "narHash": "sha256-h9v4lIpLYhMY5z9QzAS2rSDz8ntHpqY51Ksk59lGdTA=", "owner": "NixOS", "repo": "nix", - "rev": "a047dec120672d00e069bacf10ffdda420fd1048", + "rev": "3f811c237312a91cfe9314a215ebb4b159bccb23", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1741192150, - "narHash": "sha256-wB140alXVla1Rw/kENerUoma2qO1Jy5IYWbmiSqmJu0=", + "lastModified": 1744290088, + "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "0e4ccdb8181da2c6193c047b50ffee5f1a3b6dc1", + "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738255539, - "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "lastModified": 1741992157, + "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "rev": "da4b122f63095ca1199bd4d526f9e26426697689", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1323,16 +1323,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734359947, - "narHash": "sha256-1Noao/H+N8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d12d5e70ee91fe8481378e540433a7303dbf6a", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1355,11 +1355,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740865531, - "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -1371,16 +1371,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1741613351, - "narHash": "sha256-dmlbmjLQ9k3uowheeXZZbQtTEaZvv4GT606SuQiyNb4=", - "owner": "colonelpanic8", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "637960331012eca5b3039b1e5aa9e4993c978b61", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { - "owner": "colonelpanic8", - "ref": "my-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1568,11 +1568,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1741370709, - "narHash": "sha256-aHLmMv2VcPkPCO2S91Fd0SIh6Ltq/J0KSF2/lgvUOZM=", + "lastModified": 1743534497, + "narHash": "sha256-lKX+eVZC7gtliDIi0dkgqjqRC35bQZ8zL1xtXZoJz2E=", "ref": "refs/heads/master", - "rev": "f03e96437c9c3d8102f55c8e527a5e1ae9c80085", - "revCount": 114, + "rev": "8e7ff81f17ac4ddb8ee1099d9b19432cc9e5fa63", + "revCount": 115, "type": "git", "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" }, @@ -1867,11 +1867,11 @@ }, "unstable_2": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -1975,11 +1975,11 @@ "unstable": "unstable_2" }, "locked": { - "lastModified": 1740222736, - "narHash": "sha256-7RhlA0HKqauUK8ap8Qsp/xBVHd+4CotLqWL7+sLWyzg=", + "lastModified": 1744559834, + "narHash": "sha256-4AeqylaTW3B+iIab7/JobZruTOU1AgDZ8s+wYaZKQos=", "owner": "xmonad", "repo": "xmonad", - "rev": "07d95ad8fc395866200b4587aca8b4db50aa20bd", + "rev": "ebf265a84c6295d4fe15c4a5cf88cb08746f2145", "type": "github" }, "original": { @@ -2003,11 +2003,11 @@ ] }, "locked": { - "lastModified": 1738239110, - "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", + "lastModified": 1741825901, + "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1a8fb6f3a04724519436355564b95fce5e272504", + "rev": "0b14285e283f5a747f372fb2931835dd937c4383", "type": "github" }, "original": { @@ -2016,7 +2016,7 @@ "type": "github" } }, - "zig2nix": { + "zon2nix": { "inputs": { "flake-utils": [ "ghostty", @@ -2024,21 +2024,21 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-stable" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1741368279, - "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=", + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", "owner": "jcollie", - "repo": "zig2nix", - "rev": "672971b5b6911de21446ad4fc76dee677922eda0", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" }, "original": { "owner": "jcollie", - "ref": "672971b5b6911de21446ad4fc76dee677922eda0", - "repo": "zig2nix", + "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "repo": "zon2nix", "type": "github" } } diff --git a/nixos/flake.nix b/nixos/flake.nix index 41121ca3..eff4ed72 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs = { - url = "github:colonelpanic8/nixpkgs/my-unstable"; + url = "github:NixOS/nixpkgs/nixos-unstable"; }; flake-utils = { diff --git a/nixos/nix.nix b/nixos/nix.nix index b3bf5885..ff0df455 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -31,10 +31,12 @@ substituters = [ "https://cache.nixos.org" "https://cuda-maintainers.cachix.org" + "https://ai.cachix.org" ]; trusted-public-keys = [ "cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ]; nix-path = nixPath; }; diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix index 64e40db5..dbd35bec 100644 --- a/nixos/nvidia.nix +++ b/nixos/nvidia.nix @@ -8,11 +8,11 @@ makeEnable config "myModules.nvidia" false { hardware.nvidia-container-toolkit = { enable = true; mount-nvidia-executables = true; - additionalEdit = '' - ${lib.getExe pkgs.jq} ' - .devices |= map( - .containerEdits.hooks |= map(select(.args | index("nvidia-cdi-hook") < 0)) - )' | ${lib.getExe pkgs.jq} '.containerEdits.hooks |= map(select(.args | index("nvidia-cdi-hook") < 0 ))' ''; + # additionalEdit = '' + # ${lib.getExe pkgs.jq} ' + # .devices |= map( + # .containerEdits.hooks |= map(select(.args | index("nvidia-cdi-hook") < 0)) + # )' | ${lib.getExe pkgs.jq} '.containerEdits.hooks |= map(select(.args | index("nvidia-cdi-hook") < 0 ))' ''; }; hardware.nvidia.open = true; hardware.graphics.enable32Bit = true; diff --git a/nixos/overlay.nix b/nixos/overlay.nix index ba08d750..19ef321c 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -1,19 +1,19 @@ final: prev: { - nvidia-container-toolkit = prev.nvidia-container-toolkit.overrideAttrs(old: { - postInstall = '' - ${old.postInstall or ""} - mv $tools/bin/nvidia-cdi-hook $tools/bin/.nvidia-cdi-hook-wrapped - cat > $tools/bin/nvidia-cdi-hook < $tools/bin/nvidia-cdi-hook <