Skip to content

Commit

Permalink
chore: niv update
Browse files Browse the repository at this point in the history
This update broke a bunch of neovim nightly related things that took way
to long to figure out. I ended up needing to make a couple of changes to
my config to get things working again:

- Disable gitsigns
- Remove vim-polyglot

Gitsigns is broken due to an old version of the plugin being pulled in
via the nix luaRocks package versions in nixpkgs. This was originally
identified on NixOS/nixpkgs#188302, which tracked it back to
NixOS/nixpkgs#185723, which I'm now following so I'll know when to try
re-enabling gitsigns. This is a bit of a bummer.

vim-polyglot just started failing the nix build while generating the
remote plugin manifest. I don't actually care that much about
vim-polyglot, so I just ripped it out and added the few language plugins
I actually care about directly. I'm sure I missed something, but it's
easy to add new languages. IIRC there were some things I needed to work
around with vim-polyglot anyways (like vim-go not loading everything),
so no big loss here.

Overall way too exciting of a `niv update`.
  • Loading branch information
bookest committed Sep 3, 2022
1 parent 889fcd1 commit f2e9242
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion nix/modules/neovim/config/lua/bookest/plugins/init.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'bookest.plugins.cmp'
require 'bookest.plugins.gitsigns'
-- require 'bookest.plugins.gitsigns'
require 'bookest.plugins.harpoon'
require 'bookest.plugins.lualine'
require 'bookest.plugins.telescope'
Expand Down
5 changes: 4 additions & 1 deletion nix/modules/neovim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ in
gitsigns-nvim
gruvbox-material
harpoon
kotlin-vim
lualine-nvim
luasnip
nvim-cmp
nvim-lspconfig
rust-vim
telescope-nvim
typescript-vim
vim-better-whitespace
vim-commentary
vim-go
vim-nix
vim-polyglot
vim-surround
];

Expand Down
18 changes: 9 additions & 9 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"homepage": "https://rycee.gitlab.io/home-manager/",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c",
"sha256": "0r6hmz68mlir68jk499yii7g2qprxdn76i3bgky6qxsy8vz78mgi",
"rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
"sha256": "0x1wxx2zrml540k4ir6pbayw53mj9yzglh0ymy5vfpb55ddqn9cx",
"type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/4c5106ed0f3168ff2df21b646aef67e86cbfc11c.tar.gz",
"url": "https://github.com/nix-community/home-manager/archive/5bd66dc6cd967033489c69d486402b75d338eeb6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
Expand All @@ -41,10 +41,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d6df226c53d46821bd4773bd7ec3375f30238edb",
"sha256": "1j36hifmd366pw28cyj9f4zkl2qibz8nvl0dmq9jgnwqw71ipqwf",
"rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
"sha256": "1kicpg62jsyh4blyykvbkq1vg4rv56k22qpp8kr9mj3fjabkrr27",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/d6df226c53d46821bd4773bd7ec3375f30238edb.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/21de2b973f9fee595a7a1ac4693efff791245c34.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"pre-commit-hooks": {
Expand All @@ -53,10 +53,10 @@
"homepage": "",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e",
"sha256": "1jq33qaayi253xvpa1clh5ib83zh2dfgcxmp6d3ya894x9md3l6b",
"rev": "8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8",
"sha256": "0ll3dbqbsj6cawvjj66c1h8635qwbrhp8i34lzhbc2rnmzfp2j0x",
"type": "tarball",
"url": "https://github.com/cachix/pre-commit-hooks.nix/archive/db3bd555d3a3ceab208bed48f983ccaa6a71a25e.tar.gz",
"url": "https://github.com/cachix/pre-commit-hooks.nix/archive/8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

0 comments on commit f2e9242

Please sign in to comment.