From ef91519d5a91c996107c5dd07ed950a7399d60c1 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 6 Apr 2023 15:41:53 +0200 Subject: [PATCH] feat: switch hm & darwin to follow unstable --- flake.lock | 88 +++++++++++++++++++++++++------------------- flake.nix | 7 ++-- home/apps/vscode.nix | 1 + 3 files changed, 55 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 6d30619..fce2629 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -106,16 +106,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "utils": "utils" }, "locked": { - "lastModified": 1680549487, - "narHash": "sha256-9Sbk3OJF9Y3EICGetwcO2vaOdovJrOywHinn4GBWAsw=", + "lastModified": 1680597706, + "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ccf650bb5badcf48054cf77f74ac85ea87c6f84c", + "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "type": "github" }, "original": { @@ -126,9 +126,7 @@ }, "nekowinston-nur": { "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1680465295, @@ -146,16 +144,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680334310, - "narHash": "sha256-ISWz16oGxBhF7wqAxefMPwFag6SlsA9up8muV79V9ck=", - "owner": "nixos", + "lastModified": 1679319606, + "narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "884e3b68be02ff9d61a042bc9bd9dd2a358f95da", + "rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-22.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -194,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1680487167, - "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", + "lastModified": 1680577567, + "narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53dad94e874c9586e71decf82d972dfb640ef044", + "rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4", "type": "github" }, "original": { @@ -209,6 +207,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1680498889, + "narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1678898370, "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", @@ -224,7 +238,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1680273054, "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", @@ -240,7 +254,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1673947312, "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=", @@ -258,16 +272,16 @@ }, "nur": { "locked": { - "lastModified": 1680551134, - "narHash": "sha256-+Gqwg+uQhR+/3APMDErr7IYj5D0WjeWCJSMcyieUwX0=", + "lastModified": 1680588174, + "narHash": "sha256-MrMsiwohIrGx3R4qX/162+fqx8EQe5lpMc4YTahJDAQ=", "owner": "nix-community", - "repo": "NUR", - "rev": "24f84bd74352b2f0c1f5eed55812e745923ef550", + "repo": "nur", + "rev": "b34f9bde6cbcb5d50e638d08e7d3f9ed7b88340b", "type": "github" }, "original": { "owner": "nix-community", - "repo": "NUR", + "repo": "nur", "type": "github" } }, @@ -276,15 +290,15 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1680170909, - "narHash": "sha256-FtKU/edv1jFRr/KwUxWTYWXEyj9g8GBrHntC2o8oFI8=", + "lastModified": 1680599552, + "narHash": "sha256-rQQJFGvWQ3Sr+m/r5KGIFN0iVaVKr6u9uraCz6jSKj4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "29dbe1efaa91c3a415d8b45d62d48325a4748816", + "rev": "3342d7c51119030490fdcd07351b53b10806891c", "type": "github" }, "original": { @@ -299,7 +313,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", @@ -309,7 +323,7 @@ }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -329,14 +343,14 @@ "swayfx": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1679872473, - "narHash": "sha256-N9DbdFj4iehocp/Ysb29+UTbUGEdwjZNWGbeaFL9hQ4=", + "lastModified": 1680567414, + "narHash": "sha256-XHxKGav/B05ptxBAVJqxRuV4W1H/5a5OSNfv/xJD558=", "owner": "willpower3309", "repo": "swayfx", - "rev": "4d1af6500491bdc301b590916fd04f5d8ec6a2c2", + "rev": "41df328325afd60a33d8d0cb0f32473ecac2df74", "type": "github" }, "original": { @@ -347,11 +361,11 @@ }, "utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2fff63d..d27e251 100644 --- a/flake.nix +++ b/flake.nix @@ -7,16 +7,15 @@ darwin = { url = "github:lnl7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - nur.url = "github:nix-community/NUR"; + nur.url = "github:nix-community/nur"; nekowinston-nur.url = "github:nekowinston/nur"; - nekowinston-nur.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops.url = "github:Mic92/sops-nix"; # dev diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index c28c504..b72fb99 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -9,6 +9,7 @@ in { programs.vscode = { enable = true; + package = pkgs.unstable.vscode; extensions = with pkgs.unstable.vscode-extensions; [ jnoortheen.nix-ide matklad.rust-analyzer