diff --git a/flake.lock b/flake.lock index a210c7f..5e187c4 100644 --- a/flake.lock +++ b/flake.lock @@ -87,18 +87,38 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -138,6 +158,20 @@ } }, "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -156,16 +190,37 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -197,11 +252,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -233,20 +288,50 @@ "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ - "nixvim", + "nixvimstable", "nixpkgs" ], "nixpkgs-stable": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "nixvimunstable", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -258,7 +343,29 @@ "gitignore": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvimstable", + "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" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nixvimunstable", "git-hooks", "nixpkgs" ] @@ -343,16 +450,38 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -364,16 +493,37 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -416,11 +566,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -462,7 +628,7 @@ "type": "github" } }, - "nixvim": { + "nixvimstable": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", @@ -474,15 +640,43 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718028681, - "narHash": "sha256-C27X1vnsxKaKd1dCUU/u3LU+3DiA3Jo/ApvDiDNPIrI=", + "lastModified": 1723536338, + "narHash": "sha256-1bSEOtZBsAeCkg5vdDbDgOT3z91K8L/KE2s7J9hLYHw=", "owner": "nix-community", "repo": "nixvim", - "rev": "33a32c94176feebd3ff5259ce418b989b428d5ae", + "rev": "0b6aa80acbcb8387f2a4affb3dd22960ac2899aa", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-24.05", + "repo": "nixvim", + "type": "github" + } + }, + "nixvimunstable": { + "inputs": { + "devshell": "devshell_2", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks_2", + "home-manager": "home-manager_3", + "nix-darwin": "nix-darwin_2", + "nixpkgs": "nixpkgs_3", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1723816538, + "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", "repo": "nixvim", "type": "github" } @@ -502,6 +696,28 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723367906, + "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "owner": "NuschtOS", + "repo": "search", + "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -513,7 +729,8 @@ "nix23_05": "nix23_05", "nixstable": "nixstable", "nixunstable": "nixunstable", - "nixvim": "nixvim", + "nixvimstable": "nixvimstable", + "nixvimunstable": "nixvimunstable", "nurpkgs": "nurpkgs", "wsl": "wsl" } @@ -581,16 +798,37 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvimstable", "nixpkgs" ] }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nixvimunstable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", "type": "github" }, "original": { @@ -601,7 +839,7 @@ }, "wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixunstable" diff --git a/flake.nix b/flake.nix index 143de34..cfe8e47 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,8 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixstable"; }; - nixvim.url = "github:nix-community/nixvim"; + nixvimstable.url = "github:nix-community/nixvim/nixos-24.05"; + nixvimunstable.url = "github:nix-community/nixvim/main"; nix23_05.url = "github:NixOS/nixpkgs/nixos-23.05"; nixstable.url = "github:nixos/nixpkgs/nixos-24.05"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -45,7 +46,6 @@ nix23_05, nixstable, nixunstable, - nixvim, nurpkgs, wsl, @@ -65,15 +65,15 @@ ]; in { - checks = { - x86_64-linux = { - unstable = self.nixosConfigurations.jude.config.system.build.toplevel; - stable = self.nixosConfigurations.linode.config.system.build.toplevel; - }; - aarch64-linux = { - unstable = self.nixosConfigurations.nixos.config.system.build.toplevel; - }; - }; + #checks = { + # x86_64-linux = { + # unstable = self.nixosConfigurations.jude.config.system.build.toplevel; + # stable = self.nixosConfigurations.linode.config.system.build.toplevel; + # }; + # aarch64-linux = { + # unstable = self.nixosConfigurations.nixos.config.system.build.toplevel; + # }; + #}; nixosConfigurations = (import ./hosts { inherit inputs overlays; }); diff --git a/home/home.nix b/home/home.nix index aca3e10..ab46346 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,6 +1,7 @@ { pkgs, lib, inputs, host ? "most", + nixvim, ...}: let @@ -9,7 +10,7 @@ in { nixpkgs.config.allowUnfreePredicate = (_: true); imports = [ - inputs.nixvim.homeManagerModules.default + nixvim.homeManagerModules.default ./modules ] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ]; diff --git a/hosts/default.nix b/hosts/default.nix index 9fb8bb4..979c877 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -4,13 +4,15 @@ let unstable = args: (machine (args // { channel = inputs.nixunstable; hm = inputs.hmunstable; + nixvim = inputs.nixvimunstable; })); machine = { channel ? inputs.nixstable, extraMods ? [], name, system ? "x86_64-linux", - hm ? inputs.hm + hm ? inputs.hm, + nixvim ? inputs.nixvimstable, }: let nixpkgs = import channel { @@ -31,7 +33,7 @@ let useUserPackages = true; users.greg = import ../home/home.nix; extraSpecialArgs = { - inherit inputs overlays; + inherit inputs overlays nixvim; home = "/home/greg"; host = name; };