From feb1e92668e67a9ccd402966b9cee1529d7be464 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 12 Jan 2024 17:01:45 -0300 Subject: [PATCH] feat: use custom nixvim --- flake.lock | 378 +++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 4 +- home-manager.nix | 3 +- 3 files changed, 368 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index ea26454..716e5d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,158 @@ { "nodes": { + "custom-neovim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim", + "rustaceanvim": "rustaceanvim", + "transparent-nvim": "transparent-nvim" + }, + "locked": { + "lastModified": 1705034635, + "narHash": "sha256-DNANJO++VSKg3ZORkFmMg22lQW+T0jQKX0IIrLKRNXU=", + "owner": "wizardlink", + "repo": "neovim", + "rev": "39dad04085e1de33dbf8113c6f3ef15aa40601f2", + "type": "github" + }, + "original": { + "owner": "wizardlink", + "repo": "neovim", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "custom-neovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "custom-neovim", + "nixvim", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { + "inputs": { + "nixpkgs": [ + "custom-neovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -26,16 +167,16 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1704130669, - "narHash": "sha256-Di2mccbCeKie3mEMmbXQl38ltLm0wevNctcMWSe8IsU=", + "lastModified": 1704997360, + "narHash": "sha256-6aRrvgSdeCeyCGCThcIXvWPTcDlgrATM2wOECUXgwc8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "46753b1f22478c64222e5d9f7e0fb4c10b001be6", + "rev": "babb9c07b045e21b5549cdcc3096d677e9db35b3", "type": "github" }, "original": { @@ -90,6 +231,46 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "custom-neovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1694857738, @@ -107,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -121,15 +302,165 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1702645756, + "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1705021258, + "narHash": "sha256-ir9Y7sVPZp1fhOMnepExBNoPjKnk8qu6D7mA3FquXnc=", + "owner": "wizardlink", + "repo": "nixvim", + "rev": "b2cb41d92130aad17fa63dc5f646420299589dab", + "type": "github" + }, + "original": { + "owner": "wizardlink", + "repo": "nixvim", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "custom-neovim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "custom-neovim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704668415, + "narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { - "home-manager": "home-manager", + "custom-neovim": "custom-neovim", + "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-hyprfocus": "hyprland-hyprfocus", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_4" + } + }, + "rustaceanvim": { + "flake": false, + "locked": { + "lastModified": 1704966873, + "narHash": "sha256-0vYqbKFYOoaJBXxjb/aG+r+wynPVc8aaUsio10odTfE=", + "owner": "mrcjkb", + "repo": "rustaceanvim", + "rev": "d03f72788b81cb311250d9fe0692f3435d609b5a", + "type": "github" + }, + "original": { + "owner": "mrcjkb", + "repo": "rustaceanvim", + "type": "github" } }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -144,6 +475,22 @@ "type": "github" } }, + "transparent-nvim": { + "flake": false, + "locked": { + "lastModified": 1699805216, + "narHash": "sha256-wT+7rmp08r0XYGp+MhjJX8dsFTar8+nf10CV9OdkOSk=", + "owner": "xiyaowong", + "repo": "transparent.nvim", + "rev": "fd35a46f4b7c1b244249266bdcb2da3814f01724", + "type": "github" + }, + "original": { + "owner": "xiyaowong", + "repo": "transparent.nvim", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { @@ -169,6 +516,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -179,11 +527,11 @@ ] }, "locked": { - "lastModified": 1703514399, - "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", + "lastModified": 1704400467, + "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", + "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c3386da..11db1ba 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,9 @@ url = "github:VortexCoyote/hyprfocus"; inputs.hyprland.follows = "hyprland"; }; + + # My neovim configuration using nixvim. + custom-neovim.url = "github:wizardlink/neovim"; }; outputs = { @@ -25,7 +28,6 @@ nixpkgs, home-manager, hyprland, - hyprland-hyprfocus, ... }@inputs: { nixosConfigurations.nixos = diff --git a/home-manager.nix b/home-manager.nix index 32e316c..4610ad1 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, custom-neovim, ... }: { # @@ -108,6 +108,7 @@ ## Development lazygit neofetch + custom-neovim.packages.${system}.default vscode-extensions.vadimcn.vscode-lldb ## Desktop environment