diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua index fa0c0d2..c3bd102 100644 --- a/after/plugin/bufferline.lua +++ b/after/plugin/bufferline.lua @@ -1,5 +1,5 @@ vim.opt.termguicolors = true -require('bufferline').setup{ +require("bufferline").setup({ options = { diagnostics = "nvim_lsp", themable = false, @@ -7,11 +7,11 @@ require('bufferline').setup{ { filetype = "neo-tree", text = "File Tree", - separator = true - } + separator = true, + }, }, separator_style = "slant", show_buffer_close_icons = false, show_close_icon = false, - } -} + }, +}) diff --git a/after/plugin/gitblame.lua b/after/plugin/gitblame.lua deleted file mode 100644 index e69de29..0000000 diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua index 1a85e0c..a0e1caf 100644 --- a/after/plugin/gitsigns.lua +++ b/after/plugin/gitsigns.lua @@ -1,9 +1,8 @@ -require('gitsigns').setup{ +require("gitsigns").setup({ current_line_blame = true, current_line_blame_opts = { - virt_text_pos = 'right_align', - delay = 0 + virt_text_pos = "right_align", + delay = 0, }, - current_line_blame_formatter = ', - ' -} - + current_line_blame_formatter = ", - ", +}) diff --git a/after/plugin/indent.lua b/after/plugin/indent.lua index b805c2e..e1a2a83 100644 --- a/after/plugin/indent.lua +++ b/after/plugin/indent.lua @@ -1,3 +1,3 @@ -require('ibl').setup{ - scope = { enabled = true } -} +require("ibl").setup({ + scope = { enabled = true }, +}) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index 7a95e35..3dcafc6 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -23,3 +23,4 @@ lspconfig.lua_ls.setup({ end, }) +lspconfig.nixd.setup({}) diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua index 9625307..19c7ac5 100644 --- a/after/plugin/lualine.lua +++ b/after/plugin/lualine.lua @@ -1,6 +1,6 @@ -require('lualine').setup{ +require("lualine").setup({ options = { globalstatus = true, - theme = 'dracula-nvim' - } -} + theme = "dracula-nvim", + }, +}) diff --git a/after/plugin/neotree.lua b/after/plugin/neotree.lua index 5158354..1ce972e 100644 --- a/after/plugin/neotree.lua +++ b/after/plugin/neotree.lua @@ -1,16 +1,16 @@ -require('neo-tree').setup{ +require("neo-tree").setup({ close_if_last_window = false, enable_diagnostics = true, enable_git_status = true, filesystem = { filtered_items = { - visible = true + visible = true, }, follow_current_file = { - enabled = true + enabled = true, }, - use_libuv_file_watcher = true - } -} + use_libuv_file_watcher = true, + }, +}) vim.keymap.set("n", "1", "Neotree toggle") diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua index c67b54f..abd0da1 100644 --- a/after/plugin/telescope.lua +++ b/after/plugin/telescope.lua @@ -1,4 +1,4 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.git_files, {}) -vim.keymap.set('n', 'fa', builtin.find_files, {}) -vim.keymap.set('n', 'gf', builtin.live_grep, {}) +local builtin = require("telescope.builtin") +vim.keymap.set("n", "ff", builtin.git_files, {}) +vim.keymap.set("n", "fa", builtin.find_files, {}) +vim.keymap.set("n", "gf", builtin.live_grep, {}) diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua index 75b8af7..71fa36c 100644 --- a/after/plugin/treesitter.lua +++ b/after/plugin/treesitter.lua @@ -1,4 +1,4 @@ -require'nvim-treesitter.configs'.setup { +require("nvim-treesitter.configs").setup({ ensure_installed = { "bash", @@ -30,4 +30,4 @@ require'nvim-treesitter.configs'.setup { enable = true, additional_vim_regex_highlighting = false, }, -} +}) diff --git a/init.lua b/init.lua index aacf30b..2ce22c0 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,3 @@ -require('plugins') -require('remaps') -require('options') - +require("plugins") +require("remaps") +require("options") diff --git a/lua/plugins.lua b/lua/plugins.lua index 021c4af..2b463c4 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,55 +1,57 @@ -return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use 'lewis6991/gitsigns.nvim' - use "lukas-reineke/indent-blankline.nvim" - use "mrcjkb/nvim-lastplace" - use "akinsho/toggleterm.nvim" +return require("packer").startup(function(use) + use("wbthomason/packer.nvim") + use("lewis6991/gitsigns.nvim") + use("lukas-reineke/indent-blankline.nvim") + use("mrcjkb/nvim-lastplace") + use("akinsho/toggleterm.nvim") + use("wesleimp/stylua.nvim") + use("neovim/nvim-lspconfig") - use { - 'akinsho/bufferline.nvim', + use({ + "akinsho/bufferline.nvim", as = "bufferline.nvim", requires = { - {'nvim-tree/nvim-web-devicons'} - } - } + { "nvim-tree/nvim-web-devicons" }, + }, + }) - use { + use({ "kdheepak/lazygit.nvim", requires = { - "nvim-lua/plenary.nvim", + "nvim-lua/plenary.nvim", }, - } + }) - use { - 'Mofiqul/dracula.nvim', + use({ + "Mofiqul/dracula.nvim", config = function() - vim.cmd[[colorscheme dracula]] - end - } + vim.cmd([[colorscheme dracula]]) + end, + }) - use { - "nvim-neo-tree/neo-tree.nvim", + use({ + "nvim-neo-tree/neo-tree.nvim", requires = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim" - } - } + "MunifTanjim/nui.nvim", + }, + }) - use { - 'nvim-lualine/lualine.nvim', - requires = { 'nvim-tree/nvim-web-devicons', opt = true } - } + use({ + "nvim-lualine/lualine.nvim", + requires = { "nvim-tree/nvim-web-devicons", opt = true }, + }) - use { - 'nvim-telescope/telescope.nvim', + use({ + "nvim-telescope/telescope.nvim", requires = { - {'nvim-lua/plenary.nvim'} - } - } + { "nvim-lua/plenary.nvim" }, + }, + }) - use { - 'nvim-treesitter/nvim-treesitter', - { run = ':TSUpdate' } - } + use({ + "nvim-treesitter/nvim-treesitter", + { run = ":TSUpdate" }, + }) end) diff --git a/lua/remaps.lua b/lua/remaps.lua index 7258ee4..4897f89 100644 --- a/lua/remaps.lua +++ b/lua/remaps.lua @@ -3,4 +3,3 @@ vim.keymap.set("n", "", vim.cmd.bnext) vim.keymap.set("n", "", vim.cmd.nohlsearch) vim.keymap.set("n", "w", "bdeletebnext") vim.keymap.set("n", "q", vim.cmd.close) -