Compare commits
6 Commits
b2fd66bb71
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ce0219c20 | |||
| 8a701a132e | |||
| 7c054afd58 | |||
| 435be7f5d0 | |||
| dd44604513 | |||
| dd22869a29 |
@@ -28,12 +28,14 @@ cmd-2 = 'workspace 2'
|
|||||||
cmd-3 = 'workspace 3'
|
cmd-3 = 'workspace 3'
|
||||||
cmd-4 = 'workspace 4'
|
cmd-4 = 'workspace 4'
|
||||||
cmd-5 = 'workspace 5'
|
cmd-5 = 'workspace 5'
|
||||||
|
cmd-6 = 'workspace 6'
|
||||||
|
|
||||||
cmd-shift-1 = 'move-node-to-workspace 1'
|
cmd-shift-1 = 'move-node-to-workspace 1'
|
||||||
cmd-shift-2 = 'move-node-to-workspace 2'
|
cmd-shift-2 = 'move-node-to-workspace 2'
|
||||||
cmd-shift-3 = 'move-node-to-workspace 3'
|
cmd-shift-3 = 'move-node-to-workspace 3'
|
||||||
cmd-shift-4 = 'move-node-to-workspace 4'
|
cmd-shift-4 = 'move-node-to-workspace 4'
|
||||||
cmd-shift-5 = 'move-node-to-workspace 5'
|
cmd-shift-5 = 'move-node-to-workspace 5'
|
||||||
|
cmd-shift-6 = 'move-node-to-workspace 6'
|
||||||
|
|
||||||
cmd-shift-semicolon = 'mode service'
|
cmd-shift-semicolon = 'mode service'
|
||||||
|
|
||||||
|
|||||||
+45
-32
@@ -10,6 +10,7 @@ vim.opt.concealcursor = 'nc' -- Conceal text in normal mode only
|
|||||||
vim.opt.signcolumn = "yes" -- Always show the sign column
|
vim.opt.signcolumn = "yes" -- Always show the sign column
|
||||||
vim.o.laststatus = 1 -- Always show the status line
|
vim.o.laststatus = 1 -- Always show the status line
|
||||||
vim.o.winborder = nil -- Use default border for floating windows
|
vim.o.winborder = nil -- Use default border for floating windows
|
||||||
|
vim.o.foldlevelstart = 99 -- Start with all folds closed
|
||||||
-- Indentation
|
-- Indentation
|
||||||
vim.opt.tabstop = 4 -- Number of spaces a tab represents
|
vim.opt.tabstop = 4 -- Number of spaces a tab represents
|
||||||
vim.opt.softtabstop = 4 -- Number of spaces a <Tab> in Insert mode equals
|
vim.opt.softtabstop = 4 -- Number of spaces a <Tab> in Insert mode equals
|
||||||
@@ -33,9 +34,6 @@ vim.opt.autoread = true -- Automati
|
|||||||
vim.opt.swapfile = false -- Disable swap files
|
vim.opt.swapfile = false -- Disable swap files
|
||||||
-- Formatting
|
-- Formatting
|
||||||
vim.opt.formatoptions:remove("ro") -- Remove 'ro' from formatoptions
|
vim.opt.formatoptions:remove("ro") -- Remove 'ro' from formatoptions
|
||||||
-- Clipboard (testing unnamedplus... might like it)
|
|
||||||
vim.opt.clipboard = "unnamedplus"
|
|
||||||
|
|
||||||
--Move lines
|
--Move lines
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||||
@@ -122,14 +120,50 @@ vim.pack.add({
|
|||||||
'https://github.com/nvim-tree/nvim-web-devicons',
|
'https://github.com/nvim-tree/nvim-web-devicons',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
local treesitter = require('nvim-treesitter')
|
||||||
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
callback = function(args)
|
||||||
|
if
|
||||||
|
vim.list_contains(
|
||||||
|
treesitter.get_installed(),
|
||||||
|
vim.treesitter.language.get_lang(args.match)
|
||||||
|
)
|
||||||
|
then
|
||||||
|
vim.treesitter.start(args.buf)
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- colorscheme --
|
-- colorscheme --
|
||||||
require('onedark').setup({ style = 'dark' })
|
require('onedark').setup({ style = 'dark' })
|
||||||
require('onedark').load()
|
require('onedark').load()
|
||||||
|
|
||||||
|
|
||||||
-- mini --
|
-- mini --
|
||||||
require('mini.icons').setup()
|
require('mini.icons').setup()
|
||||||
require('mini.surround').setup()
|
require('mini.surround').setup()
|
||||||
|
|
||||||
|
-- snacks --
|
||||||
|
require('snacks').setup({
|
||||||
|
bigfile = { enabled = true },
|
||||||
|
notifier = { enabled = true },
|
||||||
|
notify = { enabled = true },
|
||||||
|
quickfile = { enabled = true },
|
||||||
|
statuscolumn = { enabled = true },
|
||||||
|
input = { enabled = true },
|
||||||
|
image = {
|
||||||
|
doc = {
|
||||||
|
inline = false,
|
||||||
|
float = true,
|
||||||
|
max_width = 10,
|
||||||
|
max_height = 5,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
words = {
|
||||||
|
debounce = 10
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
require('mini.pairs').setup({
|
require('mini.pairs').setup({
|
||||||
mappings = {
|
mappings = {
|
||||||
-- Prevents the action if the cursor is just before any character or next to a "\".
|
-- Prevents the action if the cursor is just before any character or next to a "\".
|
||||||
@@ -155,27 +189,6 @@ require('mini.ai').setup({
|
|||||||
n_lines = 1000
|
n_lines = 1000
|
||||||
})
|
})
|
||||||
|
|
||||||
-- snacks --
|
|
||||||
require('snacks').setup({
|
|
||||||
bigfile = { enabled = true },
|
|
||||||
notifier = { enabled = true },
|
|
||||||
notify = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
statuscolumn = { enabled = true },
|
|
||||||
input = { enabled = true },
|
|
||||||
image = {
|
|
||||||
doc = {
|
|
||||||
inline = false,
|
|
||||||
float = true,
|
|
||||||
max_width = 10,
|
|
||||||
max_height = 5,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
words = {
|
|
||||||
debounce = 10
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
-- tiny-glimmer --
|
-- tiny-glimmer --
|
||||||
require('tiny-glimmer').setup({
|
require('tiny-glimmer').setup({
|
||||||
overwrite = {
|
overwrite = {
|
||||||
@@ -576,7 +589,7 @@ function RenderWinbar()
|
|||||||
}
|
}
|
||||||
for dir_name, dir_path in pairs(special_dirs) do
|
for dir_name, dir_path in pairs(special_dirs) do
|
||||||
if vim.startswith(path, vim.fs.normalize(dir_path)) and #dir_path > #prefix_path then
|
if vim.startswith(path, vim.fs.normalize(dir_path)) and #dir_path > #prefix_path then
|
||||||
prefix, prefix_path, folder_icon = dir_name, dir_path, MiniIcons.get('file',path)
|
prefix, prefix_path, folder_icon = dir_name, dir_path, MiniIcons.get('file', path)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if prefix ~= '' then
|
if prefix ~= '' then
|
||||||
@@ -597,10 +610,10 @@ function RenderWinbar()
|
|||||||
prefix,
|
prefix,
|
||||||
table.concat(
|
table.concat(
|
||||||
vim.iter(vim.split(path, '/'))
|
vim.iter(vim.split(path, '/'))
|
||||||
:map(function(segment)
|
:map(function(segment)
|
||||||
return string.format('%%#Winbar#%s', segment)
|
return string.format('%%#Winbar#%s', segment)
|
||||||
end)
|
end)
|
||||||
:totable(),
|
:totable(),
|
||||||
separator
|
separator
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
@@ -611,10 +624,10 @@ vim.api.nvim_create_autocmd('BufWinEnter', {
|
|||||||
desc = 'Attach winbar',
|
desc = 'Attach winbar',
|
||||||
callback = function(args)
|
callback = function(args)
|
||||||
if
|
if
|
||||||
not vim.api.nvim_win_get_config(0).zindex -- Not a floating window
|
not vim.api.nvim_win_get_config(0).zindex -- Not a floating window
|
||||||
and vim.bo[args.buf].buftype == '' -- Normal buffer
|
and vim.bo[args.buf].buftype == '' -- Normal buffer
|
||||||
and vim.api.nvim_buf_get_name(args.buf) ~= '' -- Has a file name
|
and vim.api.nvim_buf_get_name(args.buf) ~= '' -- Has a file name
|
||||||
and not vim.wo[0].diff -- Not in diff mode
|
and not vim.wo[0].diff -- Not in diff mode
|
||||||
then
|
then
|
||||||
vim.wo.winbar = "%{%v:lua.RenderWinbar()%}"
|
vim.wo.winbar = "%{%v:lua.RenderWinbar()%}"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -148,4 +148,4 @@
|
|||||||
"src": "https://github.com/lervag/vimtex"
|
"src": "https://github.com/lervag/vimtex"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ set -g status-left '[#S] '
|
|||||||
set -g status-style 'bg=default,fg=default'
|
set -g status-style 'bg=default,fg=default'
|
||||||
set -g window-status-format ' #I:#W '
|
set -g window-status-format ' #I:#W '
|
||||||
set -g window-status-current-format '#[bg=default,fg=default,reverse] #I:#W '
|
set -g window-status-current-format '#[bg=default,fg=default,reverse] #I:#W '
|
||||||
|
set-option -g status-interval 3
|
||||||
|
set-option -g automatic-rename on
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
set -g @plugin 'tmux-plugins/tpm'
|
set -g @plugin 'tmux-plugins/tpm'
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ if [[ -o interactive ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
bindkey -e
|
bindkey -e
|
||||||
|
bindkey "^[[1;5C" forward-word
|
||||||
|
bindkey "^[[1;5D" backward-word
|
||||||
|
bindkey '^H' backward-kill-word
|
||||||
|
|
||||||
source $ZDOTDIR/setup-history.zsh
|
source $ZDOTDIR/setup-history.zsh
|
||||||
source $ZDOTDIR/prompts/simple-two-line.zsh
|
source $ZDOTDIR/prompts/simple-two-line.zsh
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[user]
|
[user]
|
||||||
email = afonso@francof.net
|
email = afonso@francof.net
|
||||||
name = afranco
|
name = afonsofrancof
|
||||||
signingkey = ~/.ssh/signing_key
|
signingkey = ~/.ssh/signing_key
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
|
|||||||
Reference in New Issue
Block a user