summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--after/plugin/nord.lua9
-rw-r--r--init.lua45
2 files changed, 30 insertions, 24 deletions
diff --git a/after/plugin/nord.lua b/after/plugin/nord.lua
deleted file mode 100644
index 5181b47..0000000
--- a/after/plugin/nord.lua
+++ /dev/null
@@ -1,9 +0,0 @@
--- vim.g.nord_contrast = true
--- vim.g.nord_borders = false
-vim.g.nord_disable_background = true
-vim.g.nord_italic = false
--- vim.g.nord_uniform_diff_background = true
-vim.g.nord_bold = false
-
--- Load the colorscheme
-require('nord').set()
diff --git a/init.lua b/init.lua
index d4122d0..13a7c46 100644
--- a/init.lua
+++ b/init.lua
@@ -69,14 +69,6 @@ require('packer').startup(function(use)
}
- use {
- 'nvim-tree/nvim-tree.lua',
- -- requires = {
- -- 'nvim-tree/nvim-web-devicons', -- optional, for file icons
- -- },
- -- tag = 'nightly' -- optional, updated every week. (see issue #1193)
- }
-
use 'mattn/emmet-vim'
use 'lewis6991/gitsigns.nvim'
@@ -129,17 +121,44 @@ require('symbols-outline').setup {
}
}
+-- vim.g.nord_contrast = true
+-- vim.g.nord_borders = false
+vim.g.nord_disable_background = true
+vim.g.nord_italic = false
+-- vim.g.nord_uniform_diff_background = true
+vim.g.nord_bold = false
+
+-- Load the colorscheme
+require('nord').set()
-require('lualine').setup {
+LuaLineConf = {
options = {
icons_enabled = false,
component_separators = '|',
section_separators = '',
- -- theme = 'nord',
theme = 'nord',
},
+ sections = {
+ lualine_a = {'mode'},
+ lualine_b = {'branch', 'diff', 'diagnostics'},
+ lualine_c = {
+ {
+ 'filename',
+ file_status = true,
+ -- 0 filename
+ -- 1 relative path
+ -- 2 abs path
+ -- 3 abs path with ~
+ path = 3
+ },
+ },
+ lualine_x = {'encoding', 'fileformat', 'filetype'},
+ lualine_y = {'progress'},
+ lualine_z = {'location'}
+ }
}
-require('lualine').setup()
+
+require('lualine').setup(LuaLineConf)
require('Comment').setup()
@@ -183,8 +202,4 @@ vim.keymap.set('n', '<leader>so', function()
vim.cmd('SymbolsOutline')
end)
-vim.keymap.set('n', '<C-n>', function()
- vim.cmd('NvimTreeToggle')
-end)
-