Mainly alignment

after/plugin/colors.lua

@@ -1,10 +1,11 @@
 function ColorMyPencils(color)
-	color = color or "dichromatic"
+    color = color or "dichromatic"
-	vim.cmd.colorscheme(color)
+    vim.cmd.colorscheme(color)
-
-	vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-	vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 
+    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 end
 
+vim.keymap.set("n", "<leader>c", function() ColorMyPencils() end)
+
 ColorMyPencils()

after/plugin/harpoon.lua

@@ -3,7 +3,7 @@ local ui = require("harpoon.ui")
 
 vim.keymap.set("n", "<leader>a", mark.add_file)
 vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+vim.keymap.set("n", "<leader>1", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
+vim.keymap.set("n", "<leader>2", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
+vim.keymap.set("n", "<leader>3", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
+vim.keymap.set("n", "<leader>4", function() ui.nav_file(4) end)

after/plugin/lsp.lua

@@ -1,13 +1,13 @@
 local lsp = require('lsp-zero').preset({})
 
 lsp.ensure_installed({
-  'lua_ls',  -- Lua
+    'lua_ls',               -- Lua
-  'rust_analyzer',  -- rust
+    'rust_analyzer',        -- rust
-  'texlab',  -- LaTeX
+    'texlab',               -- LaTeX
-  'clangd',  -- C/C++
+    'clangd',               -- C/C++
-  'jedi_language_server',  -- Python
+    'jedi_language_server', -- Python
-  'html', -- HTML
+    'html',                 -- HTML
-  'ocamllsp', -- OCaml
+    'ocamllsp',             -- OCaml
 })
 
 -- Fix undefined global 'vim'
@@ -33,14 +33,14 @@ lsp.configure('lua_ls', {
 })
 
 lsp.on_attach(function(_, bufnr)
-  lsp.default_keymaps({buffer = bufnr})
+    lsp.default_keymaps({ buffer = bufnr })
 end)
 
 lsp.set_sign_icons({
-  error = '✘',
+    error = '✘',
-  warn = '▲',
+    warn = '▲',
-  hint = '⚑',
+    hint = '⚑',
-  info = '»'
+    info = '»'
 })
 
 lsp.setup()

after/plugin/telescope.lua

@@ -2,5 +2,5 @@ local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
 vim.keymap.set('n', '<C-p>', builtin.git_files, {})
 vim.keymap.set('n', '<leader>ps', function()
-	builtin.grep_string({ search = vim.fn.input("Grep > ") });
+    builtin.grep_string({ search = vim.fn.input("Grep > ") });
 end)

after/plugin/treesitter.lua

@@ -1,21 +1,22 @@
-require'nvim-treesitter.configs'.setup {
+require 'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the five listed parsers should always be installed)
+    -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "rust", "cpp", "cmake", "latex", "python" },
+    ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "rust", "cpp", "cmake", "latex", "python", "groovy",
+        "ocaml" },
 
-  -- Install parsers synchronously (only applied to `ensure_installed`)
+    -- Install parsers synchronously (only applied to `ensure_installed`)
-  sync_install = false,
+    sync_install = false,
 
-  -- Automatically install missing parsers when entering buffer
+    -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+    -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
+    auto_install = true,
 
-  highlight = {
+    highlight = {
-    enable = true,
+        enable = true,
 
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+        -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+        -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
+        -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
+        -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
+        additional_vim_regex_highlighting = false,
-  },
+    },
 }

lua/flip/packer.lua

@@ -4,50 +4,49 @@
 vim.cmd [[packadd packer.nvim]]
 
 return require('packer').startup(function(use)
-  -- Packer can manage itself
+    -- Packer can manage itself
-  use 'wbthomason/packer.nvim'
+    use 'wbthomason/packer.nvim'
 
-  use {
+    use {
-	  'nvim-telescope/telescope.nvim', tag = '0.1.6',
+        'nvim-telescope/telescope.nvim', tag = '0.1.6',
-	  -- or                            , branch = '0.1.x',
+        -- or                            , branch = '0.1.x',
-	  requires = { {'nvim-lua/plenary.nvim'} }
+        requires = { { 'nvim-lua/plenary.nvim' } }
-  }
+    }
 
-  -- Color stuff
+    -- Color stuff
-  use ({
+    use({
-	'romainl/vim-dichromatic',
+        'romainl/vim-dichromatic',
-	config = function()
+        config = function()
-		vim.cmd('colorscheme dichromatic')
+            vim.cmd('colorscheme dichromatic')
-	end
+        end
-  })
+    })
 
-  -- Miscellaneous packages that fit on a line
+    -- Miscellaneous packages that fit on a line
-  use ('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
+    use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
-  use ('nvim-treesitter/playground')
+    use('nvim-treesitter/playground')
-  use ('theprimeagen/harpoon')
+    use('theprimeagen/harpoon')
-  use ('mbbill/undotree')
+    use('mbbill/undotree')
-  use ('tpope/vim-fugitive')
+    use('tpope/vim-fugitive')
 
-  -- LSP stuff
+    -- LSP stuff
-  use {
+    use {
-	  'VonHeikemen/lsp-zero.nvim',
+        'VonHeikemen/lsp-zero.nvim',
-	  branch = 'v2.x',
+        branch = 'v2.x',
-	  requires = {
+        requires = {
-		  -- LSP Support
+            -- LSP Support
-		  {'neovim/nvim-lspconfig'},             -- Required
+            { 'neovim/nvim-lspconfig' }, -- Required
-		  {                                      -- Optional
+            {                  -- Optional
-		  'williamboman/mason.nvim',
+                'williamboman/mason.nvim',
-		  run = function()
+                run = function()
-			  pcall(vim.cmd, 'MasonUpdate')
+                    pcall(vim.cmd, 'MasonUpdate')
-		  end,
+                end,
-	  },
+            },
-	  {'williamboman/mason-lspconfig.nvim'}, -- Optional
+            { 'williamboman/mason-lspconfig.nvim' }, -- Optional
-
-	  -- Autocompletion
-	  {'hrsh7th/nvim-cmp'},     -- Required
-	  {'hrsh7th/cmp-nvim-lsp'}, -- Required
-	  {'L3MON4D3/LuaSnip'},     -- Required
-  }
-  }
 
+            -- Autocompletion
+            { 'hrsh7th/nvim-cmp' }, -- Required
+            { 'hrsh7th/cmp-nvim-lsp' }, -- Required
+            { 'L3MON4D3/LuaSnip' }, -- Required
+        }
+    }
 end)

lua/flip/set.lua

@@ -33,4 +33,3 @@ vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "120"
 
-vim.g.mapleader = " "