diff --git a/flake.lock b/flake.lock index 1344738..6002167 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1739709805, - "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=", + "lastModified": 1741725077, + "narHash": "sha256-p9mLfWb9PPLtRUKlJoQG71jFH6xU4Ox+rzPkExvAglY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc", + "rev": "875d25066d4ad4df2ced3a0a16be0e40bb469d95", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1740636552, - "narHash": "sha256-vBtVB8uU4Bxbyz43MhldAGX91i15j4LJI1Ss3mCCO7s=", + "lastModified": 1742165923, + "narHash": "sha256-WKzuVsHXjuxYjS9KxKdpoPWpT37LofyS5llSssEw058=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "665cc04a60eb8ba47d41eadbe6264ca8a71943e8", + "rev": "95eac71bf52b271523d0ca81dbbeb3182990fc24", "type": "github" }, "original": { @@ -165,22 +165,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -201,11 +185,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -297,11 +281,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -338,11 +322,11 @@ ] }, "locked": { - "lastModified": 1740699498, - "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", + "lastModified": 1742305478, + "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b71edac7a3167026aabea82a54d08b1794088c21", + "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", "type": "github" }, "original": { @@ -380,11 +364,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742300892, + "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "ea26a82dda75bee6783baca6894040c8e6599728", "type": "github" }, "original": { @@ -421,22 +405,6 @@ "type": "github" } }, - "nix23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -460,11 +428,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1742217219, + "narHash": "sha256-pLRjj0jTL1TloB0ptEwVF51IJJX8a17dSxg+gqiWb30=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "83900d5154d840dfae1e0367c5290f59b9dccf03", "type": "github" }, "original": { @@ -475,11 +443,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -491,14 +459,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { @@ -518,11 +489,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739451785, - "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", + "lastModified": 1741678040, + "narHash": "sha256-rmBsz7BBcDwfvDkxnKHmolKceGJrr0nyz5PQYZg0kMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", + "rev": "3ee8818da146871cd570b164fc4f438f78479a50", "type": "github" }, "original": { @@ -581,11 +552,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -613,27 +584,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1713805509, - "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", + "lastModified": 1740547748, + "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", + "rev": "3a05eebede89661660945da1f151959900903b6a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "3a05eebede89661660945da1f151959900903b6a", "type": "github" } }, "nixunstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -650,11 +621,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1742255305, + "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", "type": "github" }, "original": { @@ -671,11 +642,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740715395, - "narHash": "sha256-K5RjsCwS60wO9Y999R2q4J1KH/pZcxOGJZmdvucs8v4=", + "lastModified": 1742309415, + "narHash": "sha256-A5gA9dDnV1GT5EoJKQMkB46KQS9NrkutQJsIeHQ+63U=", "owner": "nix-community", "repo": "NUR", - "rev": "0ed1a467447a04a60cdc6444de0dedd9adc55952", + "rev": "c7f9d9676ca1679d6010c98c4df5a4ceac34487e", "type": "github" }, "original": { @@ -738,7 +709,6 @@ "flake-parts": "flake-parts", "hmunstable": "hmunstable", "hooks": "hooks", - "nix23_05": "nix23_05", "nixos-generators": "nixos-generators", "nixunstable": "nixunstable", "nixvimunstable": "nixvimunstable", @@ -864,16 +834,15 @@ }, "vsext": { "inputs": { - "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1739984805, - "narHash": "sha256-cX3UzBy65e2CafN6a6WJr3aXQm4gvYD+Ym1epuY600k=", - "owner": "greg-hellings", + "lastModified": 1742262692, + "narHash": "sha256-kCuy1Fld1vFmor6SZ48DdtiLv9/zUhW8lCaTA+Py+es=", + "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f5671be9dec0adee120e30436d6450abea4ced42", + "rev": "32de9a383db6b555ac92877dd8b5b986f4151de7", "type": "github" }, "original": { @@ -885,17 +854,17 @@ }, "wsl": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixunstable" ] }, "locked": { - "lastModified": 1740567864, - "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=", + "lastModified": 1742209789, + "narHash": "sha256-D3GWoPC7dbF4LSJ5VfskuD6K77Ej4WyTsynJ06eh9kw=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca", + "rev": "bc827c2924c46f2344d3168fd82c6711aaceb610", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3b72d8f..bd9dbaf 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,6 @@ inputs.nixpkgs.follows = "nixunstable"; }; nixvimunstable.url = "github:nix-community/nixvim/main"; - nix23_05.url = "github:NixOS/nixpkgs/nixos-23.05"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; nurpkgs.url = "github:nix-community/NUR"; vsext.url = "github:greg-hellings/nix-vscode-extensions/fix-json"; diff --git a/home/default.nix b/home/default.nix index 91d79be..03f0865 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,14 +7,21 @@ rec { pkgs = ( import top.nixunstable { inherit system overlays; - config.allowUnfree = true; + config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; } ); in top.hmunstable.lib.homeManagerConfiguration { inherit pkgs; modules = [ - ../modules/nix-conf.nix + (import ../modules/nix-conf.nix { + inherit pkgs; + inherit (pkgs) lib; + cache = false; + }) ./home.nix ]; extraSpecialArgs = { diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index db6c5ef..cd785b2 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -1,15 +1,10 @@ { pkgs, lib, - top, ... }: let - nix23 = import top.nix23_05 { - inherit (pkgs.stdenv) system; - overlays = [ top.self.overlays.default ]; - }; - py = nix23.python311.withPackages ( + py = pkgs.python311.withPackages ( p: with p; [ pyyaml ruamel-yaml @@ -36,11 +31,6 @@ in zed = true; }; - nixpkgs.config = { - allowUnfree = true; - permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ]; - }; - home = { packages = with pkgs; [ aacs @@ -52,6 +42,7 @@ in nixStable pipenv-ivr poetry + poetryPlugins.poetry-plugin-export pre-commit robo3t x diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 589a8db..7d0995b 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -22,7 +22,6 @@ in # An alternative editor to vim, when I need it for some things programs.vscode = { enable = true; - #package = pkgs.vscodium; profiles.default = { extensions = with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace; diff --git a/modules/nix-conf.nix b/modules/nix-conf.nix index 8d48262..c62dd61 100644 --- a/modules/nix-conf.nix +++ b/modules/nix-conf.nix @@ -1,4 +1,9 @@ -{ pkgs, ... }: +{ + pkgs, + cache ? true, + lib, + ... +}: { nix = { @@ -17,31 +22,40 @@ keep-derivations = true; min-free = (toString (1024 * 1024 * 1024)); max-free = (toString (5 * 1024 * 1024 * 1024)); + cores = 0; # Use all cores for builds trusted-users = [ "greg" "gregory.hellings" ]; # For home and for work machines - substituters = [ - "http://nas.home:9000/binary-cache/" - "https://cache.garnix.io" - "https://ai.cachix.org" - "https://nixpkgs-python.cachix.org" - "https://greg-hellings.cachix.org" - "https://nix-community.cachix.org" - ]; + substituters = + (lib.optionals cache [ + "http://nas.thehellings.lan:9000/binary-cache/" + "http://nas.home:9000/binary-cache/" + ]) + ++ [ + "https://cache.garnix.io" + "https://ai.cachix.org" + "https://nixpkgs-python.cachix.org" + "https://greg-hellings.cachix.org" + "https://nix-community.cachix.org" + "https://cache.nixos.org" + ]; trusted-public-keys = [ + "nix.thehellings.lan:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8=" "nix.home:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=" "greg-hellings.cachix.org-1:y01Jl/L5evlhxdnUW6n56AiI1k8g1wxWhTxJCe7XSco=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; }; }; nixpkgs.config = { allowUnfree = true; + allowUnfreePredicate = _: true; permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ]; }; }