add oil, colors

config/init.lua

@@ -1,6 +1,2 @@
-require("blankline-conf")
-require("nvim-conf")
+require("minimal-init")
 require("nvim-treesitter-conf")
-require("telescope-conf")
-require("toggleterm-conf")
-require("mini-conf")

config/lua/blankline-conf.lua

@@ -1,6 +0,0 @@
-vim.cmd([[ hi IndentBlanklineChar ctermfg=240 ]])
-vim.cmd([[ hi IndentBlanklineContextChar ctermfg=7 ]])
--- require("indent_blankline").setup {
---     show_current_context = true,
---     show_current_context_start = true,
--- }

config/lua/gitsigns-conf.lua

@@ -0,0 +1,32 @@
+require('gitsigns').setup{
+    signs = {
+        add = { text = '✓'},
+        change = { text = '↔'},
+        delete = { text = '✗'},
+    },
+    signcolumn = auto,
+    on_attach = function()
+        vim.wo.signcolumn = "yes"
+        vim.cmd [[ hi SignColumn ctermbg=none]]
+        vim.cmd [[ hi GitSignsAdd ctermbg=none]]
+        vim.cmd [[ hi GitSignsDelete ctermbg=none]]
+        vim.cmd [[ hi GitSignsChange ctermbg=none]]
+    end
+}
+
+require("neogit").setup({
+    disable_context_highlighting = true
+})
+vim.cmd [[ hi DiffAdd ctermbg=none ]]
+vim.cmd [[ hi DiffDelete ctermbg=none ]]
+vim.cmd [[ hi DiffContext ctermbg=none ]]
+vim.cmd [[ hi NeogitHunkHeader ctermbg=none ]]
+vim.cmd [[ hi NeogitHunkHeader ctermbg=none ]]
+
+require("rose-pine").setup({
+    variant = "moon",
+    disable_background = true,
+    disable_float_background = true
+})
+
+vim.cmd.colorscheme "rose-pine"

config/lua/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("vim-go")
-}

config/lua/nvim-conf.lua

@@ -36,6 +36,7 @@ vim.opt.splitbelow = true
 vim.opt.splitright = true
 vim.opt.swapfile = false
 vim.opt.tabstop = 4                         -- 4 space tabs
+vim.opt.termguicolors = true
 vim.opt.undofile = true                     -- enable auto save of undos
 vim.opt.updatetime = 250                    -- decrease update time
 vim.opt.virtualedit = "onemore"
@@ -49,6 +50,8 @@ vim.g.indent_blankline_use_treesitter = true
 
 -- highlight indents
 vim.cmd([[ hi Whitespace ctermfg=240 ]])
+-- highlight floats
+vim.cmd([[ hi NormalFloat ctermbg=none ]])
 -- mappings
 ----------------------------------------
 

config/lua/nvim-treesitter-conf.lua

@@ -11,8 +11,6 @@ require("nvim-treesitter.configs").setup {
             enable = true,
             lookahead = true,
             keymaps = {
-                ['ac'] = '@comment.outer',
-                ['ic'] = '@comment.inner',
                 ["af"] = "@function.outer",
                 ["if"] = "@function.inner",
                 ["aa"] = "@call.inner",
@@ -25,18 +23,10 @@ require("nvim-treesitter.configs").setup {
                 [']]'] = '@function.outer',
                 [']m'] = '@class.outer',
             },
-            goto_next_end = {
-                [']['] = '@function.outer',
-                [']M'] = '@class.outer',
-            },
             goto_previous_start = {
                 ['[['] = '@function.outer',
                 ['[m'] = '@class.outer',
             },
-            goto_previous_end = {
-                ['[]'] = '@function.outer',
-                ['[M'] = '@class.outer',
-            },
         },
     },
     incremental_selection = {

config/lua/oil-conf.lua

@@ -0,0 +1,14 @@
+local oil = require('oil')
+oil.setup({
+    columns = {
+        "permissions",
+        "size"
+    },
+    view_options = {
+        show_hidden = true
+    },
+    keymaps = {
+        ["wq"] = "actions.close"
+    }
+})
+vim.keymap.set("n", "<leader>c", oil.open, {noremap = true, silent = true});

config/lua/telescope-conf.lua

@@ -11,7 +11,8 @@ vim.keymap.set("n", "<leader>fr", telescope.lsp_references, {noremap = true, sil
 -- fix highlighting
 vim.cmd([[ hi telescopeselection ctermfg=242 ctermbg=252 ]])
 
-require("telescope").setup({
+local telescope = require("telescope")
+telescope.setup({
     defaults = {
         layout_strategy = "vertical",
         layout_config = { width = .90, },
@@ -47,3 +48,4 @@ require("telescope").setup({
         },
     }
 })
+telescope.load_extension("fzf")

config/minimal-init.lua

@@ -0,0 +1,6 @@
+require("nvim-conf")
+require("telescope-conf")
+require("toggleterm-conf")
+require("mini-conf")
+require("gitsigns-conf")
+require("oil-conf")