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

nvim and polybar minor tweaks

Browse source
This commit is contained in:
Tiago Sousa 2023-05-14 15:23:16 +01:00
parent 53a26d03c4
commit cf75e689e5
18 changed files with 132 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.config/nvim/after/plugin/colorizer.lua Normal file
View file

@ -0,0 +1,6 @@
require 'colorizer'.setup({
'dosini';
'css';
'javascript';
html = { mode = 'background' };
})

54
.config/nvim/lua/mappings.lua
View file

@ -1,54 +0,0 @@
--Relative line numbers
vim.wo.number=true
vim.wo.relativenumber= true
vim.g.instant_username = "Afonso"
vim.opt.clipboard= 'unnamedplus'
vim.opt.hlsearch = false
vim.opt.smartindent = true
vim.opt.wrap = false
vim.g.mapleader = " "
--TAB KEYBINDINGS
local map = vim.api.nvim_set_keymap
local opts = { noremap = true, silent = true }
-- Move to previous/next
map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
-- Re-order to previous/next
map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
-- Goto buffer in position...
map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
-- Pin/unpin buffer
map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
-- Close buffer
map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
-- Wipeout buffer
-- :BufferWipeout
-- Close commands
-- :BufferCloseAllButCurrent
-- :BufferCloseAllButPinned
-- :BufferCloseAllButCurrentOrPinned
-- :BufferCloseBuffersLeft
-- :BufferCloseBuffersRight
-- Magic buffer-picking mode
map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
-- Sort automatically by...
map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
--NVimTree
map('n', '<C-n>', '<Cmd>NvimTreeToggle<CR>',opts)

74
.config/nvim/lua/plugins/barbar.lua
View file

@ -1,74 +0,0 @@
-- Set barbar's options
require'bufferline'.setup {
-- Enable/disable animations
animation = true,
-- Enable/disable auto-hiding the tab bar when there is a single buffer
auto_hide = false,
-- Enable/disable current/total tabpages indicator (top right corner)
tabpages = true,
-- Enable/disable close button
closable = true,
-- Enables/disable clickable tabs
-- - left-click: go to buffer
-- - middle-click: delete buffer
clickable = true,
-- Excludes buffers from the tabline
exclude_ft = {'javascript'},
exclude_name = {'package.json'},
-- Show every buffer
hide = {current = false, inactive = false, visible = false},
-- Enable/disable icons
-- if set to 'numbers', will show buffer index in the tabline
-- if set to 'both', will show buffer index and icons in the tabline
icons = true,
-- If set, the icon color will follow its corresponding buffer
-- highlight group. By default, the Buffer*Icon group is linked to the
-- Buffer* group (see Highlighting below). Otherwise, it will take its
-- default value as defined by devicons.
icon_custom_colors = false,
-- Configure icons on the bufferline.
icon_separator_active = '▎',
icon_separator_inactive = '▎',
icon_close_tab = '',
icon_close_tab_modified = '●',
icon_pinned = '車',
-- If true, new buffers will be inserted at the start/end of the list.
-- Default is to insert after current buffer.
insert_at_end = false,
insert_at_start = false,
-- Sets the maximum padding width with which to surround each tab
maximum_padding = 1,
-- Sets the minimum padding width with which to surround each tab
minimum_padding = 1,
-- Sets the maximum buffer name length.
maximum_length = 30,
-- If set, the letters for each buffer in buffer-pick mode will be
-- assigned based on their name. Otherwise or in case all letters are
-- already assigned, the behavior is to assign letters in order of
-- usability (see order below)
semantic_letters = true,
-- New buffer letters are assigned in this order. This order is
-- optimal for the qwerty keyboard layout but might need adjustement
-- for other layouts.
letters = 'asdfjkl;ghnmxcvbziowerutyqpASDFJKLGHNMXCVBZIOWERUTYQP',
-- Sets the name of unnamed buffers. By default format is "[Buffer X]"
-- where X is the buffer number. But only a static string is accepted here.
no_name_title = nil,
}

16
.config/nvim/lua/plugins/lspconfig.lua
View file

@ -1,16 +0,0 @@
local present, lspconfig = pcall(require,"lspconfig")
on_attach = function(client, bufnr)
client.server_capabilities.documentFormattingProvider = false
client.server_capabilities.documentRangeFormattingProvider = false
utils.load_mappings("lspconfig", { buffer = bufnr })
end
capabilities = vim.lsp.protocol.make_client_capabilities()
lspconfig.hls.setup{}
lspconfig.rust_analyzer.setup{}

31
.config/nvim/lua/plugins/mason.lua
View file

@ -1,31 +0,0 @@
local present, mason = pcall(require, "mason")
vim.api.nvim_create_augroup("_mason", { clear = true })
local options = {
PATH = "skip",
ui = {
icons = {
package_pending = "",
package_installed = "",
package_uninstalled = " ﮊ",
},
keymaps = {
toggle_server_expand = "<CR>",
install_server = "i",
update_server = "u",
check_server_version = "c",
update_all_servers = "U",
check_outdated_servers = "C",
uninstall_server = "X",
cancel_installation = "<C-c>",
},
},
max_concurrent_installers = 10,
}
mason.setup(options)

181
.config/nvim/lua/plugins/nvim-coc.lua
View file

@ -1,181 +0,0 @@
-- Some servers have issues with backup files, see #649.
vim.opt.backup = false
vim.opt.writebackup = false
-- Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
-- delays and poor user experience.
vim.opt.updatetime = 300
-- Always show the signcolumn, otherwise it would shift the text each time
-- diagnostics appear/become resolved.
vim.opt.signcolumn = "yes"
local keyset = vim.keymap.set
-- Auto complete
function _G.check_back_space()
local col = vim.fn.col('.') - 1
return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
end
-- Use tab for trigger completion with characters ahead and navigate.
-- NOTE: There's always complete item selected by default, you may want to enable
-- no select by `"suggest.noselect": true` in your configuration file.
-- NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
-- other plugin before putting this into your config.
local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false}
keyset("i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts)
keyset("i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts)
-- Make <CR> to accept selected completion item or notify coc.nvim to format
-- <C-g>u breaks current undo, please make your own choice.
keyset("i", "<cr>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts)
-- Use <c-j> to trigger snippets
keyset("i", "<c-j>", "<Plug>(coc-snippets-expand-jump)")
-- Use <c-space> to trigger completion.
keyset("i", "<c-space>", "coc#refresh()", {silent = true, expr = true})
-- Use `[g` and `]g` to navigate diagnostics
-- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true})
keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true})
-- GoTo code navigation.
keyset("n", "gd", "<Plug>(coc-definition)", {silent = true})
keyset("n", "gy", "<Plug>(coc-type-definition)", {silent = true})
keyset("n", "gi", "<Plug>(coc-implementation)", {silent = true})
keyset("n", "gr", "<Plug>(coc-references)", {silent = true})
-- Use K to show documentation in preview window.
function _G.show_docs()
local cw = vim.fn.expand('<cword>')
if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then
vim.api.nvim_command('h ' .. cw)
elseif vim.api.nvim_eval('coc#rpc#ready()') then
vim.fn.CocActionAsync('doHover')
else
vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw)
end
end
keyset("n", "K", '<CMD>lua _G.show_docs()<CR>', {silent = true})
-- Highlight the symbol and its references when holding the cursor.
vim.api.nvim_create_augroup("CocGroup", {})
vim.api.nvim_create_autocmd("CursorHold", {
group = "CocGroup",
command = "silent call CocActionAsync('highlight')",
desc = "Highlight symbol under cursor on CursorHold"
})
-- Symbol renaming.
keyset("n", "<leader>rn", "<Plug>(coc-rename)", {silent = true})
-- Formatting selected code.
keyset("x", "<leader>f", "<Plug>(coc-format-selected)", {silent = true})
keyset("n", "<leader>f", "<Plug>(coc-format-selected)", {silent = true})
-- Setup formatexpr specified filetype(s).
vim.api.nvim_create_autocmd("FileType", {
group = "CocGroup",
pattern = "typescript,json",
command = "setl formatexpr=CocAction('formatSelected')",
desc = "Setup formatexpr specified filetype(s)."
})
-- Update signature help on jump placeholder.
vim.api.nvim_create_autocmd("User", {
group = "CocGroup",
pattern = "CocJumpPlaceholder",
command = "call CocActionAsync('showSignatureHelp')",
desc = "Update signature help on jump placeholder"
})
-- Applying codeAction to the selected region.
-- Example: `<leader>aap` for current paragraph
local opts = {silent = true, nowait = true}
keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
-- Remap keys for applying codeAction to the current buffer.
keyset("n", "<leader>ac", "<Plug>(coc-codeaction)", opts)
-- Apply AutoFix to problem on the current line.
keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts)
-- Run the Code Lens action on the current line.
keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts)
-- Map function and class text objects
-- NOTE: Requires 'textDocument.documentSymbol' support from the language server.
keyset("x", "if", "<Plug>(coc-funcobj-i)", opts)
keyset("o", "if", "<Plug>(coc-funcobj-i)", opts)
keyset("x", "af", "<Plug>(coc-funcobj-a)", opts)
keyset("o", "af", "<Plug>(coc-funcobj-a)", opts)
keyset("x", "ic", "<Plug>(coc-classobj-i)", opts)
keyset("o", "ic", "<Plug>(coc-classobj-i)", opts)
keyset("x", "ac", "<Plug>(coc-classobj-a)", opts)
keyset("o", "ac", "<Plug>(coc-classobj-a)", opts)
-- Remap <C-f> and <C-b> for scroll float windows/popups.
---@diagnostic disable-next-line: redefined-local
local opts = {silent = true, nowait = true, expr = true}
keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
keyset("i", "<C-f>",
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts)
keyset("i", "<C-b>",
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts)
keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
-- Use CTRL-S for selections ranges.
-- Requires 'textDocument/selectionRange' support of language server.
keyset("n", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
keyset("x", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
-- Add `:Format` command to format current buffer.
vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
-- " Add `:Fold` command to fold current buffer.
vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", {nargs = '?'})
-- Add `:OR` command for organize imports of the current buffer.
vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {})
-- Add (Neo)Vim's native statusline support.
-- NOTE: Please see `:h coc-status` for integrations with external plugins that
-- provide custom statusline: lightline.vim, vim-airline.
vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}")
-- Mappings for CoCList
-- code actions and coc stuff
---@diagnostic disable-next-line: redefined-local
local opts = {silent = true, nowait = true}
-- Show all diagnostics.
keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts)
-- Manage extensions.
keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts)
-- Show commands.
keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts)
-- Find symbol of current document.
keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts)
-- Search workspace symbols.
keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts)
-- Do default action for next item.
keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts)
-- Do default action for previous item.
keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts)
-- Resume latest coc list.
keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts)

94
.config/nvim/lua/plugins/packer.lua
View file

@ -1,94 +0,0 @@
local packer = require("packer")
local plugins = packer.startup({function(use)
use {
"wbthomason/packer.nvim",
config = [[require("plugins.packer")]]
}
use{ "lewis6991/impatient.nvim"}
use{ "lervag/vimtex",
config = function ()
require "plugins.vimtex"
end
}
use { "ggandor/leap.nvim",
config = function ()
require('leap').add_default_mappings()
end
}
use { "neovim/nvim-lspconfig",
config = function ()
require "plugins.lspconfig"
end
}
use { "williamboman/mason.nvim",
config = function ()
require "plugins.mason"
end
}
use { "feline-nvim/feline.nvim" }
use {"joshdick/onedark.vim" }
use {"nvim-tree/nvim-tree.lua",
requires = {
'nvim-tree/nvim-web-devicons',
},
config = function()
require("nvim-tree").setup()
end
}
use {"nvim-treesitter/nvim-treesitter",
config = function()
require "plugins.treesitter"
end
}
use {'romgrk/barbar.nvim',
requires = 'kyazdani42/nvim-web-devicons',
config = function ()
require "plugins.barbar"
end
}
use {"windwp/nvim-autopairs",
config = function() require("nvim-autopairs").setup {} end
}
use {"neoclide/coc.nvim",
config = function() require("plugins.nvim-coc") end
}
use {
'nvim-telescope/telescope.nvim', tag = '0.1.0',
-- or , branch = '0.1.x',
requires = { {'nvim-lua/plenary.nvim'} },
config = function() require('plugins.telescope') end
}
use {"jbyuki/instant.nvim"}
end,
config = {
auto_clean = true,
compile_on_sync = true,
git = { clone_timeout = 6000 },
display = {
working_sym = "ﲊ",
error_sym = "✗ ",
done_sym = "",
removed_sym = "",
moved_sym = "",
},
}
})

12
.config/nvim/lua/plugins/rust-tools.lua
View file

@ -1,12 +0,0 @@
local rt = require("rust-tools")
rt.setup({
server = {
on_attach = function(_, bufnr)
-- Hover actions
vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
-- Code action groups
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
end,
},
})

5
.config/nvim/lua/plugins/telescope.lua
View file

@ -1,5 +0,0 @@
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})

6
.config/nvim/lua/plugins/theme.lua
View file

@ -1,6 +0,0 @@
local colorscheme = "onedark"
local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
if not status_ok then
return
end

23
.config/nvim/lua/plugins/treesitter.lua
View file

@ -1,23 +0,0 @@
local present, treesitter = pcall(require, "nvim-treesitter.configs")
require('nvim-treesitter.install').update({ with_sync = true })
if not present then
return
end
local options = {
ensure_installed = {"lua", "haskell", "rust", },
highlight = {
enable = true,
use_languagetree = true,
},
indent = {
enable = true,
},
}
treesitter.setup(options)

3
.config/nvim/lua/plugins/vimtex.lua
View file

@ -1,3 +0,0 @@
vim.g.vimtex_view_method = 'zathura'
vim.g.vimtex_compiler_methor = 'latexmk'

1
.config/nvim/lua/tsousa/packer.lua
View file

@ -11,6 +11,7 @@ return require('packer').startup(function(use)
use("mbbill/undotree")
use("j-hui/fidget.nvim")
use("norcalli/nvim-colorizer.lua")
use("nvim-orgmode/orgmode")
use("lervag/vimtex")

5
.config/nvim/plugin/packer_compiled.lua
View file

@ -144,6 +144,11 @@ _G.packer_plugins = {
path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/nvim-cmp",
url = "https://github.com/hrsh7th/nvim-cmp"
},
["nvim-colorizer.lua"] = {
loaded = true,
path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
url = "https://github.com/norcalli/nvim-colorizer.lua"
},
["nvim-jdtls"] = {
loaded = true,
path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/nvim-jdtls",

5
.config/polybar/config.ini
View file

@ -17,7 +17,7 @@
;==========================================================
include-file = modules.ini
include-file = themes/mocha.ini
include-file = $HOME/.config/polybar/themes/frappe.ini
[settings]
screenchange-reload = true
@ -34,7 +34,7 @@ modules-left = i3
modules-center = date dot time
modules-right = cpu dot memory dot pulseaudio sep filesystem
background = ${colors.crust}
background = ${colors.base}
foreground = ${colors.text}
line-size = 3pt
padding-right = 1
@ -46,6 +46,7 @@ font-2 = Inter:size=10:weight=regular;2
cursor-click = pointer
;cursor-scroll = ns-resize
enable-ipc = true
tray-position = right
override-redirect = true

39
.config/polybar/themes/frappe.ini Normal file
View file

@ -0,0 +1,39 @@
;-------------------------
; Catppuccin Frappé Palette
; Maintainer: justTOBBI
;--------------------------
[colors]
base = #303446
mantle = #292c3c
crust = #232634
text = #c6d0f5
subtext0 = #a5adce
subtext1 = #b5bfe2
surface0 = #414559
surface1 = #51576d
surface2 = #626880
overlay0 = #737994
overlay1 = #838ba7
overlay2 = #949cbb
blue = #8caaee
lavender = #babbf1
sapphire = #85c1dc
sky = #99d1db
teal = #81c8be
green = #a6d189
yellow = #e5c890
peach = #ef9f76
maroon = #ea999c
red = #e78284
mauve = #ca9ee6
pink = #f4b8e4
flamingo = #eebebe
rosewater = #f2d5cf
transparent = #FF00000

39
.config/polybar/themes/latte.ini Normal file
View file

@ -0,0 +1,39 @@
;-------------------------
; Catppuccin Latte Palette
; Maintainer: justTOBBI
;--------------------------
[colors]
base = #eff1f5
mantle = #e6e9ef
crust = #dce0e8
text = #4c4f69
subtext0 = #6c6f85
subtext1 = #5c5f77
surface0 = #ccd0da
surface1 = #bcc0cc
surface2 = #acb0be
overlay0 = #9ca0b0
overlay1 = #8c8fa1
overlay2 = #7c7f93
blue = #1e66f5
lavender = #7287fd
sapphire = #209fb5
sky = #04a5e5
teal = #179299
green = #40a02b
yellow = #df8e1d
peach = #fe640b
maroon = #e64553
red = #d20f39
mauve = #8839ef
pink = #ea76cb
flamingo = #dd7878
rosewater = #dc8a78
transparent = #FF00000

39
.config/polybar/themes/macchiato.ini Normal file
View file

@ -0,0 +1,39 @@
;-------------------------
; Catppuccin Macchiato Palette
; Maintainer: justTOBBI
;--------------------------
[colors]
base = #24273a
mantle = #1e2030
crust = #181926
text = #cad3f5
subtext0 = #a5adcb
subtext1 = #b8c0e0
surface0 = #363a4f
surface1 = #494d64
surface2 = #5b6078
overlay0 = #6e738d
overlay1 = #8087a2
overlay2 = #939ab7
blue = #8aadf4
lavender = #b7bdf8
sapphire = #7dc4e4
sky = #91d7e3
teal = #8bd5ca
green = #a6da95
yellow = #eed49f
peach = #f5a97f
maroon = #ee99a0
red = #ed8796
mauve = #c6a0f6
pink = #f5bde6
flamingo = #f0c6c6
rosewater = #f4dbd6
transparent = #FF00000