From 04729af170c9bf59e5a5561d396a20b898df9708 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 19 Feb 2025 19:45:51 -0600 Subject: [PATCH] Version bump Update flake pins Point to my fixed version of VSCode extensions Update to use new Xiphos module --- flake.lock | 77 ++++++++++++++++++++------------------- flake.nix | 2 +- modules/nixos/default.nix | 23 +++--------- 3 files changed, 46 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 1caca5c..1fa3186 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1737481937, - "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=", + "lastModified": 1739709805, + "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287", + "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", + "lastModified": 1739933872, + "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", + "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1738841109, - "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -600,11 +600,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -643,11 +643,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737370608, - "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", + "lastModified": 1739451785, + "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "300081d0cc72df578b02d914df941b8ec62240e6", + "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -754,11 +754,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -781,11 +781,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738873988, - "narHash": "sha256-FpQmO2/NABt5suLYR0t7cjEdnWoaBTWu9psKXviEpo8=", + "lastModified": 1739902813, + "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", "owner": "nix-community", "repo": "nixvim", - "rev": "a5147a36f9d3df06fd1246cf5a089678cbf59d3a", + "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", "type": "github" }, "original": { @@ -802,11 +802,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738900897, - "narHash": "sha256-1q6z3WFfx1v2/VK+PEAMhSLBWT65eITKpgg3OVtBmQU=", + "lastModified": 1739903703, + "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", "owner": "nix-community", "repo": "NUR", - "rev": "37603b07dde6167b561fc5f9996cc9b849721b39", + "rev": "2215ad5c4347f522523715e809f5f2022509f504", "type": "github" }, "original": { @@ -1021,15 +1021,16 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1738892952, - "narHash": "sha256-1mDXsXvUV+PNJHJ51HPtkbGEGwAfZVNmxtWC5OQ64h4=", - "owner": "nix-community", + "lastModified": 1739984805, + "narHash": "sha256-cX3UzBy65e2CafN6a6WJr3aXQm4gvYD+Ym1epuY600k=", + "owner": "greg-hellings", "repo": "nix-vscode-extensions", - "rev": "5cbce56ae7ae89025ae7b149f2ee2bc994dd31e9", + "rev": "f5671be9dec0adee120e30436d6450abea4ced42", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "greg-hellings", + "ref": "fix-json", "repo": "nix-vscode-extensions", "type": "github" } @@ -1042,11 +1043,11 @@ ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1739782332, + "narHash": "sha256-bPZKuual2WKfyHv7Wq+Owcj9R+i/qFzOWByqSS9rlxI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "59bdbb1e75232bf1dd6d2a9313b9b6ddc5049ba2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6b55233..3b72d8f 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ 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:nix-community/nix-vscode-extensions"; + vsext.url = "github:greg-hellings/nix-vscode-extensions/fix-json"; wsl = { url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixunstable"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 30033d6..1479378 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -5,9 +5,6 @@ ... }: -let - x = if builtins.hasAttr "xonsh-unwrapped" pkgs then pkgs.xonsh else pkgs.xonsh.passthru.wrapper; -in { imports = [ ../baseline.nix @@ -59,20 +56,12 @@ in programs.xonsh = { enable = true; - package = ( - x.override { - extraPackages = ( - ps: with ps; [ - (ps.toPythonModule pkgs.pipenv) - pyyaml - requests - ruamel-yaml - xonsh-apipenv - pkgs.nur.repos.xonsh-xontribs.xonsh-direnv - pkgs.nur.repos.xonsh-xontribs.xontrib-vox - ] - ); - } + extraPackages = ( + ps: with ps; [ + xonsh-apipenv + pkgs.nur.repos.xonsh-xontribs.xonsh-direnv + pkgs.nur.repos.xonsh-xontribs.xontrib-vox + ] ); };