From 69ec94035cc00d132f7a79759dc5bfad878f5854 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Thu, 26 Dec 2024 10:52:35 -0800 Subject: [PATCH] Extra fixup based on weird colors and new needed config from MacOS --- attrs/vimPlugins.nix | 2 +- dotfiles/neovim/ftplugin/json.lua | 2 ++ dotfiles/neovim/lua/vim-stuff.lua | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/attrs/vimPlugins.nix b/attrs/vimPlugins.nix index 61b44a8..4af1969 100644 --- a/attrs/vimPlugins.nix +++ b/attrs/vimPlugins.nix @@ -40,6 +40,7 @@ with vimPlugins; fzf-lua git-blame-nvim haskell-tools-nvim + kanagawa-nvim lazygit-nvim luasnip markdown-preview-nvim @@ -61,7 +62,6 @@ with vimPlugins; siliconPlugin rest-nvim tabular - vim-colors-solarized vim-nix vimwiki which-key-nvim diff --git a/dotfiles/neovim/ftplugin/json.lua b/dotfiles/neovim/ftplugin/json.lua index 7e4fe4a..1474d15 100644 --- a/dotfiles/neovim/ftplugin/json.lua +++ b/dotfiles/neovim/ftplugin/json.lua @@ -1,2 +1,4 @@ vim.opt_local.foldmethod = "expr" vim.opt_local.foldexpr = "nvim_treesitter#foldexpr()" + +vim.opt_local.formatprg = "jq" diff --git a/dotfiles/neovim/lua/vim-stuff.lua b/dotfiles/neovim/lua/vim-stuff.lua index 583d5df..c7b9c56 100644 --- a/dotfiles/neovim/lua/vim-stuff.lua +++ b/dotfiles/neovim/lua/vim-stuff.lua @@ -9,4 +9,4 @@ vim.opt.expandtab = true -- make colors look nice vim.opt.background = "light" -vim.cmd("colorscheme solarized") +vim.cmd("colorscheme kanagawa")