this repo has no description
Revert "[all] save"
This reverts commit 4f32a93516fe355883f1754951710e0fb75b742b.
+150
-448
-1
fish/functions/br.fish
-1
fish/functions/br.fish
···
1
-
/Users/boltless/Library/Application Support/org.dystroy.broot/launcher/fish/br.fish
-29
nvim/README.md
-29
nvim/README.md
···
31
31
32
32
## TODO
33
33
34
-
- Things to learn
35
-
36
-
- [ ] jumplist
37
-
- [ ] operator
38
-
- [ ] register
39
-
- [ ] harpoon
40
-
41
-
- Things to add (or try)
42
-
43
-
- [ ] fidget.nvim
44
-
- [ ] nvim-base16
45
-
46
-
- Things to make
47
-
48
-
- [ ] show buffer count on statusbar
49
-
50
-
- [ ] projects
51
-
52
-
- [ ] nativeTerm.nvim
53
-
- [ ] proTerm.nvim
54
-
- [ ] inlinefold.nvim
55
-
- hides html class names (like tailwindcss)
56
-
- hides long texts (ex: urls) in markdown tables
57
-
- inspired by "inlinefold" plugin for VSCode
58
-
59
-
- [ ] add fold whichkey(or ui.select) mappings. use `<C-f>`
60
-
- [ ] remove numberline in vertical terminal like trouble.nvim
61
-
- [ ] mark opened buffers in file tree || make sidebar plugin to show buffer lists
62
-
- [ ] ignore help files in `Telescope oldfiles` (`<space>fr`)
63
34
- [x] Find why print `xterm-256color` on startup
64
35
- [ ] fix notify.nvim word wrap issue
65
36
- [ ] better ts-parser & LSP for MarkDown
+3
-7
nvim/init.lua
+3
-7
nvim/init.lua
···
1
1
require 'core.options'
2
2
require 'core.keymaps'
3
3
require 'core.plugins'
4
-
-- TODO: chage this file's dir to colors/init.lua
5
-
require 'core.colorscheme.tokyonight'
4
+
require 'core.colorscheme'
6
5
require 'core.autocmds'
7
-
require 'core.terminal'
8
6
require 'core.lsp'
9
7
10
-
-- TODO: change these files' dir to after/plugins/*.lua (no need to require)
11
-
-- check craftzdog's config
12
8
require 'plugins.cmp'
13
9
require 'plugins.telescope'
14
10
require 'plugins.treesitter'
···
17
13
require 'plugins.autopairs'
18
14
require 'plugins.gitsigns'
19
15
require 'plugins.nvim-tree'
20
-
-- require 'plugins.bufferline'
16
+
require 'plugins.bufferline'
21
17
require 'plugins.lualine'
22
18
require 'plugins.toggleterm'
23
19
require 'plugins.alpha'
···
25
21
require 'plugins.illuminate'
26
22
require 'plugins.notify'
27
23
require 'plugins.indentblankline'
28
-
-- require 'plugins.neorg'
24
+
require 'plugins.neorg'
29
25
require 'plugins.neogit'
30
26
require 'plugins.diffview'
31
27
-- require 'plugins.project'
+11
-93
nvim/lua/core/autocmds.lua
+11
-93
nvim/lua/core/autocmds.lua
···
1
-
local augroup = vim.api.nvim_create_augroup('MyAutocmds', { clear = true })
2
-
local autocmd = function(events, opts)
3
-
opts.group = augroup
4
-
vim.api.nvim_create_autocmd(events, opts)
5
-
end
6
-
7
-
-- auto delete [No Name] buffers when hidden
8
-
autocmd('BufHidden', {
9
-
callback = function(opts)
10
-
if opts.file == '' and not vim.bo[opts.buf].modified and vim.bo[opts.buf].buftype == '' then
11
-
vim.schedule(function()
12
-
vim.api.nvim_buf_delete(opts.buf, {})
13
-
end)
14
-
end
15
-
end
16
-
})
17
-
18
-
-- better native terminal
19
-
autocmd('TermOpen', {
1
+
vim.api.nvim_create_autocmd({ 'TermOpen', 'BufEnter' }, {
2
+
pattern = 'term://*',
20
3
callback = function(opts)
21
-
if vim.bo[opts.buf].filetype ~= '' then
22
-
return
23
-
end
24
-
vim.notify('Terminal buffer detected')
25
-
if vim.api.nvim_get_current_buf() ~= opts.buf then
26
-
vim.notify('D')
27
-
autocmd('BufEnter', {
28
-
buffer = opts.buf,
29
-
callback = function()
30
-
vim.notify('Terminal entered')
31
-
vim.opt_local.number = false
32
-
vim.opt_local.relativenumber = false
33
-
vim.opt_local.signcolumn = 'no'
34
-
return true
35
-
end
36
-
})
37
-
else
38
-
vim.notify('C')
39
-
end
40
-
vim.bo[opts.buf].filetype = 'terminal'
41
-
vim.bo[opts.buf].buflisted = false
4
+
vim.api.nvim_buf_set_option(opts.buf, 'bufhidden', 'wipe')
5
+
vim.opt_local.number = false
6
+
vim.opt_local.relativenumber = false
7
+
vim.opt_local.cursorline = false
8
+
vim.cmd [[startinsert]]
42
9
end
43
10
})
44
11
45
-
local pickers = require('telescope.pickers')
46
-
local entry_display = require('telescope.pickers.entry_display')
47
-
local finders = require('telescope.finders')
48
-
local conf = require('telescope.config').values
49
-
50
-
function GoTerm(opts)
51
-
opts = opts or {}
52
-
53
-
local buffers = {}
54
-
-- for bufnr, isopen in pairs(termbufs) do
55
-
-- local element = {
56
-
-- bufnr = bufnr,
57
-
-- isopen = isopen,
58
-
-- info = vim.fn.getbufinfo(bufnr)[1],
59
-
-- name = vim.fn.getbufinfo(bufnr)[1].name,
60
-
-- }
61
-
-- table.insert(buffers, element)
62
-
-- end
63
-
64
-
local displayer = entry_display.create({
65
-
separator = ' ',
66
-
items = {
67
-
{ width = opts.bufnr_width },
68
-
{ remaining = true },
69
-
}
70
-
})
71
-
72
-
local make_display = function(entry)
73
-
return displayer({
74
-
{ tostring(entry.bufnr), 'TelescopeResultsNumber' },
75
-
entry.name or '[No Name]',
76
-
})
77
-
end
78
-
79
-
pickers.new(opts, {
80
-
prompt_title = 'Terminals',
81
-
finder = finders.new_table({
82
-
results = buffers,
83
-
entry_maker = function(entry)
84
-
return {
85
-
value = entry,
86
-
bufnr = entry.bufnr,
87
-
name = entry.name,
88
-
display = make_display,
89
-
ordinal = tostring(entry.bufnr),
90
-
}
91
-
end,
92
-
}),
93
-
sorter = conf.generic_sorter(opts),
94
-
}):find()
95
-
end
96
-
97
-
vim.keymap.set('n', 'tt', GoTerm)
12
+
vim.api.nvim_create_user_command('Vterm', function()
13
+
vim.cmd [[split]]
14
+
vim.cmd [[term]]
15
+
end, {})
+62
nvim/lua/core/colorscheme.lua
+62
nvim/lua/core/colorscheme.lua
···
1
+
-- Tokyonight config
2
+
3
+
vim.g.tokyonight_style = 'night'
4
+
-- Add transparent in graphical applications
5
+
if vim.fn.expand('$TERM') ~= '' then
6
+
vim.g.tokyonight_transparent = true
7
+
vim.g.tokyonight_transparent_sidebar = false
8
+
end
9
+
10
+
local colorscheme = 'tokyonight'
11
+
12
+
-- Load the colorscheme
13
+
local ok, _ = pcall(vim.cmd, 'colorscheme ' .. colorscheme)
14
+
if not ok then
15
+
vim.notify('colorscheme ' .. colorscheme .. ' not found!')
16
+
return
17
+
end
18
+
19
+
-- Additional highlights
20
+
-- TODO: make PR about these
21
+
local c = require('tokyonight.colors').setup()
22
+
local util = require('tokyonight.util')
23
+
-- vim.highlight.link('TreesitterContext', 'CursorLine')
24
+
-- vim.highlight.link('TreesitterContextLineNumber', 'PmenuSel')
25
+
util.highlight('TreesitterContext', { bg = c.bg_highlight })
26
+
util.highlight('TreesitterContextLineNumber', { fg = c.comment, bg = c.bg_highlight })
27
+
util.highlight('IndentBlanklineChar', { fg = c.fg_gutter })
28
+
util.highlight('IndentBlanklineContextChar', { fg = c.dark5 })
29
+
util.highlight('NavicText', { fg = c.dark5 })
30
+
util.highlight('NavicSeparator', { fg = c.fg_gutter })
31
+
util.highlight('NvimTreeWinSeparator', { fg = c.bg_sidebar, bg = c.bg_sidebar })
32
+
local items = {
33
+
'File',
34
+
'Module',
35
+
'Namespace',
36
+
'Package',
37
+
'Class',
38
+
'Method',
39
+
'Property',
40
+
'Field',
41
+
'Constructor',
42
+
'Enum',
43
+
'Interface',
44
+
'Function',
45
+
'Variable',
46
+
'Constant',
47
+
'String',
48
+
'Number',
49
+
'Boolean',
50
+
'Array',
51
+
'Object',
52
+
'Key',
53
+
'Null',
54
+
'EnumMember',
55
+
'Struct',
56
+
'Event',
57
+
'Operator',
58
+
'TypeParameter',
59
+
}
60
+
for _, item in pairs(items) do
61
+
vim.cmd('hi link NavicIcons' .. item .. ' CmpItemKind' .. item)
62
+
end
-7
nvim/lua/core/colorscheme/catppuccin.lua
-7
nvim/lua/core/colorscheme/catppuccin.lua
-78
nvim/lua/core/colorscheme/tokyonight.lua
-78
nvim/lua/core/colorscheme/tokyonight.lua
···
1
-
-- Tokyonight config
2
-
3
-
require('tokyonight').setup({
4
-
style = 'night',
5
-
transparent = false,
6
-
-- TODO: override colors
7
-
on_colors = function(c)
8
-
-- example:
9
-
-- c.error = '#ff0000'
10
-
end,
11
-
-- TODO: override highlights
12
-
on_highlights = function(hl, c)
13
-
hl.TreesitterContext = {
14
-
bg = c.bg_highlight,
15
-
}
16
-
hl.TreesitterContextLineNumber = {
17
-
fg = c.comment,
18
-
bg = c.bg_highlight,
19
-
}
20
-
hl.IndentBlanklineChar = {
21
-
fg = c.fg_gutter,
22
-
}
23
-
hl.IndentBlanklineContextChar = {
24
-
fg = c.dark5,
25
-
}
26
-
hl.NavicText = {
27
-
fg = c.dark5,
28
-
}
29
-
hl.NavicSeparator = {
30
-
fg = c.fg_gutter,
31
-
}
32
-
hl.NvimTreeWinSeparator = {
33
-
fg = c.bg_sidebar,
34
-
bg = c.bg_sidebar,
35
-
}
36
-
end,
37
-
})
38
-
39
-
local colorscheme = 'tokyonight'
40
-
41
-
-- Load the colorscheme
42
-
local ok, _ = pcall(vim.cmd, 'colorscheme ' .. colorscheme)
43
-
if not ok then
44
-
vim.notify('colorscheme ' .. colorscheme .. ' not found!')
45
-
return
46
-
end
47
-
48
-
local items = {
49
-
'File',
50
-
'Module',
51
-
'Namespace',
52
-
'Package',
53
-
'Class',
54
-
'Method',
55
-
'Property',
56
-
'Field',
57
-
'Constructor',
58
-
'Enum',
59
-
'Interface',
60
-
'Function',
61
-
'Variable',
62
-
'Constant',
63
-
'String',
64
-
'Number',
65
-
'Boolean',
66
-
'Array',
67
-
'Object',
68
-
'Key',
69
-
'Null',
70
-
'EnumMember',
71
-
'Struct',
72
-
'Event',
73
-
'Operator',
74
-
'TypeParameter',
75
-
}
76
-
for _, item in pairs(items) do
77
-
vim.cmd('hi link NavicIcons' .. item .. ' CmpItemKind' .. item)
78
-
end
+9
-15
nvim/lua/core/keymaps.lua
+9
-15
nvim/lua/core/keymaps.lua
···
16
16
-- t : terminal mode
17
17
-- c : command mode
18
18
19
+
-- Normal --
19
20
-- Better window navigation
20
21
set('n', '<C-h>', '<C-w>h')
21
22
set('n', '<C-j>', '<C-w>j')
···
59
60
60
61
set('n', 'dd', smart_dd, { expr = true })
61
62
62
-
-- Don't yank with x
63
-
set('n', 'x', '"_x')
64
-
65
-
-- Increment/Decrement
66
-
set('n', '+', '<C-a>')
67
-
set('n', '-', '<C-x>')
68
-
69
63
-- Smart closing
70
64
local function smart_close()
71
-
if not pcall(vim.cmd.tabclose) then
72
-
if not pcall(vim.cmd.close) then
73
-
vim.cmd.bd()
74
-
end
65
+
if not pcall(vim.cmd.close) then
66
+
vim.cmd.bd()
75
67
end
76
68
end
77
69
···
79
71
80
72
set('n', '<C-e>', '<cmd>NvimTreeToggle<CR>')
81
73
82
-
-- Press jk fast to exit insert mode
83
-
set('i', 'jk', '<ESC>')
84
-
set('i', 'kj', '<ESC>')
74
+
-- Insert --
75
+
-- Press jk fast to exit Insert | Visual mode
76
+
set({ 'i', 'v' }, 'jk', '<ESC>')
77
+
set({ 'i', 'v' }, 'kj', '<ESC>')
85
78
86
79
-- TODO using clipboard in graphical applications
87
80
-- https://github.com/neovide/neovide/issues/1282#issuecomment-1108646687
···
91
84
set('v', '<D-c>', '<cmd>echo "want to copy"<CR>')
92
85
set('v', '<D-v>', '<cmd>echo "want to paste"<CR>')
93
86
94
-
-- Stay visual mode while indenting
87
+
-- Visual --
88
+
-- Stay in indent mode
95
89
set('v', '<', '<gv')
96
90
set('v', '>', '>gv')
97
91
+1
-1
nvim/lua/core/lsp/settings/sumneko_lua.lua
+1
-1
nvim/lua/core/lsp/settings/sumneko_lua.lua
···
10
10
-- NOTE: diable `different-requires` to hide warnings
11
11
-- https://www.reddit.com/r/neovim/comments/rvc4vo/annoying_lua_warning/
12
12
-- https://www.reddit.com/r/neovim/comments/snmkr3/comment/hw6diw9/
13
-
-- disable = { 'different-requires' },
13
+
disable = { 'different-requires' },
14
14
globals = { 'vim' },
15
15
},
16
16
format = {
+4
-4
nvim/lua/core/options.lua
+4
-4
nvim/lua/core/options.lua
···
8
8
fileencoding = 'utf-8', -- the encoding written to a file
9
9
hlsearch = true, -- highlight all matches on previous search pattern
10
10
ignorecase = true, -- ignore case in search patterns
11
-
mouse = 'nv', -- allow the mouse to be used in neovim (not in insert mode)
11
+
mouse = '', -- don't allow the mouse to be used in neovim
12
12
pumheight = 10, -- pop up menu height
13
13
showmode = false, -- we don't need to see things like -- INSERT -- anymore
14
-
showtabline = 1, -- only show tab if there are at least two tab pages
14
+
showtabline = 2, -- always show tabs
15
15
smartcase = true, -- smart case
16
16
smartindent = true, -- make indenting smarter again
17
17
splitbelow = true, -- force all horizontal splits to go below current window
···
20
20
termguicolors = true, -- set term gui colors (most terminals support this)
21
21
timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
22
22
undofile = true, -- enable persistent undo
23
-
updatetime = 100, -- faster completion (4000ms default)
23
+
updatetime = 300, -- faster completion (4000ms default)
24
24
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
25
25
expandtab = true, -- convert tabs to spaces
26
26
shiftwidth = 2, -- the number of spaces inserted for each indentation
27
27
tabstop = 2, -- insert 2 spaces for a tab
28
28
cursorline = true, -- highlight the current line
29
29
number = true, -- set numbered lines
30
-
relativenumber = true, -- set relative numbered lines
30
+
relativenumber = false, -- set relative numbered lines
31
31
numberwidth = 2, -- set number column width to 2 {default 4}
32
32
signcolumn = 'yes', -- always show the sign column, otherwise it would shift the text each time
33
33
colorcolumn = '80',
+3
-10
nvim/lua/core/plugins.lua
+3
-10
nvim/lua/core/plugins.lua
···
14
14
install_path,
15
15
}
16
16
print 'Installing packer close and reopen Neovim...'
17
-
vim.cmd.packadd('packer.nvim')
17
+
vim.cmd [[packadd packer.nvim]]
18
18
end
19
19
20
20
-- Autocommand that reloads neovim whenever you save the plugins.lua file
···
52
52
use 'numToStr/Comment.nvim' -- Easily comment stuff
53
53
use 'kyazdani42/nvim-web-devicons'
54
54
use 'kyazdani42/nvim-tree.lua' -- File explorer written in lua
55
-
-- use 'akinsho/bufferline.nvim'
55
+
use 'akinsho/bufferline.nvim'
56
56
use 'nvim-lualine/lualine.nvim'
57
57
use 'goolord/alpha-nvim'
58
58
use 'ahmedkhalf/project.nvim'
···
63
63
use 'lukas-reineke/indent-blankline.nvim'
64
64
use 'SmiteshP/nvim-navic'
65
65
use 'ChristianChiarulli/nvim-gps'
66
-
67
-
-- TODO: need to make this work correctly
68
-
use 'Pocco81/true-zen.nvim'
69
66
70
67
-- Note
71
68
use 'nvim-neorg/neorg'
···
79
76
-- Terminal
80
77
use {
81
78
'akinsho/toggleterm.nvim',
82
-
tag = 'v2.*',
79
+
tag = 'v1.*',
83
80
}
84
81
85
82
-- Colorschemes
86
83
use 'folke/tokyonight.nvim'
87
-
use { 'catppuccin/nvim', as = 'catppuccin' }
88
84
89
85
-- cmp plugins
90
86
use 'hrsh7th/nvim-cmp' -- The completion plugin
···
108
104
-- Language specific plugins (doesn't depend on nvim-lspconfg)
109
105
use 'akinsho/flutter-tools.nvim' -- flutter
110
106
use 'smjonas/inc-rename.nvim' -- rename with immediate visual feedback
111
-
use 'j-hui/fidget.nvim' -- lsp progress message
112
-
use 'simrat39/inlay-hints.nvim' -- inlay type hints
113
107
114
108
-- Telescope
115
109
use 'nvim-telescope/telescope.nvim'
116
-
use 'zane-/cder.nvim'
117
110
118
111
-- Treesitter
119
112
use {
-97
nvim/lua/core/terminal.lua
-97
nvim/lua/core/terminal.lua
···
1
-
local termbufs = {}
2
-
3
-
local augroup = vim.api.nvim_create_augroup('terminal', { clear = true })
4
-
local function newBuf(opts)
5
-
opts = opts or {}
6
-
opts.cmd = opts.cmd or vim.o.shell
7
-
8
-
local buf = vim.api.nvim_create_buf(true, false)
9
-
-- vim.bo[buf].buflisted = false
10
-
vim.bo[buf].filetype = 'term'
11
-
vim.api.nvim_buf_call(buf, function()
12
-
vim.fn.termopen(opts.cmd, {
13
-
detach = 1,
14
-
on_exit = function()
15
-
-- if opts.autoclose then
16
-
-- vim.api.nvim_buf_delete(buf, {})
17
-
-- end
18
-
end,
19
-
})
20
-
end)
21
-
22
-
-- Edit buffer name (add bufnr)
23
-
local name = vim.api.nvim_buf_get_name(buf)
24
-
name = name .. '#' .. buf
25
-
vim.api.nvim_buf_set_name(buf, name)
26
-
27
-
-- Save terminal-buffer's bufnr
28
-
table.insert(termbufs, {
29
-
bufnr = buf,
30
-
})
31
-
vim.api.nvim_create_autocmd('BufDelete', {
32
-
group = augroup,
33
-
buffer = buf,
34
-
callback = function()
35
-
for i, term in ipairs(termbufs) do
36
-
if term.bufnr == buf then
37
-
table.remove(termbufs, i)
38
-
end
39
-
end
40
-
end
41
-
})
42
-
return buf
43
-
end
44
-
45
-
function _G.term(opts)
46
-
if type(opts) == 'string' then
47
-
opts = { cmd = opts }
48
-
end
49
-
local buf = newBuf(opts)
50
-
vim.cmd.tabnew()
51
-
vim.api.nvim_set_current_buf(buf)
52
-
vim.api.nvim_buf_call(buf, function()
53
-
-- vim.cmd.setlocal('norenu')
54
-
-- vim.opt_local.signcolumn = 'no'
55
-
-- vim.opt_local.number = false
56
-
-- vim.opt_local.relativenumber = false
57
-
end)
58
-
-- local win = vim.api.nvim_get_current_win()
59
-
-- vim.wo[win].signcolumn = 'no'
60
-
-- vim.wo[win].number = false
61
-
-- vim.wo[win].relativenumber = false
62
-
end
63
-
64
-
function _G.select_buf()
65
-
vim.ui.select(termbufs,
66
-
{
67
-
prompt = 'Select LuaTerm Buffers',
68
-
format_item = function(item)
69
-
return item.bufnr .. ' - ' .. (item.name or 'No Name Terminal')
70
-
end,
71
-
},
72
-
function(choice)
73
-
if choice then
74
-
vim.api.nvim_set_current_buf(choice.bufnr)
75
-
end
76
-
end)
77
-
end
78
-
79
-
vim.keymap.set('n', '<c-t>', term)
80
-
vim.keymap.set('n', '<c-p>', function()
81
-
print(vim.inspect(termbufs))
82
-
end)
83
-
84
-
-- handle closing with autocmds
85
-
86
-
-- <C-;><leader> -> open luaterm buffer here (using telescope)
87
-
-- <C-;>; -> switch to luaterm buffer (using telescope)
88
-
--
89
-
-- open or switch current terminal buffer window to
90
-
-- <C-;>t -> open terminal buffer in new tab
91
-
-- <C-;>f -> open terminal buffer in floating window
92
-
--
93
-
-- Telescope format
94
-
--
95
-
-- bufnr | terminal_name
96
-
-- +
97
-
-- [[New Terminal]]
+7
-31
nvim/lua/plugins/alpha.lua
+7
-31
nvim/lua/plugins/alpha.lua
···
3
3
4
4
local dashboard = require 'alpha.themes.dashboard'
5
5
dashboard.section.header.val = {
6
-
-- [[ __ ]],
7
-
-- [[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
8
-
-- [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
9
-
-- [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
10
-
-- [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
11
-
-- [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
12
-
-- [[⣿⣿⡆⠀⠀⢸⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀⣾⣿⡆]],
13
-
-- [[⣿⣿⡇⠀⠀⢸⣿⢰⣿⡆⠀⣾⣿⡆⠀⣾⣷⣿⣿⡇⠀ ⣿⣿⡇]],
14
-
-- [[⣿⣿⡇⠀⠀⢸⣿⠘⣿⣿⣤⣿⣿⣿⣤⣿⡇⢻⣿⡇⠀⠀⣿⣿⡇]],
15
-
-- [[⣿⣿⡇⠀⠀⢸⡿⠀⢹⣿⣿⣿⣿⣿⣿⣿⠁⢸⣿⣇⠀⢀⣿⣿⠇]],
16
-
-- [[⠙⢿⣷⣶⣶⡿⠁⠀⠈⣿⣿⠟⠀⣿⣿⠇⠀⠈⠻⣿⣶⣾⡿⠋⠀]],
17
-
[[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀]],
18
-
[[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡋⣽⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀]],
19
-
[[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⠴⠾⠿⢷⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀]],
20
-
[[⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡴⠞⠉⣱⠏⠀⠀⠀⠀⠀⡿⠈⠙⠳⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀]],
21
-
[[⠉⠉⠉⠉⣷⠀⠀⠀⠀⠀⠀⠀⠀⢠⡞⣴⠁⣰⡏⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠉⠓⠶⣤⡀⠀⠀⠀⠀⠀]],
22
-
[[⠀⠀⠀⠀⢿⠀⠀⠀⠀⠀⠀⠀⢠⠏⣸⠇⣴⢿⡇⠀⠀⠀⠀⠀⣿⡆⠀⠀⠀⠀⠀⠀⣴⠞⠁⠀⠀⠀⠀⠀]],
23
-
[[⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⢠⡟⠀⣿⣼⠃⠘⣧⢀⣄⠀⠀⣼⠛⣧⠀⠀⠀⠀⠀⣦⠙⣧⠀⠀⠀⠀⠀⠀]],
24
-
[[⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⣼⣣⡄⣿⣷⣾⣶⣾⠿⠉⢷⣾⣷⣶⣿⡆⠀⢠⠆⠀⢻⡆⠘⣆⠀⠀⠀⠀⠀]],
25
-
[[⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⠛⣿⠹⡇⢸⣿⣼⡇⠀⠀⠀⠀⣿⣧⣿⣿⣶⡏⠀⠀⠘⡇⣿⠛⠀⠀⠀⠀⠀]],
26
-
[[⠀⠀⠀⠀⢸⡀⠀⢠⠆⠀⠀⢸⡏⣼⠇⠀⠉⠉⠀⠀⠀⠀⠀⠈⠛⠋⢸⡟⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀]],
27
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⠶⠂⠀⠈⣧⢿⣄⠀⠀⠀⠀⠀⣀⣀⠀⠀⠀⠀⠸⡇⠀⠀⠀⢀⣿⠉⠀⠀⠀⠀⠀⠀]],
28
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⢈⡁⠀⠀⢈⡿⠏⠛⣶⣦⣤⣤⣌⡉⠁⠀⣠⣴⣶⣿⠶⠆⠰⣿⠟⠀⠀⠀⠀⠀⠀⠀]],
29
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⠠⢤⠀⠀⢸⡅⠀⠀⠈⣿⡏⠉⢱⠟⢀⡴⠛⠁⢹⡇⠀⠀⠀⣼⠀⠀⠀⠀⠀⠀⠀⠀]],
30
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⠦⠀⠀⠀⠀⠻⣤⣿⣰⠟⢳⡀⢸⣠⠏⠀⣀⣠⠼⣇⣴⣄⣼⣧⣄⠀⠀⠀⠀⠀⠀⠀]],
31
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀⠀⢀⣼⢫⡏⠀⠀⠁⡾⠃⠘⠋⠁⠀⠀⠉⠀⢿⡇⢻⣽⡆⠀⠀⠀⠀⠀⠀]],
32
-
[[⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀⢀⡾⠁⡞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⢸⠶⡇⠀⠀⠀⠀⠀⠀]],
33
-
[[⠀⠀⠀⠀⢸⣇⠀⠀⢠⡖⢛⣶⣿⣁⣀⣀⣀⣀⣤⣤⠦⢤⣀⠀⠀⠀⠀⠀⠀⢸⡇⣿⣽⡇⠀⠀⠀⠀⠀⠀]],
34
-
[[⠀⠀⠀⠀⠸⣿⠀⠀⣾⠁⠀⣿⣿⡉⠙⠋⠀⠀⢹⡏⠀⠀⠈⢧⠀⠀⠀⠀⠀⣼⢁⡗⢾⠁⠀⠀⠀⠀⠀⠀]],
35
-
-- Braille ASCII Art
6
+
[[ __ ]],
7
+
[[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
8
+
[[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
9
+
[[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
10
+
[[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
11
+
[[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
36
12
}
37
13
dashboard.section.buttons.val = {
38
14
dashboard.button('e', ' > New file', ':enew <BAR> startinsert <CR>'),
···
61
37
vim.api.nvim_create_autocmd('BufUnload', {
62
38
group = 'alpha_tabline',
63
39
buffer = 0,
64
-
command = 'set showtabline=1 laststatus=3 ruler'
40
+
command = 'set showtabline=2 laststatus=3 ruler'
65
41
})
66
42
end
67
43
})
+10
-10
nvim/lua/plugins/cmp.lua
+10
-10
nvim/lua/plugins/cmp.lua
···
19
19
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
20
20
end
21
21
22
-
-- icons (based on lspkind-nvim)
22
+
-- פּ ﯟ some other good icons
23
23
local kind_icons = {
24
24
Text = '',
25
-
Method = '',
25
+
Method = 'm',
26
26
Function = '',
27
-
Constructor = '',
28
-
Field = 'ﰠ',
29
-
Variable = '',
30
-
Class = 'ﴯ',
27
+
Constructor = '',
28
+
Field = '',
29
+
Variable = '',
30
+
Class = '',
31
31
Interface = '',
32
32
Module = '',
33
-
Property = 'ﰠ',
34
-
Unit = '塞',
33
+
Property = '',
34
+
Unit = '',
35
35
Value = '',
36
36
Enum = '',
37
37
Keyword = '',
···
41
41
Reference = '',
42
42
Folder = '',
43
43
EnumMember = '',
44
-
Constant = '',
45
-
Struct = 'פּ',
44
+
Constant = '',
45
+
Struct = '',
46
46
Event = '',
47
47
Operator = '',
48
48
TypeParameter = '',
+5
-6
nvim/lua/plugins/comment.lua
+5
-6
nvim/lua/plugins/comment.lua
···
31
31
32
32
-- KEYMAPS
33
33
-- Linewise commnet toggle using Ctrl-/ (e.g. // some comment)
34
-
local api = require('Comment.api')
35
-
vim.keymap.set('n', [[<C-/>]], api.toggle.linewise.current)
36
-
-- TODO: ????
37
-
-- vim.keymap.set('v', [[<C-/>]], '<Plug>(comment_toggle_linewise_visual)')
34
+
-- TODO: check if `<C-/>` also works in neovim v0.7 (or `<C-_>`)
35
+
vim.keymap.set('n', [[<C-/>]], require('Comment.api').toggle_current_linewise)
36
+
vim.keymap.set('v', [[<C-/>]], '<Plug>(comment_toggle_linewise_visual)')
38
37
39
38
-- Blockwise comment toggle using Ctrl-\ (e.g. /* some comment */)
40
-
vim.keymap.set('n', [[<C-\>]], api.toggle.blockwise.current)
41
-
-- vim.keymap.set('v', [[<C-\>]], '<Plug>(comment_toggle_blockwise_visual)')
39
+
vim.keymap.set('n', [[<C-\>]], require('Comment.api').toggle_current_blockwise)
40
+
vim.keymap.set('v', [[<C-\>]], '<Plug>(comment_toggle_blockwise_visual)')
+1
-6
nvim/lua/plugins/gitsigns.lua
+1
-6
nvim/lua/plugins/gitsigns.lua
+1
-9
nvim/lua/plugins/illuminate.lua
+1
-9
nvim/lua/plugins/illuminate.lua
+2
-5
nvim/lua/plugins/inc-rename.lua
+2
-5
nvim/lua/plugins/inc-rename.lua
···
1
1
local ok, inc = pcall(require, 'inc_rename')
2
2
if not ok then return end
3
3
4
-
inc.setup {
4
+
inc.setup{
5
5
cmd_name = 'IncRename',
6
6
hl_group = 'Substitute',
7
-
preview_empty_name = false,
8
-
show_message = true,
9
-
input_buffer_type = nil,
10
-
post_hook = nil,
7
+
multifile_preview = true,
11
8
}
+2
-2
nvim/lua/plugins/notify.lua
+2
-2
nvim/lua/plugins/notify.lua
···
31
31
32
32
-- KEYMAPS
33
33
-- clear all
34
-
vim.keymap.set('n', '<ESC>', function()
34
+
vim.keymap.set('n', '-', function()
35
35
require('notify').dismiss() -- dismiss notifications
36
36
vim.cmd([[noh]]) -- remove search highlights
37
37
vim.cmd([[echon]]) -- clear cmdline
38
38
end)
39
39
-- show past notifications
40
-
-- vim.keymap.set('n', '+', '<cmd>Notifications<CR>')
40
+
vim.keymap.set('n', '+', '<cmd>Notifications<CR>')
41
41
42
42
vim.notify = notify
+13
-9
nvim/lua/plugins/nvim-tree.lua
+13
-9
nvim/lua/plugins/nvim-tree.lua
···
3
3
return
4
4
end
5
5
6
+
-- NOTE: tree_cb & the cb property are deprecated. See `:help nvim-tree-mappings`
7
+
-- local config_ok, nvim_tree_config = pcall(require, 'nvim-tree.config')
8
+
-- if not config_ok then
9
+
-- return
10
+
-- end
11
+
--
12
+
-- local tree_cb = nvim_tree_config.nvim_tree_callback
13
+
6
14
-- TODO: Update this with original github setup {} code
7
15
nvim_tree.setup {
8
16
disable_netrw = true,
···
19
27
view = {
20
28
-- TODO: function to calculate suitable width (open on current window in small width)
21
29
width = 30,
30
+
height = 30,
22
31
hide_root_folder = false,
23
32
side = 'left',
24
-
number = false,
25
-
relativenumber = false,
26
33
mappings = {
27
34
custom_only = true,
28
35
list = {
···
51
58
{ key = '?', action = 'toggle_help' },
52
59
},
53
60
},
61
+
number = false,
62
+
relativenumber = false,
54
63
},
55
64
renderer = {
56
-
indent_markers = {
57
-
-- enable = true,
58
-
icons = {
59
-
}
60
-
},
61
65
icons = {
62
66
glyphs = {
63
67
default = '',
···
94
98
},
95
99
},
96
100
update_focused_file = {
97
-
enable = false,
101
+
enable = true,
98
102
update_cwd = false,
99
103
ignore_list = {},
100
104
},
···
117
121
},
118
122
actions = {
119
123
open_file = {
120
-
quit_on_open = true,
124
+
quit_on_open = false,
121
125
},
122
126
},
123
127
}
-8
nvim/lua/plugins/telescope.lua
-8
nvim/lua/plugins/telescope.lua
···
5
5
6
6
local actions = require 'telescope.actions'
7
7
8
-
telescope.load_extension('cder')
9
-
10
-
-- TODO: make quicklist from searched result
11
-
12
8
telescope.setup {
13
9
defaults = {
14
10
mappings = {
···
19
15
['<C-c>'] = actions.close,
20
16
}
21
17
}
22
-
},
23
-
extensions = {
24
-
cder = {
25
-
},
26
18
},
27
19
}
+1
-2
nvim/lua/plugins/toggleterm.lua
+1
-2
nvim/lua/plugins/toggleterm.lua
···
23
23
cpp = { 'g++ -o temp ', ' && ./temp && rm ./temp' },
24
24
}
25
25
local function Runfile()
26
-
-- vim.cmd.write()
26
+
-- vim.cmd [[w]]
27
27
local cmds = files[vim.bo.filetype]
28
28
local command = cmds[1] .. vim.fn.expand('%:t') .. cmds[2]
29
29
if command ~= nil then
···
46
46
return vim.o.columns * 0.4
47
47
end
48
48
end,
49
-
direction = 'float',
50
49
open_mapping = [[<c-t>]],
51
50
on_open = function(term)
52
51
local opts = { buffer = term.bufnr }
+1
-1
nvim/lua/plugins/treesitter/context.lua
+1
-1
nvim/lua/plugins/treesitter/context.lua
···
2
2
if not ok then return end
3
3
4
4
context.setup {
5
-
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
5
+
enable = false, -- Enable this plugin (Can be enabled/disabled later via commands)
6
6
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
7
7
patterns = { -- Match patterns for TS nodes. These get wrapped to match at word boundaries.
8
8
-- For all filetypes
+14
-13
nvim/lua/plugins/whichkey.lua
+14
-13
nvim/lua/plugins/whichkey.lua
···
4
4
which_key.setup({
5
5
plugins = {
6
6
presets = {
7
-
operators = false,
7
+
operators = true,
8
8
motions = false,
9
9
text_objects = false,
10
10
windows = false,
···
41
41
local mappings = {
42
42
['0'] = { 'Select Next Parameter' },
43
43
['9'] = { 'Select Prev Parameter' },
44
-
[';'] = {
45
-
name = 'Terminal',
46
-
['1'] = { '<cmd>1ToggleTerm<CR>', '1' },
47
-
['2'] = { '<cmd>2ToggleTerm<CR>', '2' },
48
-
['3'] = { '<cmd>3ToggleTerm<CR>', '3' },
49
-
['4'] = { '<cmd>4ToggleTerm<CR>', '4' },
50
-
f = { '<cmd>ToggleTerm direction=float<CR>', 'Float Terminal' },
51
-
},
44
+
[';'] = { '<cmd>Telescope commands<CR>', 'Commands' },
52
45
53
46
a = { '<cmd>Alpha<CR>', 'Alpha' },
54
47
b = { '<cmd>Telescope buffers<CR>', 'Buffers' },
55
-
-- c = { '<cmd>Telescope commands<CR>', 'Commands' },
56
48
f = {
57
49
name = 'File',
58
50
f = { '<cmd>Telescope find_files<CR>', 'Find in CWD' },
···
62
54
},
63
55
g = {
64
56
name = 'Git',
57
+
-- TODO: add way to go-to-next-git-block
65
58
j = { '<cmd>Gitsigns next_hunk<CR>', 'Go To Next Hunk' },
66
59
k = { '<cmd>Gitsigns prev_hunk<CR>', 'Go To Prev Hunk' },
67
-
r = { '<cmd>Gitsigns reset_hunk<CR>', 'Reset Hunk' },
68
-
t = { '<cmd>Gitsigns toggle_signs<CR>', 'Toggle signs' },
69
60
s = { '<cmd>Telescope git_status<CR>', 'Status' },
70
61
d = { '<cmd>DiffviewOpen<CR>', 'Diff view' },
71
62
l = { '<cmd>lua _Lazygit_toggle()<CR>', 'LazyGit' },
···
91
82
r = { vim.lsp.buf.rename, 'Rename' },
92
83
w = { '<cmd>TroubleToggle workspace_diagnostics<CR>', 'Workspace Diagnostics' },
93
84
},
94
-
q = { 'Smart Close' },
85
+
q = { '<cmd>close<CR>', 'Close Window' },
86
+
['<leader>'] = {
87
+
name = 'Terminal',
88
+
['1'] = { '<cmd>1ToggleTerm<CR>', '1' },
89
+
['2'] = { '<cmd>2ToggleTerm<CR>', '2' },
90
+
['3'] = { '<cmd>3ToggleTerm<CR>', '3' },
91
+
['4'] = { '<cmd>4ToggleTerm<CR>', '4' },
92
+
f = { '<cmd>ToggleTerm direction=float<CR>', 'Float Terminal' },
93
+
},
94
+
-- TODO: delete buffer if bufnr(0) is -1 or it is last window(except NvimTree, Trouble, ...) istead of closing window
95
+
q = { 'Close Window' },
95
96
t = {
96
97
name = 'Trouble',
97
98
w = { '<cmd>TroubleToggle workspace_diagnostics<CR>', 'Workspace Diagnostics' },