mirror of
https://github.com/ksyasuda/rice.git
synced 2024-10-28 09:04:10 -07:00
Compare commits
2 Commits
2ea73f1b9f
...
f826490a51
Author | SHA1 | Date | |
---|---|---|---|
|
f826490a51 | ||
|
27738885a7 |
@ -77,6 +77,8 @@ let g:maplocalleader = ','
|
|||||||
|
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
Plug 'nvim-lua/plenary.nvim'
|
Plug 'nvim-lua/plenary.nvim'
|
||||||
|
Plug 'nvim-lua/popup.nvim'
|
||||||
|
" Plug 'nvim-telescope/telescope.nvim'
|
||||||
|
|
||||||
" Plug 'TimUntersberger/neogit'
|
" Plug 'TimUntersberger/neogit'
|
||||||
Plug 'akinsho/bufferline.nvim'
|
Plug 'akinsho/bufferline.nvim'
|
||||||
@ -131,6 +133,7 @@ call plug#end()
|
|||||||
|
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
set completeopt=menu,menuone,noselect
|
set completeopt=menu,menuone,noselect
|
||||||
|
let g:fzf_command = 'fzf --height 90% --width=85% --layout=reverse --preview "bat --color=always {}"'
|
||||||
source ~/.config/nvim/keybindings.vim
|
source ~/.config/nvim/keybindings.vim
|
||||||
|
|
||||||
source ~/.config/nvim/plugin-confs/bufferline.lua
|
source ~/.config/nvim/plugin-confs/bufferline.lua
|
||||||
|
@ -35,10 +35,6 @@ nmap Q !!$SHELL<CR>
|
|||||||
|
|
||||||
nmap rn :lua vim.lsp.buf.rename()<CR>
|
nmap rn :lua vim.lsp.buf.rename()<CR>
|
||||||
|
|
||||||
nmap wa :lua vim.lsp.buf.add_workspace_folder()<CR>
|
|
||||||
nmap wl :lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
|
|
||||||
nmap wr :lua vim.lsp.buf.remove_workspace_folder()<CR>
|
|
||||||
|
|
||||||
nmap <leader>as :FloatermNew --title=aniwrapper aniwrapper -qtdoomone -D144<CR>
|
nmap <leader>as :FloatermNew --title=aniwrapper aniwrapper -qtdoomone -D144<CR>
|
||||||
nmap <leader>ad :FloatermNew --title=aniwrapper ani-cli -q720p -cd/home/sudacode/Videos/sauce -D144<CR>
|
nmap <leader>ad :FloatermNew --title=aniwrapper ani-cli -q720p -cd/home/sudacode/Videos/sauce -D144<CR>
|
||||||
|
|
||||||
@ -99,6 +95,10 @@ nnoremap <silent> <Leader>tc :DashboardChangeColorscheme<CR>
|
|||||||
nmap <leader>to :SymbolsOutline<CR>
|
nmap <leader>to :SymbolsOutline<CR>
|
||||||
nmap <leader>tt :FloatermToggle vsplit-term<CR>
|
nmap <leader>tt :FloatermToggle vsplit-term<CR>
|
||||||
|
|
||||||
|
nmap <leader>wa :lua vim.lsp.buf.add_workspace_folder()<CR>
|
||||||
|
nmap <leader>wl :lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
|
||||||
|
nmap <leader>wr :lua vim.lsp.buf.remove_workspace_folder()<CR>
|
||||||
|
|
||||||
nnoremap <leader>xd <cmd>TroubleToggle document_diagnostics<cr>
|
nnoremap <leader>xd <cmd>TroubleToggle document_diagnostics<cr>
|
||||||
nnoremap <leader>xl <cmd>TroubleToggle loclist<cr>
|
nnoremap <leader>xl <cmd>TroubleToggle loclist<cr>
|
||||||
nnoremap <leader>xq <cmd>TroubleToggle quickfix<cr>
|
nnoremap <leader>xq <cmd>TroubleToggle quickfix<cr>
|
||||||
|
@ -1,61 +0,0 @@
|
|||||||
local catppuccin = require("catppuccin")
|
|
||||||
|
|
||||||
local settings = {
|
|
||||||
transparent_background = false,
|
|
||||||
term_colors = false,
|
|
||||||
styles = {
|
|
||||||
comments = "italic",
|
|
||||||
functions = "italic",
|
|
||||||
keywords = "italic",
|
|
||||||
strings = "NONE",
|
|
||||||
variables = "italic",
|
|
||||||
},
|
|
||||||
integrations = {
|
|
||||||
treesitter = true,
|
|
||||||
native_lsp = {
|
|
||||||
enabled = true,
|
|
||||||
virtual_text = {
|
|
||||||
errors = "italic",
|
|
||||||
hints = "italic",
|
|
||||||
warnings = "italic",
|
|
||||||
information = "italic",
|
|
||||||
},
|
|
||||||
underlines = {
|
|
||||||
errors = "underline",
|
|
||||||
hints = "underline",
|
|
||||||
warnings = "underline",
|
|
||||||
information = "underline",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
lsp_trouble = false,
|
|
||||||
cmp = true,
|
|
||||||
lsp_saga = false,
|
|
||||||
gitgutter = false,
|
|
||||||
gitsigns = true,
|
|
||||||
telescope = true,
|
|
||||||
nvimtree = {
|
|
||||||
enabled = true,
|
|
||||||
show_root = false,
|
|
||||||
transparent_panel = false,
|
|
||||||
},
|
|
||||||
which_key = false,
|
|
||||||
indent_blankline = {
|
|
||||||
enabled = true,
|
|
||||||
colored_indent_levels = false,
|
|
||||||
},
|
|
||||||
dashboard = true,
|
|
||||||
neogit = false,
|
|
||||||
vim_sneak = false,
|
|
||||||
fern = false,
|
|
||||||
barbar = false,
|
|
||||||
bufferline = true,
|
|
||||||
markdown = true,
|
|
||||||
lightspeed = false,
|
|
||||||
ts_rainbow = false,
|
|
||||||
hop = false,
|
|
||||||
notify = true,
|
|
||||||
telekasten = true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
catppuccin.setup(settings)
|
|
@ -1,7 +1,8 @@
|
|||||||
require('goto-preview').setup {
|
require('goto-preview').setup {
|
||||||
width = 120; -- Width of the floating window
|
width = 120; -- Width of the floating window
|
||||||
height = 20; -- Height of the floating window
|
height = 20; -- Height of the floating window
|
||||||
border = {"↖", "─" ,"┐", "│", "┘", "─", "└", "│"}; -- Border characters of the floating window
|
border = {"╭", "─" ,"╮", "│", "╯", "─", "╰", "│"}; -- Border characters of the floating window
|
||||||
|
-- border = {"┌", "─" ,"┐", "│", "┘", "─", "└", "│"}; -- Border characters of the floating window
|
||||||
default_mappings = false; -- Bind default mappings
|
default_mappings = false; -- Bind default mappings
|
||||||
debug = false; -- Print debug information
|
debug = false; -- Print debug information
|
||||||
opacity = 25; -- 0-100 opacity level of the floating window where 100 is fully transparent.
|
opacity = 25; -- 0-100 opacity level of the floating window where 100 is fully transparent.
|
||||||
|
@ -44,15 +44,30 @@ end
|
|||||||
vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]]
|
vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]]
|
||||||
vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]]
|
vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]]
|
||||||
|
|
||||||
|
-- squared corners
|
||||||
|
|
||||||
|
-- local border = {
|
||||||
|
-- {"┌", "FloatBorder"},
|
||||||
|
-- {"─", "FloatBorder"},
|
||||||
|
-- {"┐", "FloatBorder"},
|
||||||
|
-- {"|", "FloatBorder"},
|
||||||
|
-- {"┘", "FloatBorder"},
|
||||||
|
-- {"─", "FloatBorder"},
|
||||||
|
-- {"└", "FloatBorder"},
|
||||||
|
-- {"|", "FloatBorder"},
|
||||||
|
-- }
|
||||||
|
|
||||||
|
-- rounded
|
||||||
|
|
||||||
local border = {
|
local border = {
|
||||||
{"🭽", "FloatBorder"},
|
{"╭", "FloatBorder"},
|
||||||
{"▔", "FloatBorder"},
|
{"─", "FloatBorder"},
|
||||||
{"🭾", "FloatBorder"},
|
{"╮", "FloatBorder"},
|
||||||
{"▕", "FloatBorder"},
|
{"│", "FloatBorder"},
|
||||||
{"🭿", "FloatBorder"},
|
{"╯", "FloatBorder"},
|
||||||
{"▁", "FloatBorder"},
|
{"─", "FloatBorder"},
|
||||||
{"🭼", "FloatBorder"},
|
{"╰", "FloatBorder"},
|
||||||
{"▏", "FloatBorder"},
|
{"│", "FloatBorder"},
|
||||||
}
|
}
|
||||||
|
|
||||||
local handlers = {
|
local handlers = {
|
||||||
@ -85,7 +100,7 @@ local DEFAULT_SETTINGS = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
-- The directory in which to install all servers.
|
-- The directory in which to install all servers.
|
||||||
install_root_dir = "~/.vim/lsp",
|
-- install_root_dir = "/home/sudacode/.vim/lsp",
|
||||||
|
|
||||||
pip = {
|
pip = {
|
||||||
-- These args will be added to `pip install` calls. Note that setting extra args might impact intended behavior
|
-- These args will be added to `pip install` calls. Note that setting extra args might impact intended behavior
|
||||||
@ -95,7 +110,7 @@ local DEFAULT_SETTINGS = {
|
|||||||
install_args = {},
|
install_args = {},
|
||||||
},
|
},
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
-- handlers=handlers,
|
handlers=handlers,
|
||||||
|
|
||||||
-- Controls to which degree logs are written to the log file. It's useful to set this to vim.log.levels.DEBUG when
|
-- Controls to which degree logs are written to the log file. It's useful to set this to vim.log.levels.DEBUG when
|
||||||
-- debugging issues with server installations.
|
-- debugging issues with server installations.
|
||||||
@ -161,13 +176,13 @@ end)
|
|||||||
|
|
||||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||||
-- map buffer local keybindings when the language server attaches
|
-- map buffer local keybindings when the language server attaches
|
||||||
-- local servers = { 'pyright', 'bashls', 'sqlls' }
|
local servers = { 'pyright', 'bashls', 'sqls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'jsonls', 'dotls' }
|
||||||
-- for _, lsp in pairs(servers) do
|
for _, lsp in pairs(servers) do
|
||||||
-- require('lspconfig')[lsp].setup {
|
require('lspconfig')[lsp].setup {
|
||||||
-- on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
-- flags = {
|
flags = {
|
||||||
-- -- This will be the default in neovim 0.7+
|
-- This will be the default in neovim 0.7+
|
||||||
-- debounce_text_changes = 150,
|
debounce_text_changes = 150,
|
||||||
-- }
|
}
|
||||||
-- }
|
}
|
||||||
-- end
|
end
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
require'marks'.setup {
|
|
||||||
-- whether to map keybinds or not. default true
|
|
||||||
default_mappings = true,
|
|
||||||
-- which builtin marks to show. default {}
|
|
||||||
builtin_marks = { ".", "<", ">", "^" },
|
|
||||||
-- whether movements cycle back to the beginning/end of buffer. default true
|
|
||||||
cyclic = true,
|
|
||||||
-- whether the shada file is updated after modifying uppercase marks. default false
|
|
||||||
force_write_shada = false,
|
|
||||||
-- how often (in ms) to redraw signs/recompute mark positions.
|
|
||||||
-- higher values will have better performance but may cause visual lag,
|
|
||||||
-- while lower values may cause performance penalties. default 150.
|
|
||||||
refresh_interval = 250,
|
|
||||||
-- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase
|
|
||||||
-- marks, and bookmarks.
|
|
||||||
-- can be either a table with all/none of the keys, or a single number, in which case
|
|
||||||
-- the priority applies to all marks.
|
|
||||||
-- default 10.
|
|
||||||
sign_priority = { lower=10, upper=15, builtin=8, bookmark=20 },
|
|
||||||
-- disables mark tracking for specific filetypes. default {}
|
|
||||||
excluded_filetypes = {},
|
|
||||||
-- marks.nvim allows you to configure up to 10 bookmark groups, each with its own
|
|
||||||
-- sign/virttext. Bookmarks can be used to group together positions and quickly move
|
|
||||||
-- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and
|
|
||||||
-- default virt_text is "".
|
|
||||||
bookmark_0 = {
|
|
||||||
sign = "⚑",
|
|
||||||
virt_text = "hello world"
|
|
||||||
},
|
|
||||||
mappings = {}
|
|
||||||
}
|
|
@ -1,5 +0,0 @@
|
|||||||
vim.g.tokyodark_transparent_background = false
|
|
||||||
vim.g.tokyodark_enable_italic_comment = true
|
|
||||||
vim.g.tokyodark_enable_italic = true
|
|
||||||
vim.g.tokyodark_color_gamma = "1.0"
|
|
||||||
vim.cmd("colorscheme tokyodark")
|
|
Loading…
Reference in New Issue
Block a user