From f0e371cda21eef87c99ea08f65fca35cdd645a16 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Tue, 25 Feb 2025 09:38:50 -0500 Subject: [PATCH] updates --- nix/home-manager/flake.lock | 376 +++++++----------------------------- nix/home-manager/flake.nix | 18 -- 2 files changed, 70 insertions(+), 324 deletions(-) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 0bb1f9e..1a1ea14 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -29,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738823732, - "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=", + "lastModified": 1740378829, + "narHash": "sha256-cwmm7F73aQFJY6YN1roNibNKwxT6FlfXkG3MEbpSp7Q=", "owner": "nix-community", "repo": "fenix", - "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7", + "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7", "type": "github" }, "original": { @@ -45,11 +24,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -74,20 +53,6 @@ "type": "github" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -132,11 +97,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -163,38 +128,23 @@ "type": "github" } }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1723459814, - "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=", - "owner": "freetype", - "repo": "freetype", - "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5", - "type": "github" - }, - "original": { - "owner": "freetype", - "ref": "VER-2-13-3", - "repo": "freetype", - "type": "github" - } - }, "ghostty": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": [ "nixpkgs" ], - "zig": "zig" + "zig": "zig", + "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1738781852, - "narHash": "sha256-fTr3m5Ktg1vWeAbscpYS7BTjOIACXMjkG1xazeRGvAc=", + "lastModified": 1740439959, + "narHash": "sha256-RPamR0QDT4o+aSjgNZRNs2d5qNAjHkD5sfuItLFBO5U=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "4eb588501735e2df2910b54ed0dc8ad934b5d42f", + "rev": "92340f8fb0595d4f54cfa4f14c30fc3d3f6054b5", "type": "github" }, "original": { @@ -203,71 +153,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1719502711, - "narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "9.0.0", - "repo": "harfbuzz", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -275,11 +160,11 @@ ] }, "locked": { - "lastModified": 1738841109, - "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", + "lastModified": 1740432748, + "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", + "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", "type": "github" }, "original": { @@ -316,44 +201,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1726173884, - "narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=", - "owner": "pnggroup", - "repo": "libpng", - "rev": "f5e92d76973a7a53f517579bc95d61483bf108c0", - "type": "github" - }, - "original": { - "owner": "pnggroup", - "ref": "v1.6.44", - "repo": "libpng", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -361,11 +208,11 @@ ] }, "locked": { - "lastModified": 1738466368, - "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -386,11 +233,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738850161, - "narHash": "sha256-dR43//49gKULgtOZstVuAvLOyBApV4OzSjRsnWmhNRM=", + "lastModified": 1740417886, + "narHash": "sha256-RQazj5wxtVcamvUkBzaGd0Y4H2vz5HUkRE/Heh1MtrE=", "owner": "m15a", "repo": "flake-awesome-neovim-plugins", - "rev": "775958e8e082a2fdc1a2de6fc4a819de7c6f99d6", + "rev": "5205113ce8fd69fd03143c4a213a5c52c8531b28", "type": "github" }, "original": { @@ -401,11 +248,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738854034, - "narHash": "sha256-VXPJ97KuJZC4hPHzcgMoox3Qs99ZrNU9fkQJHF+7oUg=", + "lastModified": 1740493701, + "narHash": "sha256-SR2rEAq+qVde2IhHfCLP+9m8vIFaRQXih5mPDP5pNrw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62eb60588fe550b8b8f6ebe4b02d7388a5c16681", + "rev": "f3c2213b8e9a958a043fe6c74a683c25f926a435", "type": "github" }, "original": { @@ -416,11 +263,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "lastModified": 1738255539, + "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", "type": "github" }, "original": { @@ -432,27 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738734093, - "narHash": "sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1735821806, - "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6973081434f88088e5321f83ebafe9a1167c367", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { @@ -464,24 +295,16 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": [ - "home-manager" - ], - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1738807015, - "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", + "lastModified": 1740432393, + "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", + "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", "type": "github" }, "original": { @@ -522,18 +345,17 @@ "nix-index-database": "nix-index-database", "nixneovimplugins": "nixneovimplugins", "nixpkgs": "nixpkgs", - "nixvim": "nixvim", - "wezterm": "wezterm" + "nixvim": "nixvim" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738754241, - "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", + "lastModified": 1740329432, + "narHash": "sha256-eKQ7aBkNvF5AhUpyJ1cW450jxomZ4gTIaYir5qsNl7Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", + "rev": "6d68c475c7aaf7534251182662456a4bf4216dfe", "type": "github" }, "original": { @@ -543,27 +365,6 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735871325, - "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a599f011db521766cbaf7c2f5874182485554f00", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -617,11 +418,11 @@ ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -630,72 +431,26 @@ "type": "github" } }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "wezterm": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1738379806, - "narHash": "sha256-3dkZt53Lr90wQOCPlDHAZn5t0G6n56t+JXW66+vviTE=", - "owner": "wez", - "repo": "wezterm", - "rev": "b28bbbc4c8345197e433590c9ce50a7bf3ea5bc7", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "repo": "wezterm", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils_2", + "flake-utils": [ + "ghostty", + "flake-utils" + ], "nixpkgs": [ "ghostty", "nixpkgs-stable" ] }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "lastModified": 1738239110, + "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "rev": "1a8fb6f3a04724519436355564b95fce5e272504", "type": "github" }, "original": { @@ -704,20 +459,29 @@ "type": "github" } }, - "zlib": { - "flake": false, + "zig2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, "locked": { - "lastModified": 1705948357, - "narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=", - "owner": "madler", - "repo": "zlib", - "rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf", + "lastModified": 1738263917, + "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", "type": "github" }, "original": { - "owner": "madler", - "ref": "v1.3.1", - "repo": "zlib", + "owner": "jcollie", + "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "repo": "zig2nix", "type": "github" } } diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 3eb7d84..b4fc04e 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -52,13 +52,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - wezterm = { - url = "github:wez/wezterm?dir=nix"; - inputs = { - # nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; }; outputs = @@ -69,7 +62,6 @@ nix-index-database, nixvim, fenix, - # wezterm, nixneovimplugins, ghostty, ... @@ -90,16 +82,6 @@ }; overlays = [ ghostty.overlays.default - # (_final: prev: { - # ghostty = ghostty.packages.${prev.system}.default; - # }) - # (_final: prev: { - # wezterm = - # if (builtins.hasAttr "wezterm" inputs) - # then inputs.wezterm.packages.${prev.system}.default - # else prev.wezterm; - # }) - # (_final: prev: {inherit (neovidenixpkgs.legacyPackages.${prev.system}) neovide;}) nixneovimplugins.overlays.default fenix.overlays.default ];