diff --git a/flake.lock b/flake.lock index 2b48909..71b78ca 100644 --- a/flake.lock +++ b/flake.lock @@ -29,9 +29,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -415,11 +413,11 @@ ] }, "locked": { - "lastModified": 1691672736, - "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", + "lastModified": 1691856649, + "narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", + "rev": "406d34d919e9e8b831b531782cf5ef6995188566", "type": "github" }, "original": { @@ -438,11 +436,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1691660736, - "narHash": "sha256-lPChjBhCHdj9hUZHs1Sd2aaQ2T74hZgIjXvsM+TxcSg=", + "lastModified": 1691805017, + "narHash": "sha256-NQOpkyZ2rjO10qA0gZY2goOtEnAYvl+LYRcuNI66vi4=", "owner": "neovim", "repo": "neovim", - "rev": "3d948a4dc4b2cd3c8d3ac497caf3dfe25adfb90d", + "rev": "58a1ef8e6a93c615379f6fbe7234697bcdc42b3e", "type": "github" }, "original": { @@ -463,11 +461,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1691741915, - "narHash": "sha256-uBlfpk973o7dyYFqPlt8YWbx1rsWCVa9mMKHQOEVKS0=", + "lastModified": 1691828265, + "narHash": "sha256-445vNQ6bte7mPB0f6lb5aJ/Xrpa21URuWPP9G2o2CLY=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "cc314867f7c35c7915eba894d8f43e6162f41e5e", + "rev": "37feb2e1a9e50faf71f74aa41a8139e6f17aa5d5", "type": "github" }, "original": { @@ -498,11 +496,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1691730710, - "narHash": "sha256-q/UBet5RdX8CBjOIpI2Y8EB8DXYr9cb7WuNGTP9HKf8=", + "lastModified": 1691871742, + "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f61352cf8066ddd3dfe9058e62184bae7382672d", + "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6", "type": "github" }, "original": { @@ -514,11 +512,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1691592289, - "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=", + "lastModified": 1691693223, + "narHash": "sha256-9t8ZY1XNAsWqxAJmXgg+GXqF5chORMVnBT6PSHaRV3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7", + "rev": "18784aac1013da9b442adf29b6c7c228518b5d3f", "type": "github" }, "original": { @@ -530,15 +528,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691683125, - "narHash": "sha256-FMU62G57HDbJwU+9V3q7I0mBaQYTYQdtPNlJt2t5/A4=", - "owner": "nixos", + "lastModified": 1686519857, + "narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d2389b927696ef8da4ef76b03f2d306faf87929", + "rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -628,6 +626,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1691853136, + "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f0451844bbdf545f696f029d1448de4906c7f753", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": "flake-compat_3", @@ -695,7 +709,7 @@ "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "treefmt-nix": "treefmt-nix_2" } @@ -801,11 +815,11 @@ ] }, "locked": { - "lastModified": 1691522377, - "narHash": "sha256-1LafgFJaSk53ccsTlI2gWSmIyxRJfFVyoaGJg0c3LjM=", + "lastModified": 1691833704, + "narHash": "sha256-ASGhgGduEgcD3gQZhGr8xtmZ3PlVY+m2HuPnIZDbu78=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7b380d3cce8271b37394790b521ec2f7a6b248ad", + "rev": "19dee4bf6001849006a63f3435247316b0488e99", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9271ed0..d2a1838 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ attic = { url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; nifoc-overlay = { diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index e57a3bb..7f992d4 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -61,6 +61,7 @@ nix-tree nix-output-monitor nurl + ouch parallel q ripgrep diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 5b6373f..49794d3 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-11"; + version = "2023-08-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "fa414da96f4a2e60c2ac8082f0c1802b8f3c8f6c"; - sha256 = "027702lqkkn1pmwnypmwx1s8bz6lg6ix882g1rcwyrpn3lb85489"; + rev = "800b2f388b0f880be8a2fcd29494f7459af30a21"; + sha256 = "18zyqj9s071fx8i9m3rmwsy98rv6h2mcl2i8vblhaa55nv6f7y4j"; fetchSubmodules = false; }; }; @@ -341,12 +341,12 @@ in }; nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-08-10"; + version = "2023-08-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "3b9f28061a67b19cadc13946de981426a6425e4a"; - sha256 = "11vxrizzkgk3x2hnd5cjdg53m5hjlf8548hi8aqfnfpr977d3v9s"; + rev = "51f1e11a89ec701221877532ee1a23557d291dd5"; + sha256 = "11v940v6md7sj1digh7kwckb80zbxxp3shlszi44c43iw9viznxi"; fetchSubmodules = false; }; };