From 7dfa28f02e293dd9bc880d801c92e9687c8b5f40 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 3 Jan 2024 09:37:09 -0500 Subject: [PATCH] updates --- .envrc | 11 ++++---- flake.lock | 16 +++++------ nix/home-manager/flake.lock | 28 +++++++++---------- nix/home-manager/modules/packages/default.nix | 2 +- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.envrc b/.envrc index 261b570..44a156f 100644 --- a/.envrc +++ b/.envrc @@ -1,11 +1,10 @@ -if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" +if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" fi -watch_file devenv.nix -watch_file devenv.lock -watch_file devenv.yaml +watch_file flake.nix +watch_file flake.lock if ! use flake . --impure then - echo "devenv could not be build. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2 + echo "devenv could not be build. The devenv environment was not loaded. Make the necessary changes to flake.nix and hit enter to try again." >&2 fi diff --git a/flake.lock b/flake.lock index 83f7b12..6b6d018 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703066966, - "narHash": "sha256-MbX0XYOEvAuXwi80emHKJsjo1IGQZhoKKnEp2uzgNx4=", + "lastModified": 1703939110, + "narHash": "sha256-GgjYWkkHQ8pUBwXX++ah+4d07DqOeCDaaQL6Ab86C50=", "owner": "cachix", "repo": "devenv", - "rev": "405a4c6a3fecfd2a7fb37cc13f4e760658e522e6", + "rev": "7354096fc026f79645fdac73e9aeea71a09412c3", "type": "github" }, "original": { @@ -167,12 +167,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", - "revCount": 562218, + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "revCount": 564493, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.562218%2Brev-6df37dc6a77654682fe9f071c62b4242b5342e04/018c99c5-83a2-762d-ae43-a38f3be5b2d9/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.564493%2Brev-b0d36bd0a420ecee3bc916c91886caca87c894e9/018cc6b0-680d-7f16-b194-dbf948b62871/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 98e342e..cd6a5c0 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1703387252, - "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", + "lastModified": 1703992163, + "narHash": "sha256-709CGmwU34dxv8DjSpRBZ+HibVJIVaFcA4JH+GFnhyM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", + "rev": "d6510ce144f5da7dd9bac667ba3d5a4946c00d11", "type": "github" }, "original": { @@ -502,11 +502,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1703536658, - "narHash": "sha256-lJE3gn5A7GamJGvUlIiuWi20DxVDryKlZUSMXLerxUc=", + "lastModified": 1704199932, + "narHash": "sha256-TfmE1bbmXz/19jm3XP7WuR1aiAgei6bZVpjFqz8s4Vw=", "owner": "nixneovim", "repo": "nixneovim", - "rev": "c3242706696fc9eaafbeeb47686ef64c6eef0e3d", + "rev": "8501c1fcb20dc6360fa07903079304592966cf66", "type": "github" }, "original": { @@ -528,11 +528,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1703372606, - "narHash": "sha256-XeJ2yXuDQLvwrG9x1QpuqPfv9wo6UYC/249c6f+shog=", + "lastModified": 1703971188, + "narHash": "sha256-bpGAeVifaYXdtH/HFrPoGcnnnveRbD8cjC67o+qij/g=", "owner": "nixneovim", "repo": "nixneovimplugins", - "rev": "7bb750bfb14e0b3c9e09fb24e811456360251d25", + "rev": "f2eed6afdbb1a372072f92660339aa60e4f9f039", "type": "github" }, "original": { @@ -606,12 +606,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", - "revCount": 562218, + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "revCount": 564493, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.562218%2Brev-6df37dc6a77654682fe9f071c62b4242b5342e04/018c99c5-83a2-762d-ae43-a38f3be5b2d9/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.564493%2Brev-b0d36bd0a420ecee3bc916c91886caca87c894e9/018cc6b0-680d-7f16-b194-dbf948b62871/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index a9571c7..959355a 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -25,7 +25,7 @@ in { bandwhich bat bottom - cargo-workspaces + # cargo-workspaces clipboard-jh colima curl