From 3839812ab1e84cb1ed2b0cbbfad4ef56afa717ac Mon Sep 17 00:00:00 2001 From: noe Date: Tue, 23 Jan 2024 00:19:42 -0500 Subject: [PATCH] vim? --- flake.lock | 132 +++++++++++++++++++--------------- flake.nix | 2 +- home-manager/features/vim.nix | 23 +++--- 3 files changed, 89 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index c17e535..8dc9512 100644 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "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-utils": { "inputs": { "systems": "systems" @@ -215,24 +236,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -311,6 +314,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705879479, + "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "kde2nix": { "inputs": { "flake-utils": "flake-utils_2", @@ -331,6 +355,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1693701915, @@ -414,22 +459,6 @@ } }, "nixpkgs-stable_3": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1705033721, "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", @@ -527,24 +556,25 @@ }, "nixvim": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-parts": "flake-parts", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs-unstable" ], "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1703859882, - "narHash": "sha256-wRXgap0eEuswF9xXUKDiWBh0tKuJ9vtmlJZ4iAX3K/E=", + "lastModified": 1705961248, + "narHash": "sha256-sqK417zKqVoxallioKRtHMSssOJT6gEpQ9FIuBKIoG0=", "owner": "nix-community", "repo": "nixvim", - "rev": "1d8e7906c9606c956c6b40d8d088c8d2110dc0c0", + "rev": "01c21406c6f4f6c137f861f9503572c5d0c9d98b", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixvim", - "rev": "1d8e7906c9606c956c6b40d8d088c8d2110dc0c0", "type": "github" } }, @@ -579,13 +609,16 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { "lastModified": 1702456155, @@ -679,7 +712,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1705805983, @@ -739,21 +772,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 343caf0..c3541b4 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ # Fancy stuff #nix-colors.url = "github:misterio77/nix-colors"; nixvim = { - url = "github:nix-community/nixvim?rev=1d8e7906c9606c956c6b40d8d088c8d2110dc0c0"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; #nur.url = "github:nix-community/nur"; diff --git a/home-manager/features/vim.nix b/home-manager/features/vim.nix index ef3d7f5..67aa6cb 100644 --- a/home-manager/features/vim.nix +++ b/home-manager/features/vim.nix @@ -38,7 +38,7 @@ }; lightline.enable = true; toggleterm.enable = true; - rainbow-delimiters.enable = true; + #rainbow-delimiters.enable = true; treesitter.enable = true; barbar.enable = true; gitgutter.enable = true; @@ -49,15 +49,18 @@ luasnip.enable = true; - lsp = { - enable = true; - servers = { - nil_ls.enable = true; - rust-analyzer.enable = true; - rust-analyzer.installRustc = false; # use rustc in nix shells, maybe? - rust-analyzer.installCargo = false; - }; - }; + #lsp = { + # enable = true; + # servers = { + # nil_ls.enable = true; + # rust-analyzer.enable = true; + # rust-analyzer.installRustc = false; # use rustc in nix shells, maybe? + # rust-analyzer.installCargo = false; + # tsserver.enable = true; + # htmx.enable = true; + # html.enable = true; + # }; + #}; }; extraPlugins = with pkgs.vimPlugins; [