summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel <mel@rnrd.eu>2026-01-11 00:30:57 +0100
committerMel <mel@rnrd.eu>2026-01-11 00:30:57 +0100
commit6fdc47c9606ddd298c7c9e5f9b83ec095e89998b (patch)
tree81f4fe97509ad7e2c1dbe2acc56671d73cbef3b0
parentee5f89c69f60fbe2821b9fdf780146fbec73725c (diff)
downloadminerals-6fdc47c9606ddd298c7c9e5f9b83ec095e89998b.tar.zst
minerals-6fdc47c9606ddd298c7c9e5f9b83ec095e89998b.zip
Update to NixOS 25.11
Signed-off-by: Mel <mel@rnrd.eu>
-rw-r--r--config.nix5
-rw-r--r--flake.lock132
-rw-r--r--flake.nix8
-rw-r--r--modules/fonts.nix2
-rw-r--r--modules/hardware-keys.nix1
-rw-r--r--modules/hardware/amd-gpu.nix5
-rw-r--r--modules/home/zed.nix5
-rw-r--r--pkgs/ghidra/default.nix4
8 files changed, 56 insertions, 106 deletions
diff --git a/config.nix b/config.nix
index 92f5c7e..40942dc 100644
--- a/config.nix
+++ b/config.nix
@@ -2,4 +2,9 @@
allowUnfree = true;
input-fonts.acceptLicense = true;
android_sdk.accept_license = true;
+
+ permittedInsecurePackages = [
+ # see: https://github.com/mirrexagon/nixpkgs-esp-dev/issues/109
+ "python3.13-ecdsa-0.19.1"
+ ];
}
diff --git a/flake.lock b/flake.lock
index c2703a9..2514b05 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1754433428,
- "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+ "lastModified": 1762618334,
+ "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+ "rev": "fcdea223397448d35d9b31f798479227e80183f6",
"type": "github"
},
"original": {
@@ -49,11 +49,11 @@
},
"flake-compat": {
"locked": {
- "lastModified": 1747046372,
- "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+ "lastModified": 1767039857,
+ "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+ "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
@@ -113,24 +113,6 @@
"type": "github"
}
},
- "flake-utils_3": {
- "inputs": {
- "systems": "systems_4"
- },
- "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"
- }
- },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@@ -153,16 +135,16 @@
]
},
"locked": {
- "lastModified": 1753592768,
- "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+ "lastModified": 1767910483,
+ "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+ "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-25.05",
+ "ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@@ -170,15 +152,15 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1737234286,
- "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
- "rev": "079528098f5998ba13c88821a2eca1005c1695de",
+ "lastModified": 1753306924,
+ "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
+ "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
},
"original": {
"type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
+ "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
}
},
"lix-module": {
@@ -191,30 +173,29 @@
]
},
"locked": {
- "lastModified": 1742943028,
- "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=",
- "rev": "868d97695bab9d21f6070b03957bcace249fbe3c",
+ "lastModified": 1756125859,
+ "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
+ "rev": "d3292125035b04df00d01549a26e948631fabe1e",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"
},
"original": {
"type": "tarball",
- "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"
+ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz"
}
},
"nix-vscode-extensions": {
"inputs": {
- "flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
- "lastModified": 1755483252,
- "narHash": "sha256-I9hwIezfrzEvGMYJif4BgzfeMjwUp5s3W1yajvdII/8=",
+ "lastModified": 1768025207,
+ "narHash": "sha256-+32x+zJ1ys2VJ1SUiwnImgsaHZdlPCMdlzz09kt5v9I=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "f30e5a7ad0de0d1d385893a7d3fb5c864306a500",
+ "rev": "6ec1985c13c5ea9ee5ae0a4971df04ac798682e0",
"type": "github"
},
"original": {
@@ -228,15 +209,14 @@
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs-unstable"
- ],
- "treefmt-nix": "treefmt-nix"
+ ]
},
"locked": {
- "lastModified": 1755124568,
- "narHash": "sha256-8fXTYruAwE6OiIz/99P5qknQYag7ZX985pNT+jhIIrU=",
+ "lastModified": 1767637567,
+ "narHash": "sha256-njwPfL5gM/KRGLJ29CbQ4nLBoEkNPMvEHBAAPOP8BZc=",
"owner": "nix-community",
"repo": "nixos-apple-silicon",
- "rev": "2f873fc3ef373e59cd3a7dad4087685fc8ce02ca",
+ "rev": "530aa73aa9a21a078ff861b84767ae1d469715fa",
"type": "github"
},
"original": {
@@ -247,33 +227,33 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1755471983,
- "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=",
+ "lastModified": 1767799921,
+ "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb",
+ "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-25.05",
+ "ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-esp-dev": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
- "lastModified": 1754647023,
- "narHash": "sha256-gi93oV4F03L39FyNvWXzVrRJlGIb9hkyZR/k9+qjcys=",
+ "lastModified": 1767865407,
+ "narHash": "sha256-QWF1rZYd+HvNzLIeRS+OEBX7HF0EhWCGeLbMkgtbsIo=",
"owner": "mirrexagon",
"repo": "nixpkgs-esp-dev",
- "rev": "dacc76baa38e8a6300a870fff77733cb45d8c6ec",
+ "rev": "5287d6e1ca9e15ebd5113c41b9590c468e1e001b",
"type": "github"
},
"original": {
@@ -284,11 +264,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1764667669,
- "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+ "lastModified": 1767892417,
+ "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "418468ac9527e799809c900eda37cbff999199b6",
+ "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github"
},
"original": {
@@ -355,42 +335,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": [
- "nixos-apple-silicon",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1754847726,
- "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index d8e9e30..0c436c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,17 @@
{
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+ # TODO: lix is now recommending switching away from their own module flake
+ # towards the nixpkgs lix package set.
lix-module = {
- url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";
+ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
- url = "github:nix-community/home-manager/release-25.05";
+ url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/modules/fonts.nix b/modules/fonts.nix
index b500b2e..f9db450 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -9,7 +9,7 @@
meslo-lg
input-fonts
fira fira-math fira-code
- corefonts vistafonts
+ corefonts vista-fonts
];
};
}
diff --git a/modules/hardware-keys.nix b/modules/hardware-keys.nix
index a222a88..ccccca5 100644
--- a/modules/hardware-keys.nix
+++ b/modules/hardware-keys.nix
@@ -62,7 +62,6 @@ in
yubikey-manager
yubioath-flutter
yubikey-personalization
- yubikey-personalization-gui
yubikey-touch-detector # install icon
age-plugin-yubikey
pam_u2f
diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix
index cfaa974..1b52e20 100644
--- a/modules/hardware/amd-gpu.nix
+++ b/modules/hardware/amd-gpu.nix
@@ -7,11 +7,6 @@
hardware.graphics = {
enable = true;
enable32Bit = true;
-
- # use amdvlk in conjunction with amdgpu,
- # applications can choose which one to use.
- extraPackages = with pkgs; [ amdvlk ];
- extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
};
services.xserver.videoDrivers = [ "amdgpu" ];
diff --git a/modules/home/zed.nix b/modules/home/zed.nix
index e6e6182..dd59f0c 100644
--- a/modules/home/zed.nix
+++ b/modules/home/zed.nix
@@ -18,7 +18,10 @@ in
{
programs.zed-editor = {
enable = true;
- package = unstablePkgs.zed-editor;
+ # can be returned to unstable once cargo-nextest is integrated
+ # see: https://github.com/NixOS/nixpkgs/pull/478690
+ # package = unstablePkgs.zed-editor;
+ package = pkgs.zed-editor;
extensions = [
"nix"
diff --git a/pkgs/ghidra/default.nix b/pkgs/ghidra/default.nix
index 56045b1..9c6f2d6 100644
--- a/pkgs/ghidra/default.nix
+++ b/pkgs/ghidra/default.nix
@@ -67,7 +67,9 @@ ghidra-patched.withExtensions (
extensions: with members.extensions; [
gnudisassembler
machinelearning
- ghidraninja-ghidra-scripts
+ # swift 5.10.2 currently fails build on nixos 25.11
+ # see: https://github.com/nixos/nixpkgs/issues/462451
+ #ghidraninja-ghidra-scripts
wasm
lightkeeper
kaiju