commit f124de511c090a464c6aa7d3d34ae51ac0b27c75
parent f7b6814dee192bfe17b9eac5753c6f34a80ed52f
Author: Tomas Nemec <nemi@skaut.cz>
Date: Wed, 20 Oct 2021 23:05:32 +0200
update
Diffstat:
5 files changed, 15 insertions(+), 113 deletions(-)
diff --git a/lua/tms/colors/solarized.lua b/lua/tms/colors/solarized.lua
@@ -2,9 +2,7 @@
-- map <buffer> ,c <cmd>execute 'lua ' . getline('.')<cr>
local M = {}
-local get_color = function(name, part)
- return vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID(name)), part)
-end
+local get_color = function(name, part) return vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID(name)), part) end
M.setup = function()
local Color, c, Group, g, _ = require('colorbuddy').setup()
@@ -27,6 +25,7 @@ M.setup = function()
-- general
Group.new('SignColumn', c.none, c.none)
Group.new('NormalFloat', c.none, c.normal_bg)
+ Group.new('LineNr', c.normal_fg:dark(0.2), c.none)
-- Lsp
Group.new('LspDiagnosticsSignError', c.red, g.SignColumn.bg)
diff --git a/lua/tms/p/status.lua b/lua/tms/p/status.lua
@@ -1,60 +0,0 @@
-local M = {}
-
-M.setup = function()
- local lsp = function() return #vim.lsp.buf_get_clients() > 0 and '[L]' or '' end
- local ts = function()
- local tse, tsp = pcall(require, 'nvim-treesitter.parsers')
- return tse and tsp.has_parser() and '[T]' or ''
- end
- local attached = function() return lsp() .. ts() end
- local qf = function()
- local list = vim.fn.getqflist()
- local valid = {}
- for _, item in ipairs(list) do
- if item.valid == 1 then
- table.insert(valid, item)
- end
- end
- return #valid > 0 and 'qf' or ''
- end
- -- TODO(tms) 14.06.2021
- local async_make = function()
- local running = require('tms.p.async_make').running()
- if running then
- return '[AM]'
- end
- return ''
- end
-
- local color = string.sub(vim.g.colors_name, 0, 5)
- local theme
- if color == 'solar' then
- theme = 'solarized_dark'
- if vim.opt.background:get() == 'light' then
- theme = 'solarized_light'
- end
- else
- theme = 'gruvb'
- if vim.opt.background:get() == 'light' then
- theme = 'gruvbox_light'
- end
- end
-
- require('lualine').setup {
- options = {['theme'] = theme},
- sections = {
- lualine_c = {attached, {'filename', file_status = true}},
- lualine_x = {
- {'diagnostics', sources = {'nvim_lsp'}},
- -- {async_make, color = {fg = '#fb4872'}},
- {qf, color = {fg = '#fb4934'}},
- 'encoding',
- 'fileformat',
- 'filetype',
- },
- },
- extensions = {'fzf', 'fugitive', 'quickfix'},
- }
-end
-
-return M
diff --git a/lua/tms/p/telescope.lua b/lua/tms/p/telescope.lua
@@ -36,23 +36,13 @@ local layouts = {
dd = themes.get_dropdown(),
dd_noprev = themes.get_dropdown {previewer = false},
dd_large = themes.get_dropdown({layout_config = {width = 120}}),
- dd_large_noprev = themes.get_dropdown {
- layout_config = {width = 120},
- previewer = false,
- },
+ dd_large_noprev = themes.get_dropdown {layout_config = {width = 120}, previewer = false},
}
function M.setup()
telescope.setup {
- defaults = {
- mappings = {i = {['<esc>'] = actions.close, ['<c-r>'] = 'delete_buffer'}},
- },
- extensions = {
- fzy_native = {
- override_generic_sorter = false,
- override_file_sorter = true,
- },
- },
+ defaults = {mappings = {i = {['<esc>'] = actions.close, ['<c-r>'] = 'delete_buffer'}}},
+ extensions = {fzy_native = {override_generic_sorter = false, override_file_sorter = true}},
}
end
@@ -64,8 +54,7 @@ M.plugins = function()
attach_mappings = function(prompt_bufnr)
actions.select_default:replace(function(_, _)
local selection = actions.get_selected_entry(prompt_bufnr)
- local path = require('tms.u.plugins').path(selection.directory,
- selection.name)
+ local path = require('tms.u.plugins').path(selection.directory, selection.name)
actions.close(prompt_bufnr)
vim.cmd(string.format('tabe %s', selection.readme))
vim.cmd(string.format('tcd %s', path))
@@ -76,11 +65,7 @@ M.plugins = function()
end
M.edit_neovim = function()
- builtin.find_files(themes.get_dropdown {
- prompt_title = 'dotfiles',
- cwd = '~/.config/nvim',
- previewer = false,
- })
+ builtin.find_files(themes.get_dropdown {prompt_title = 'dotfiles', cwd = '~/.config/nvim', previewer = false})
end
M.spell_suggest = function() builtin.spell_suggest(layouts.dd) end
@@ -100,13 +85,8 @@ M.grep_files = function(cwd, files, select_fn, opts)
local live_grepper = finders.new_job(function(prompt)
if not prompt or prompt == '' then return nil end
- return vim.tbl_flatten {
- vimgrep_arguments,
- escape_chars(prompt),
- search_files,
- }
- end, opts.entry_maker or make_entry.gen_from_vimgrep(opts), opts.max_results,
- opts.cwd)
+ return vim.tbl_flatten {vimgrep_arguments, escape_chars(prompt), search_files}
+ end, opts.entry_maker or make_entry.gen_from_vimgrep(opts), opts.max_results, opts.cwd)
pickers.new(opts, {
prompt_title = 'Grep files',
@@ -122,9 +102,7 @@ end
-- TODO(tms) 29.04.2021
M.grep_file = function(filepath, opts)
- local finder = finders.new_job({conf.vimgrep_arguments},
- function(line) return line end,
- opts.max_results, '')
+ local finder = finders.new_job({conf.vimgrep_arguments}, function(line) return line end, opts.max_results, '')
pickers.new(opts, {
prompt_title = 'rg ',
@@ -160,16 +138,14 @@ M.project_files = function()
local ok = pcall(builtin.git_files, opts)
if not ok then builtin.find_files(opts) end
end
-M.lines =
- function() builtin.current_buffer_fuzzy_find(layouts.dd_large_noprev) end
+M.lines = function() builtin.current_buffer_fuzzy_find(layouts.dd_large_noprev) end
M.reloader = function() builtin.reloader(layouts.dd_noprev) end
M.buffers = function() builtin.buffers(layouts.dd_large) end
M.snippets = function() extensions.snippets.snippets(layouts.dd_large) end
M.media_files = function() extensions.media_files.media_files() end
M.keymaps = function() builtin.keymaps(layouts.dd_large) end
+M.quickfix = function() builtin.quickfix(layouts.dd_large_noprev) end
M.lsp_code_actions = function() builtin.lsp_code_actions(layouts.dd) end
-M.lsp_document_symbols = function()
- builtin.lsp_document_symbols(layouts.dd_large)
-end
+M.lsp_document_symbols = function() builtin.lsp_document_symbols(layouts.dd_large) end
return M
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -96,12 +96,6 @@ local function init()
}
use 'chaoren/vim-wordmotion' -- word counts with _,.,-,...
use {
- disable = true,
- 'hoob3rt/lualine.nvim',
- requires = {'kyazdani42/nvim-web-devicons', opt = true},
- config = function() require('tms.p.status').setup() end,
- }
- use {
'jandamm/cryoline.nvim',
config = function()
require('cryoline').config {
@@ -286,7 +280,6 @@ local function init()
use 'fpob/nette.vim'
use 'baskerville/vim-sxhkdrc'
use {'dart-lang/dart-vim-plugin', ft = {'dart'}}
- use {'akinsho/dependency-assist.nvim', config = function() require'dependency_assist'.setup() end}
-- snippets
use {'norcalli/snippets.nvim', config = function() require('tms.p.snippets').setup() end}
@@ -442,7 +435,7 @@ local function init()
}
require('tms.p.treesitter').setup()
-- hack
- vim.cmd [[command! TSHRefresh execute 'write|edit|TSBufEnable highlight']]
+ vim.cmd [[command! TSHRefresh execute 'write|TSBufEnable highlight']]
vim.keymap.nnoremap {'<leader>su', '<cmd>TSHRefresh<cr>'}
end,
}
@@ -466,7 +459,7 @@ local function init()
vim.keymap.nnoremap {'<space>r', telescope.b.live_grep}
vim.keymap.nnoremap {'<space>e', telescope.b.grep_string}
vim.keymap.nnoremap {'<space>c', telescope.b.git_status}
- vim.keymap.nnoremap {'<space>q', telescope.b.quickfix}
+ vim.keymap.nnoremap {'<space>q', telescope.quickfix}
vim.keymap.nnoremap {'<space>k', telescope.keymaps}
vim.keymap.nnoremap {'<space>m', telescope.b.man_pages}
vim.keymap.nnoremap {'<space>p', telescope.reloader}
diff --git a/lua/tms/u/reload.lua b/lua/tms/u/reload.lua
@@ -8,11 +8,6 @@ local colorbuddy = function()
require('tms.colors').setup()
end
-local lualine = function()
- reloader.reload_module('lualine')
- require('tms.p.status').setup()
-end
-
M.colorsPre = function()
vim.g.gruvbox_contrast_dark = 'hard'
vim.g.gruvbox_contrast_light = 'soft'
@@ -21,7 +16,6 @@ end
M.colors = function()
colorbuddy()
- lualine()
end
return M
