aboutsummaryrefslogtreecommitdiff
path: root/modules/neovim
diff options
context:
space:
mode:
Diffstat (limited to 'modules/neovim')
-rw-r--r--modules/neovim/default.nix2
-rw-r--r--modules/neovim/nvim/lua/config/colorscheme.lua3
-rw-r--r--modules/neovim/nvim/lua/config/oil.lua2
-rw-r--r--modules/neovim/nvim/lua/config/settings.lua32
4 files changed, 3 insertions, 36 deletions
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 179bb1c..03b8831 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -77,7 +77,7 @@ in
oil-nvim
nvim-lspconfig
# tinted-vim
- base16-vim
+ base16-nvim
telescope-nvim
telescope-fzf-native-nvim
# fzf-lua
diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua
index bfbdcf8..eb7f8bb 100644
--- a/modules/neovim/nvim/lua/config/colorscheme.lua
+++ b/modules/neovim/nvim/lua/config/colorscheme.lua
@@ -1,4 +1,3 @@
-vim.cmd[[hi link FzfLuaBorder FloatBorder]]
vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
local colors = require('base16-colorscheme').colors
vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 })
@@ -13,7 +12,7 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
hi TabLine guibg=bg
]]
- vim.api.nvim_set_hl(0, 'FzfLuaBorder', { link = FloatBorder })
+ vim.api.nvim_set_hl(0, 'FzfLuaBorder', { fg = colors.base01 })
-- i dislike syntax highlighting
diff --git a/modules/neovim/nvim/lua/config/oil.lua b/modules/neovim/nvim/lua/config/oil.lua
index 492d4eb..592421b 100644
--- a/modules/neovim/nvim/lua/config/oil.lua
+++ b/modules/neovim/nvim/lua/config/oil.lua
@@ -1,7 +1,7 @@
require("oil").setup({
default_file_explorer = true,
columns = {
- "icon"
+ -- "icon"
},
constrain_cursor = "editable",
skip_confirm_for_simple_edits = true,
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 7448dc4..2ff8821 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -48,38 +48,6 @@ vim.opt.foldenable=true
-- vim.o.winborder = 'rounded' breaks telescope
vim.cmd[[set wildchar=<C-n>]]
--- vim.api.nvim_set_hl(0, 'Comment', {})
-vim.api.nvim_set_hl(0, 'Constant', {})
--- vim.api.nvim_set_hl(0, 'String', {})
-vim.api.nvim_set_hl(0, 'Character', { link = "String" })
-vim.api.nvim_set_hl(0, 'Number', {})
-vim.api.nvim_set_hl(0, 'Boolean', {})
-vim.api.nvim_set_hl(0, 'Float', {})
-vim.api.nvim_set_hl(0, 'Identifier', {})
-vim.api.nvim_set_hl(0, 'Function', {})
-vim.api.nvim_set_hl(0, 'Statement', {})
-vim.api.nvim_set_hl(0, 'Conditional', {})
-vim.api.nvim_set_hl(0, 'Repeat', {})
-vim.api.nvim_set_hl(0, 'Label', {})
-vim.api.nvim_set_hl(0, 'Operator', {})
-vim.api.nvim_set_hl(0, 'Keyword', {})
-vim.api.nvim_set_hl(0, 'Exception', {})
-vim.api.nvim_set_hl(0, 'PreProc', {})
-vim.api.nvim_set_hl(0, 'Include', {})
-vim.api.nvim_set_hl(0, 'Define', {})
-vim.api.nvim_set_hl(0, 'Macro', {})
-vim.api.nvim_set_hl(0, 'PreCondit', {})
-vim.api.nvim_set_hl(0, 'Type', {})
-vim.api.nvim_set_hl(0, 'StorageClass', {})
-vim.api.nvim_set_hl(0, 'Structure', {})
-vim.api.nvim_set_hl(0, 'Typedef', {})
-vim.api.nvim_set_hl(0, 'Special', {})
-vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' })
-vim.api.nvim_set_hl(0, 'Tag', {})
-vim.api.nvim_set_hl(0, 'Delimiter', {})
--- vim.api.nvim_set_hl(0, 'SpecialComment', {})
-vim.api.nvim_set_hl(0, 'Debug', {})
--- vim.api.nvim_set_hl(0, 'Underlined', {})
vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]]