fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

vim: merge lua utils

Browse source
This commit is contained in:
Fernando Schauenburg 2022-02-09 23:09:51 +01:00
parent 0044755b92
commit 0edb597382
12 changed files with 74 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/nvim/after/ftplugin/help.lua
View file

@ -1,3 +1,3 @@
local nmap = require 'fs.util.keymap'.buffer_nmap
local nmap = require 'fs.util'.buffer_nmap
nmap { 'q', '<cmd>q<cr>' }

2
config/nvim/after/ftplugin/lua.lua
View file

@ -1,6 +1,6 @@
vim.bo.tabstop = 2
local nmap = require 'fs.util.keymap'.buffer_nmap
local nmap = require 'fs.util'.buffer_nmap
-- execute the current line
nmap { '<leader>x', [[<cmd>call luaeval(getline("."))<cr>]] }

2
config/nvim/lua/fs/config/lualine.lua
View file

@ -10,7 +10,7 @@ local Table = {
end
}
local colors = require'fs.util.color'.colors()
local colors = require'fs.util'.colors()
local theme = (function()
local active = {

4
config/nvim/lua/fs/config/nvim-tree.lua
View file

@ -1,5 +1,5 @@
local nmap = require'fs.util.keymap'.nmap
local colors = require'fs.util.color'.colors()
local nmap = require'fs.util'.nmap
local colors = require'fs.util'.colors()
-- helper to set vim.g options that will be moved to setup() later
local function set_globals(tbl)

2
config/nvim/lua/fs/config/rainbow_parentheses.lua
View file

@ -1,4 +1,4 @@
local nmap = require'fs.util.keymap'.nmap
local nmap = require'fs.util'.nmap
local config = function()
vim.g['rainbow#pairs'] = { {'(',')'}, {'[',']'}, {'{','}'} }

2
config/nvim/lua/fs/config/vim-fugitive.lua
View file

@ -1,4 +1,4 @@
local nmap = require'fs.util.keymap'.nmap
local nmap = require'fs.util'.nmap
local config = function()
nmap { '<leader>gg', '<cmd>G<cr>' }

2
config/nvim/lua/fs/config/vim-markdown.lua
View file

@ -1,4 +1,4 @@
local nmap = require'fs.util.keymap'.buffer_nmap
local nmap = require'fs.util'.buffer_nmap
local setup = function()
-- Disable concealling on italic, bold, etc.

2
config/nvim/lua/fs/config/vim-trailing-whitespace.lua
View file

@ -1,4 +1,4 @@
local nmap = require'fs.util.keymap'.nmap
local nmap = require'fs.util'.nmap
local config = function()
-- fix whitespace

8
config/nvim/lua/fs/keymaps.lua
View file

@ -1,7 +1,7 @@
local keymap = require 'fs.util.keymap'
local nmap = keymap.nmap
local imap = keymap.imap
local vmap = keymap.vmap
local util = require 'fs.util'
local nmap = util.nmap
local imap = util.imap
local vmap = util.vmap
vim.g.mapleader = ' '

61
config/nvim/lua/fs/util.lua Normal file
View file

@ -0,0 +1,61 @@
local M = {}
local map = function(mode, lhs, rhs, opts)
local opts = vim.tbl_extend('keep', opts or {}, { noremap = true })
vim.api.nvim_set_keymap(mode, lhs, rhs, opts)
end
local buf_map = function(mode, lhs, rhs, opts)
local opts = vim.tbl_extend('keep', opts or {}, { noremap = true })
vim.api.nvim_buf_set_keymap(0, mode, lhs, rhs, opts)
end
M.nmap = function(tbl) map('n', tbl[1], tbl[2], tbl[3]) end
M.imap = function(tbl) map('i', tbl[1], tbl[2], tbl[3]) end
M.vmap = function(tbl) map('v', tbl[1], tbl[2], tbl[3]) end
M.buffer_nmap = function(tbl) buf_map('n', tbl[1], tbl[2], tbl[3]) end
M.buffer_imap = function(tbl) buf_map('i', tbl[1], tbl[2], tbl[3]) end
M.colors = function(gui)
if gui or vim.opt.termguicolors:get() then
return {
base03 = "#002b36",
base02 = "#073642",
base01 = "#586e75",
base00 = "#657b83",
base0 = "#839496",
base1 = "#93a1a1",
base2 = "#eee8d5",
base3 = "#fdf6e3",
yellow = "#b58900",
orange = "#cb4b16",
red = "#dc322f",
magenta = "#d33682",
violet = "#6c71c4",
blue = "#268bd2",
cyan = "#2aa198",
green = "#859900",
}
end
return {
base03 = 8,
base02 = 0,
base01 = 10,
base00 = 11,
base0 = 12,
base1 = 14,
base2 = 7,
base3 = 15,
yellow = 3,
orange = 9,
red = 1,
magenta = 5,
violet = 13,
blue = 4,
cyan = 6,
green = 2,
}
end
return M

39
config/nvim/lua/fs/util/color.lua
View file

@ -1,39 +0,0 @@
local M = {}
local function generate(tbl, gui)
local cterm, gui = {}, {}
for name, color in pairs(tbl) do
cterm[name] = color.cterm
gui[name] = color.gui
end
return cterm, gui
end
local cterm_colors, gui_colors = generate {
base03 = { cterm = 8, gui = '#002b36' },
base02 = { cterm = 0, gui = '#073642' },
base01 = { cterm = 10, gui = '#586e75' },
base00 = { cterm = 11, gui = '#657b83' },
base0 = { cterm = 12, gui = '#839496' },
base1 = { cterm = 14, gui = '#93a1a1' },
base2 = { cterm = 7, gui = '#eee8d5' },
base3 = { cterm = 15, gui = '#fdf6e3' },
yellow = { cterm = 3, gui = '#b58900' },
orange = { cterm = 9, gui = '#cb4b16' },
red = { cterm = 1, gui = '#dc322f' },
magenta = { cterm = 5, gui = '#d33682' },
violet = { cterm = 13, gui = '#6c71c4' },
blue = { cterm = 4, gui = '#268bd2' },
cyan = { cterm = 6, gui = '#2aa198' },
green = { cterm = 2, gui = '#859900' },
}
M.colors = function(gui)
if gui or vim.opt.termguicolors:get() then
return gui_colors
end
return cterm_colors
end
return M

25
config/nvim/lua/fs/util/keymap.lua
View file

@ -1,25 +0,0 @@
local M = {}
local nvim_set_keymap = vim.api.nvim_set_keymap
local nvim_buf_set_keymap = vim.api.nvim_buf_set_keymap
local extend = function(opts)
return vim.tbl_extend('keep', opts or {}, { noremap = true })
end
local map = function(mode, lhs, rhs, opts)
nvim_set_keymap(mode, lhs, rhs, extend(opts))
end
local buf_map = function(mode, lhs, rhs, opts)
nvim_buf_set_keymap(0, mode, lhs, rhs, extend(opts))
end
M.nmap = function(tbl) map('n', tbl[1], tbl[2], tbl[3]) end
M.imap = function(tbl) map('i', tbl[1], tbl[2], tbl[3]) end
M.vmap = function(tbl) map('v', tbl[1], tbl[2], tbl[3]) end
M.buffer_nmap = function(tbl) buf_map('n', tbl[1], tbl[2], tbl[3]) end
M.buffer_imap = function(tbl) buf_map('i', tbl[1], tbl[2], tbl[3]) end
return M