nixpkgs/neovim: port config to lua and split up

.config/nixpkgs/neovim/autocmd.lua

@@ -0,0 +1,30 @@
+-- apply default terminal settings
+vim.api.nvim_create_autocmd('TermOpen', {
+  callback = function()
+    vim.bo.scrollback = 10000
+    vim.opt_local.number = false
+    vim.opt_local.relativenumber = false
+  end
+})
+
+-- automatically enter/leave terminal mode
+vim.api.nvim_create_autocmd('TermOpen', { command = 'startinsert' })
+vim.api.nvim_create_autocmd({'WinEnter','BufWinEnter'}, {
+  pattern = 'term://*',
+  command = 'startinsert',
+})
+vim.api.nvim_create_autocmd('BufLeave', {
+  pattern = 'term://*',
+  command = 'stopinsert',
+})
+
+-- strip trailing whitespace
+vim.api.nvim_create_autocmd('BufWritePre', { command = '%s/\\s\\+$//e' })
+
+-- filetype specific options
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = 'markdown',
+  callback = function()
+    vim.bo.textwidth = 80
+  end,
+})

.config/nixpkgs/neovim/flake.nix

@@ -29,8 +29,12 @@
         extraMakeWrapperArgs = "--prefix PATH : ${lib.makeBinPath extraPath}";
         configure = {
           customRC = ''
-            source ${./vimrc}
-            source ${./init.lua}
+            source ${./settings.lua}
+            source ${./plugins.lua}
+            source ${./mappings.lua}
+            source ${./autocmd.lua}
+            source ${./lsp.lua}
+            source ${./theme.lua}
           '';
           packages.myVimPackage = with vimPlugins; {
             start = [

.config/nixpkgs/neovim/init.lua

@@ -1,217 +0,0 @@
--- file/buffer/etc picker
-require('telescope').setup({
-  defaults = {
-    mappings = {
-      i = {
-        ['jj'] = 'close',
-        ['<C-j>'] = 'move_selection_next',
-        ['<C-k>'] = 'move_selection_previous',
-      },
-    },
-    layout_config = {
-      prompt_position = 'top',
-    },
-    sorting_strategy = 'ascending',
-  },
-})
-
--- use native sorter for better performance
-require('telescope').load_extension('fzf')
-
--- shows added/removed/changed lines
-require('gitsigns').setup()
-
-require('mini.statusline').setup({
-  content = {
-    -- copy-pasted from default, we just want to remove the icon
-    active = function()
-      local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
-      local git           = MiniStatusline.section_git({ trunc_width = 75, icon = '' })
-      local diagnostics   = MiniStatusline.section_diagnostics({ trunc_width = 75, icon = '' })
-      local filename      = MiniStatusline.section_filename({ trunc_width = 140 })
-      local fileinfo      = MiniStatusline.section_fileinfo({ trunc_width = 120 })
-      local location      = MiniStatusline.section_location({ trunc_width = 75 })
-
-      return MiniStatusline.combine_groups({
-        { hl = mode_hl,                  strings = { mode } },
-        { hl = 'MiniStatuslineDevinfo',  strings = { git, diagnostics } },
-        '%<', -- Mark general truncate point
-        { hl = 'MiniStatuslineFilename', strings = { filename } },
-        '%=', -- End left alignment
-        { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
-        { hl = mode_hl,                  strings = { location } },
-      })
-    end
-  },
-})
-
--- delete buffer while preserving layout
-require('mini.bufremove').setup()
-
--- shows a line indicating the current indentation scope
-require('mini.indentscope').setup()
-
--- LSP completion and function signature display
-require('mini.completion').setup({
-  delay = {
-    -- disable autocomplete
-    completion = 100000000,
-    info = 100,
-    signature = 50,
-  },
-  lsp_completion = {
-    source_func = 'omnifunc',
-    auto_setup = false,
-  },
-});
-
--- Use Treesitter for syntax highlighting
-require('nvim-treesitter.configs').setup({
-  highlight = {
-    enable = true,
-  },
-})
-
--- ------ Mappings ------
-
-local opts = { noremap=true, silent=true }
-vim.api.nvim_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-vim.api.nvim_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-vim.api.nvim_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist({ severity = { min = vim.diagnostic.severity.WARN } })<CR>', opts)
-
-vim.api.nvim_set_keymap('n', '<Leader>q', '<cmd>lua MiniBufremove.delete()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<C-P>', '<cmd>Telescope find_files<CR>', opts)
-vim.api.nvim_set_keymap('n', '<C-O>', '<cmd>Telescope buffers<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>ff', '<cmd>Telescope live_grep<CR>', opts)
-
--- Allow pressing enter to autocomplete
-vim.api.nvim_set_keymap('i', '<CR>', 'pumvisible() ? "\\<C-y>" : "\\<CR>"', { noremap = true, expr = true })
-
-function on_attach(client, bufnr)
-  -- Enable completion triggered by <c-x><c-o>
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.MiniCompletion.completefunc_lsp')
-
-  -- LSP-specific mappings
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>Telescope lsp_references<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>fs', '<cmd>Telescope lsp_document_symbols<CR>', opts)
-end
-
--- ------ LSP settings ------
-
--- only show virtual text for WARN and higher
-vim.diagnostic.config({
-  virtual_text = { severity = { min = vim.diagnostic.severity.WARN } }
-})
-
-local nvim_lsp = require('lspconfig')
-local null_ls = require('null-ls')
-
-local null_ls_sources = {}
-
--- enable LS / null-ls sources based on executable presence
-if vim.fn.executable("node_modules/.bin/eslint") == 1 then
-  table.insert(null_ls_sources, null_ls.builtins.formatting.eslint_d)
-  table.insert(null_ls_sources, null_ls.builtins.diagnostics.eslint_d)
-  table.insert(null_ls_sources, null_ls.builtins.code_actions.eslint_d)
-end
-
-if vim.fn.executable("gofmt") == 1 then
-  table.insert(null_ls_sources, null_ls.builtins.formatting.gofmt)
-end
-
-if vim.fn.executable("shellcheck") == 1 then
-  table.insert(null_ls_sources, null_ls.builtins.diagnostics.shellcheck)
-  table.insert(null_ls_sources, null_ls.builtins.code_actions.shellcheck)
-end
-
-if vim.fn.executable("deno") == 1 then
-  nvim_lsp.denols.setup({
-    on_attach = on_attach,
-  });
-  table.insert(null_ls_sources, null_ls.builtins.formatting.deno_fmt);
-end
-
-if vim.fn.executable("node_modules/.bin/tsc") == 1 then
-  -- this provides auto-import on completion, among other things
-  local ts_utils = require("nvim-lsp-ts-utils")
-
-  nvim_lsp.tsserver.setup({
-    init_options = ts_utils.init_options,
-    flags = {
-      debounce_text_changes = 150,
-    },
-    on_attach = function(client, bufnr)
-      -- mark tsserver as not having formatting available as we rely on
-      -- null-ls/eslint for that and having both available makes nvim ask us
-      -- which LS to use everytime we format
-      client.resolved_capabilities.document_formatting = false
-      client.resolved_capabilities.document_range_formatting = false
-
-      -- settings here are buffer-local so has to be run on_attach
-      ts_utils.setup({
-        debug = false,
-        disable_commands = false,
-        enable_import_on_completion = true,
-
-        -- import all
-        import_all_timeout = 5000, -- ms
-        -- lower numbers = higher priority
-        import_all_priorities = {
-            same_file = 1, -- add to existing import statement
-            local_files = 2, -- git files or files with relative path markers
-            buffer_content = 3, -- loaded buffer content
-            buffers = 4, -- loaded buffer names
-        },
-        import_all_scan_buffers = 100,
-        import_all_select_source = false,
-
-        -- filter diagnostics
-        filter_out_diagnostics_by_severity = {},
-        filter_out_diagnostics_by_code = {},
-
-        -- inlay hints
-        auto_inlay_hints = false,
-        inlay_hints_highlight = "Comment",
-
-        -- update imports on file move
-        update_imports_on_move = false,
-        require_confirmation_on_move = false,
-        watch_dir = nil,
-      })
-
-      -- required to fix code action ranges and filter diagnostics
-      ts_utils.setup_client(client)
-
-      on_attach(client, bufnr)
-    end,
-  })
-end
-
-null_ls.setup({
-  sources = null_ls_sources,
-
-  on_attach = function(client, bufnr)
-    -- format on save
-    if client.resolved_capabilities.document_formatting then
-      vim.cmd([[
-      augroup LspFormatting
-        autocmd! * <buffer>
-        autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()
-      augroup END
-      ]])
-    end
-  end,
-});

.config/nixpkgs/neovim/lsp.lua

@@ -0,0 +1,108 @@
+-- only show virtual text for WARN and higher
+vim.diagnostic.config({
+  virtual_text = { severity = { min = vim.diagnostic.severity.WARN } }
+})
+
+local nvim_lsp = require('lspconfig')
+local null_ls = require('null-ls')
+
+local null_ls_sources = {}
+
+-- enable LS / null-ls sources based on executable presence
+if vim.fn.executable("node_modules/.bin/eslint") == 1 then
+  table.insert(null_ls_sources, null_ls.builtins.formatting.eslint_d)
+  table.insert(null_ls_sources, null_ls.builtins.diagnostics.eslint_d)
+  table.insert(null_ls_sources, null_ls.builtins.code_actions.eslint_d)
+end
+
+if vim.fn.executable("gofmt") == 1 then
+  table.insert(null_ls_sources, null_ls.builtins.formatting.gofmt)
+end
+
+if vim.fn.executable("shellcheck") == 1 then
+  table.insert(null_ls_sources, null_ls.builtins.diagnostics.shellcheck)
+  table.insert(null_ls_sources, null_ls.builtins.code_actions.shellcheck)
+end
+
+if vim.fn.executable("deno") == 1 then
+  nvim_lsp.denols.setup({
+    on_attach = on_attach,
+  });
+  table.insert(null_ls_sources, null_ls.builtins.formatting.deno_fmt);
+end
+
+if vim.fn.executable("node_modules/.bin/tsc") == 1 then
+  -- this provides auto-import on completion, among other things
+  local ts_utils = require("nvim-lsp-ts-utils")
+
+  nvim_lsp.tsserver.setup({
+    init_options = ts_utils.init_options,
+    flags = {
+      debounce_text_changes = 150,
+    },
+    on_attach = function(client, bufnr)
+      -- mark tsserver as not having formatting available as we rely on
+      -- null-ls/eslint for that and having both available makes nvim ask us
+      -- which LS to use everytime we format
+      client.resolved_capabilities.document_formatting = false
+      client.resolved_capabilities.document_range_formatting = false
+
+      -- settings here are buffer-local so has to be run on_attach
+      ts_utils.setup({
+        debug = false,
+        disable_commands = false,
+        enable_import_on_completion = true,
+
+        -- import all
+        import_all_timeout = 5000, -- ms
+        -- lower numbers = higher priority
+        import_all_priorities = {
+            same_file = 1, -- add to existing import statement
+            local_files = 2, -- git files or files with relative path markers
+            buffer_content = 3, -- loaded buffer content
+            buffers = 4, -- loaded buffer names
+        },
+        import_all_scan_buffers = 100,
+        import_all_select_source = false,
+
+        -- filter diagnostics
+        filter_out_diagnostics_by_severity = {},
+        filter_out_diagnostics_by_code = {},
+
+        -- inlay hints
+        auto_inlay_hints = false,
+        inlay_hints_highlight = "Comment",
+
+        -- update imports on file move
+        update_imports_on_move = false,
+        require_confirmation_on_move = false,
+        watch_dir = nil,
+      })
+
+      -- required to fix code action ranges and filter diagnostics
+      ts_utils.setup_client(client)
+
+      on_attach(client, bufnr)
+    end,
+  })
+end
+
+local group = vim.api.nvim_create_augroup('LspFormatting', { clear = false })
+
+null_ls.setup({
+  sources = null_ls_sources,
+
+  on_attach = function(client, bufnr)
+    -- format on save
+    if client.resolved_capabilities.document_formatting then
+      for key, cmd in pairs(vim.api.nvim_get_autocmds({ group = group, buffer = bufnr })) do
+        vim.api.nvim_del_autocmd(cmd)
+      end
+      vim.api.nvim_create_autocmd('BufWritePre', {
+        group = group,
+        buffer = bufnr,
+        callback = vim.lsp.buf.formatting_sync,
+      })
+    end
+  end,
+});

.config/nixpkgs/neovim/mappings.lua

@@ -0,0 +1,67 @@
+local opts = { silent = true }
+
+-- ; as :
+vim.keymap.set({'n', 'v'}, ';', ':', opts)
+
+-- leave insert mode via jj
+vim.keymap.set('i', 'jj', '<ESC>', opts)
+
+-- j/k with wraps
+vim.keymap.set({'n', 'v'}, 'j', 'gj', opts)
+vim.keymap.set({'n', 'v'}, 'k', 'gk', opts)
+
+-- leave insert mode with <ESC><ESC>
+vim.keymap.set('t', '<ESC><ESC>', '<C-\\><C-N>', opts)
+
+-- allow pressing enter to autocomplete
+vim.keymap.set('i', '<CR>', 'pumvisible() ? "\\<C-y>" : "\\<CR>"', { expr = true })
+
+-- pickers
+vim.keymap.set('n', '<C-P>', '<cmd>Telescope find_files<CR>', opts)
+vim.keymap.set('n', '<C-O>', '<cmd>Telescope buffers<CR>', opts)
+vim.keymap.set('n', '<Leader>ff', '<cmd>Telescope live_grep<CR>', opts)
+
+-- cursor display
+vim.keymap.set('n', '<Leader>c', '<cmd>set cursorline! cursorcolumn!<CR>', opts)
+
+-- git
+vim.keymap.set('n', '<Leader>gs', '<cmd>Git<CR>', opts)
+vim.keymap.set('n', '<Leader>gb', '<cmd>Merginal<CR>', opts)
+
+-- undotree
+vim.keymap.set('n', '<Leader>ut', '<cmd>UndotreeToggle<CR>', opts)
+
+-- opening terminals
+vim.keymap.set('n', '<Leader>tv', '<cmd>vsp term://$SHELL<CR>', opts)
+vim.keymap.set('n', '<Leader>to', '<cmd>term<CR>', opts)
+
+-- delete buffer
+vim.keymap.set('n', '<Leader>q', '<cmd>lua MiniBufremove.delete()<CR>', opts)
+
+-- diagnostics
+vim.keymap.set('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
+vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
+vim.keymap.set('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist({ severity = { min = vim.diagnostic.severity.WARN } })<CR>', opts)
+
+function on_attach(client, bufnr)
+  local opts = { silent = true, buffer = bufnr }
+  -- Enable completion triggered by <c-x><c-o>
+  vim.bo.omnifunc = 'v:lua.MiniCompletion.completefunc_lsp'
+
+  -- LSP-specific mappings
+  vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+  vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+  vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+  vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+  vim.keymap.set('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+  vim.keymap.set('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+  vim.keymap.set('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+  vim.keymap.set('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+  vim.keymap.set('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+  vim.keymap.set('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  vim.keymap.set('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+  vim.keymap.set('n', 'gr', '<cmd>Telescope lsp_references<CR>', opts)
+  vim.keymap.set('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+  vim.keymap.set('n', '<Leader>fs', '<cmd>Telescope lsp_document_symbols<CR>', opts)
+end

.config/nixpkgs/neovim/plugins.lua

@@ -0,0 +1,73 @@
+-- file/buffer/etc picker
+require('telescope').setup({
+  defaults = {
+    mappings = {
+      i = {
+        ['jj'] = 'close',
+        ['<C-j>'] = 'move_selection_next',
+        ['<C-k>'] = 'move_selection_previous',
+      },
+    },
+    layout_config = {
+      prompt_position = 'top',
+    },
+    sorting_strategy = 'ascending',
+  },
+})
+
+-- use native sorter for better performance
+require('telescope').load_extension('fzf')
+
+-- shows added/removed/changed lines
+require('gitsigns').setup()
+
+require('mini.statusline').setup({
+  content = {
+    -- copy-pasted from default, we just want to remove the icon
+    active = function()
+      local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
+      local git           = MiniStatusline.section_git({ trunc_width = 75, icon = '' })
+      local diagnostics   = MiniStatusline.section_diagnostics({ trunc_width = 75, icon = '' })
+      local filename      = MiniStatusline.section_filename({ trunc_width = 140 })
+      local fileinfo      = MiniStatusline.section_fileinfo({ trunc_width = 120 })
+      local location      = MiniStatusline.section_location({ trunc_width = 75 })
+
+      return MiniStatusline.combine_groups({
+        { hl = mode_hl,                  strings = { mode } },
+        { hl = 'MiniStatuslineDevinfo',  strings = { git, diagnostics } },
+        '%<', -- Mark general truncate point
+        { hl = 'MiniStatuslineFilename', strings = { filename } },
+        '%=', -- End left alignment
+        { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
+        { hl = mode_hl,                  strings = { location } },
+      })
+    end
+  },
+})
+
+-- delete buffer while preserving layout
+require('mini.bufremove').setup()
+
+-- shows a line indicating the current indentation scope
+require('mini.indentscope').setup()
+
+-- LSP completion and function signature display
+require('mini.completion').setup({
+  delay = {
+    -- disable autocomplete
+    completion = 100000000,
+    info = 100,
+    signature = 50,
+  },
+  lsp_completion = {
+    source_func = 'omnifunc',
+    auto_setup = false,
+  },
+});
+
+-- Use Treesitter for syntax highlighting
+require('nvim-treesitter.configs').setup({
+  highlight = {
+    enable = true,
+  },
+})

.config/nixpkgs/neovim/settings.lua

@@ -0,0 +1,39 @@
+-- change terminal title
+vim.o.title = true
+
+-- default indentation
+vim.o.shiftwidth = 2
+vim.o.tabstop = 4
+vim.o.expandtab = true
+
+-- permanent undo history
+vim.o.undofile = true
+
+-- allow switching buffers
+vim.o.hidden = true
+
+-- always scroll (keep current line vertically centered)
+vim.o.scrolloff = 999
+
+-- show line numbers
+vim.o.number = true
+vim.o.relativenumber = true
+
+-- set wordwrap indent
+vim.o.wrap = false
+vim.o.linebreak = true
+vim.o.breakindent = true
+vim.o.breakindentopt = 'shift:2,sbr'
+
+-- show whitespace
+vim.o.list = true
+
+-- make a new copy of the file for backup
+-- setting to no or auto messes with filewatchers
+vim.o.backupcopy = 'yes'
+
+-- disable modelines
+vim.o.modeline = false
+
+-- show preview of lines when using :s
+vim.o.inccommand = 'split'

.config/nixpkgs/neovim/theme.lua

@@ -0,0 +1,27 @@
+vim.o.termguicolors = true
+
+vim.g.sonokai_transparent_background = true
+
+vim.api.nvim_create_autocmd('ColorScheme', {
+  pattern = 'sonokai',
+  callback = function()
+    vim.api.nvim_set_hl(0, 'MiniIndentscopeSymbol', { link = 'Whitespace' })
+
+    local configuration = vim.fn['sonokai#get_configuration']()
+    local palette = vim.fn['sonokai#get_palette'](configuration.style)
+
+    vim.fn['sonokai#highlight']('MiniStatuslineModeNormal', palette.black, palette.blue)
+    vim.fn['sonokai#highlight']('MiniStatuslineModeCommand', palette.black, palette.yellow)
+    vim.fn['sonokai#highlight']('MiniStatuslineModeInsert', palette.black, palette.green)
+    vim.fn['sonokai#highlight']('MiniStatuslineModeVisual', palette.black, palette.orange)
+    vim.fn['sonokai#highlight']('MiniStatuslineModeReplace', palette.black, palette.red)
+    vim.fn['sonokai#highlight']('MiniStatuslineModeOther', palette.black, palette.green)
+
+    -- reset terminal colors to default
+    for i = 0, 15 do
+      vim.g['terminal_color_' .. i] = nil
+    end
+  end,
+})
+
+vim.cmd('colorscheme sonokai')

.config/nixpkgs/neovim/vimrc

@@ -1,142 +0,0 @@
-" ------ settings ------
-
-" change terminal title
-set title
-
-" xdg-ish settings
-set undodir=~/.cache/vim/undo,.
-set backupdir=~/.cache/vim/backup,.
-set directory=~/.cache/vim/swap//,.
-
-" default indentation
-set shiftwidth=2
-set tabstop=4
-set expandtab
-
-" permanent undo history
-set undofile
-
-" allow switching buffers
-set hidden
-
-" always scroll
-set scrolloff=99
-
-" show line numbers
-set number
-set relativenumber
-
-" show gutter
-set signcolumn=yes
-
-" set wordwrap indent
-set nowrap
-set linebreak
-if exists("&breakindent")
-  set breakindent
-  set breakindentopt=shift:2,sbr
-endif
-
-" show whitespace
-set list
-
-" make a new copy of the file for backup
-" setting to no or auto messes with filewatchers
-set backupcopy=yes
-
-" disable modelines
-set nomodeline
-
-" show preview of lines when using :s
-set inccommand=split
-
-" ------ key bindings ------
-
-" ; as :
-nnoremap ; :
-vnoremap ; :
-
-" allow <ESC> via jj in insert mode
-inoremap jj <ESC>
-
-" tab switching
-nnoremap <C-T>h :tabprev<cr>
-nnoremap <C-T>l :tabnext<cr>
-
-" fix j/k with wraps
-nnoremap j gj
-nnoremap k gk
-vnoremap j gj
-vnoremap k gk
-
-" cursor display
-nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
-
-" git
-nnoremap <Leader>gs :Git<CR>
-nnoremap <Leader>gb :Merginal<CR>
-
-" undo tree
-nnoremap <Leader>ut :UndotreeToggle<CR>
-
-" use <ESC><ESC> to leave terminal mode
-tnoremap <C-[><C-[> <C-\><C-N>
-
-" opening terminals
-nnoremap <Leader>tv :vsp term://$SHELL<CR>
-nnoremap <Leader>to :term<CR>
-
-" default terminal settings
-autocmd TermOpen * setlocal scrollback=10000 nonumber norelativenumber
-
-" automatically enter,leave terminal mode
-autocmd TermOpen * startinsert
-autocmd BufWinEnter,WinEnter term://* startinsert
-autocmd BufLeave term://* stopinsert
-
-" strip trailing whitespace
-autocmd BufWritePre * %s/\s\+$//e
-
-" filetype specific options
-autocmd FileType markdown set tw=80
-
-" ------ theme ------
-
-" use full color if available
-if has('termguicolors')
-  set termguicolors
-endif
-
-let g:sonokai_transparent_background=1
-
-colorscheme sonokai
-
-highlight link MiniIndentscopeSymbol Whitespace
-
-let s:configuration = sonokai#get_configuration()
-let s:palette = sonokai#get_palette(s:configuration.style)
-
-call sonokai#highlight('MiniStatuslineModeNormal', s:palette.black, s:palette.blue)
-call sonokai#highlight('MiniStatuslineModeCommand', s:palette.black, s:palette.yellow)
-call sonokai#highlight('MiniStatuslineModeInsert', s:palette.black, s:palette.green)
-call sonokai#highlight('MiniStatuslineModeVisual', s:palette.black, s:palette.orange)
-call sonokai#highlight('MiniStatuslineModeReplace', s:palette.black, s:palette.red)
-call sonokai#highlight('MiniStatuslineModeOther', s:palette.black, s:palette.green)
-
-" use default terminal colors
-unlet! g:terminal_color_0
-unlet! g:terminal_color_1
-unlet! g:terminal_color_2
-unlet! g:terminal_color_3
-unlet! g:terminal_color_4
-unlet! g:terminal_color_5
-unlet! g:terminal_color_6
-unlet! g:terminal_color_7
-unlet! g:terminal_color_8
-unlet! g:terminal_color_9
-unlet! g:terminal_color_10
-unlet! g:terminal_color_11
-unlet! g:terminal_color_12
-unlet! g:terminal_color_13
-unlet! g:terminal_color_14
-unlet! g:terminal_color_15