From a9991d911181dc8ca0c265fc02d7f9cfb6fe0e91 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Fri, 2 May 2025 10:59:28 -0400 Subject: [PATCH] chore: update nixpkgs and some formatting cleanup --- nix/base-system/flake.lock | 116 +++++++++++++++++++++++++++---------- nix/base-system/flake.nix | 58 +++++++++---------- 2 files changed, 113 insertions(+), 61 deletions(-) diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index 2078a5b..ccecfad 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -20,6 +20,22 @@ "type": "github" } }, + "avante-src": { + "flake": false, + "locked": { + "lastModified": 1746122770, + "narHash": "sha256-Pnkz1P1mb6Isc1T2aNAY6Q2XFTn0QQ+yNWlDSNeqrsU=", + "owner": "yetone", + "repo": "avante.nvim", + "rev": "555b2e615c47f1587b21a05c9cae6c48537146a7", + "type": "github" + }, + "original": { + "owner": "yetone", + "repo": "avante.nvim", + "type": "github" + } + }, "clio-flake": { "inputs": { "flake-compat": "flake-compat", @@ -721,7 +737,25 @@ }, "naersk_5": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_6": { + "inputs": { + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1650101877, @@ -737,9 +771,9 @@ "type": "github" } }, - "naersk_6": { + "naersk_7": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1721727458, @@ -790,7 +824,7 @@ "neovim-flake": { "inputs": { "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "dir": "contrib", @@ -832,7 +866,7 @@ "nil-flake_2": { "inputs": { "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "rust-overlay": "rust-overlay_6" }, "locked": { @@ -882,6 +916,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1746152631, + "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1715787315, "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", @@ -897,7 +947,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1690441914, "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", @@ -913,7 +963,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1738579205, "narHash": "sha256-o6BeeanSUALvz8oL2CHOikVjCf7j+HqlA0WGvKOUX3Q=", @@ -929,7 +979,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1689850295, "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", @@ -945,7 +995,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1650109093, "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", @@ -959,20 +1009,6 @@ "type": "indirect" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1729658218, - "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_16": { "locked": { "lastModified": 1729658218, @@ -988,6 +1024,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1729658218, + "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1682109806, "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", @@ -1141,7 +1191,7 @@ }, "nurl-flake_2": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1701273941, @@ -1160,6 +1210,7 @@ "root": { "inputs": { "agenix-flake": "agenix-flake", + "avante-src": "avante-src", "clio-flake": "clio-flake", "custom-flakes": "custom-flakes", "d2-vim-src": "d2-vim-src_2", @@ -1168,10 +1219,11 @@ "harpoon-src": "harpoon-src", "heracles-flake": "heracles-flake", "jujutsu-flake": "jujutsu-flake", + "naersk": "naersk_5", "neogit-src": "neogit-src_2", "neovim-flake": "neovim-flake", "nil-flake": "nil-flake_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-darwin": "nixpkgs-darwin", "nurl-flake": "nurl-flake_2", "roslyn-lsp": "roslyn-lsp_2", @@ -1221,7 +1273,7 @@ "inputs": { "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_11", - "naersk": "naersk_5" + "naersk": "naersk_6" }, "locked": { "lastModified": 1695686584, @@ -1418,8 +1470,8 @@ "sheetsui-flake": { "inputs": { "flake-utils": "flake-utils_13", - "naersk": "naersk_6", - "nixpkgs": "nixpkgs_16", + "naersk": "naersk_7", + "nixpkgs": "nixpkgs_17", "rust-overlay": "rust-overlay_7" }, "locked": { @@ -1442,7 +1494,7 @@ "flake-utils": "flake-utils_14", "gitignore": "gitignore", "libtexpdf-src": "libtexpdf-src", - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1694595810, @@ -1690,11 +1742,11 @@ }, "unstable": { "locked": { - "lastModified": 1742923925, - "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=", + "lastModified": 1746152631, + "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1", + "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", "type": "github" }, "original": { diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index 32512ac..662e1d3 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -177,34 +177,34 @@ EOF"; ionide-nvim # Fsharp lsp support nvim-treesitter-context nvim-treesitter-textobjects - nvim-treesitter-parsers.ini - nvim-treesitter-parsers.ebnf - nvim-treesitter-parsers.rust - nvim-treesitter-parsers.c - #nvim-treesitter-parsers.c_sharp # currently broken for some reason - nvim-treesitter-parsers.cpp - nvim-treesitter-parsers.clojure - nvim-treesitter-parsers.latex - nvim-treesitter-parsers.terraform - nvim-treesitter-parsers.hcl - nvim-treesitter-parsers.yaml - nvim-treesitter-parsers.lua - nvim-treesitter-parsers.vim - nvim-treesitter-parsers.go - nvim-treesitter-parsers.toml - nvim-treesitter-parsers.tlaplus - nvim-treesitter-parsers.typescript - nvim-treesitter-parsers.starlark - nvim-treesitter-parsers.python - nvim-treesitter-parsers.sql - nvim-treesitter-parsers.javascript - nvim-treesitter-parsers.ocaml - nvim-treesitter-parsers.haskell - nvim-treesitter-parsers.css - nvim-treesitter-parsers.promql - nvim-treesitter-parsers.nix - nvim-treesitter-parsers.zig - nvim-treesitter-parsers.hoon + nvim-treesitter-parsers.ini + nvim-treesitter-parsers.ebnf + nvim-treesitter-parsers.rust + nvim-treesitter-parsers.c + #nvim-treesitter-parsers.c_sharp # currently broken for some reason + nvim-treesitter-parsers.cpp + nvim-treesitter-parsers.clojure + nvim-treesitter-parsers.latex + nvim-treesitter-parsers.terraform + nvim-treesitter-parsers.hcl + nvim-treesitter-parsers.yaml + nvim-treesitter-parsers.lua + nvim-treesitter-parsers.vim + nvim-treesitter-parsers.go + nvim-treesitter-parsers.toml + nvim-treesitter-parsers.tlaplus + nvim-treesitter-parsers.typescript + nvim-treesitter-parsers.starlark + nvim-treesitter-parsers.python + nvim-treesitter-parsers.sql + nvim-treesitter-parsers.javascript + nvim-treesitter-parsers.ocaml + nvim-treesitter-parsers.haskell + nvim-treesitter-parsers.css + nvim-treesitter-parsers.promql + nvim-treesitter-parsers.nix + nvim-treesitter-parsers.zig + nvim-treesitter-parsers.hoon #omnisharp-extended-lsp-nvim #neotest-dotnet nix-develop-nvim @@ -238,7 +238,7 @@ EOF"; # TODO find a version of the julia package that will install # on darwin and add it as an overlay nil-pkg - lua-language-server + lua-language-server rust-analyzer dasht direnv