Compare commits

..

No commits in common. "ccb2a67d464c4c4de1cd7774214064d77e878610" and "18fa9e7bb2415e67e21a6ce2687a81fa0cb936c5" have entirely different histories.

2 changed files with 29 additions and 44 deletions

View File

@ -153,7 +153,6 @@ call plug#begin('~/.config/nvim/plugged')
Plug 'kyazdani42/nvim-tree.lua' Plug 'kyazdani42/nvim-tree.lua'
Plug 'z0mbix/vim-shfmt', { 'for': 'sh' } Plug 'z0mbix/vim-shfmt', { 'for': 'sh' }
Plug 'zainin/vim-mikrotik'
call plug#end() call plug#end()
" LUA " LUA
@ -170,7 +169,6 @@ local on_attach = function(client, bufnr)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ge', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
@ -439,7 +437,6 @@ nmap <Leader>e <cmd>Telescope buffers<cr>
nmap <Leader>w <cmd>Telescope find_files<cr> nmap <Leader>w <cmd>Telescope find_files<cr>
nmap <Leader>q <cmd>Telescope live_grep<cr> nmap <Leader>q <cmd>Telescope live_grep<cr>
nmap <Leader>g <cmd>Telescope git_branches<cr> nmap <Leader>g <cmd>Telescope git_branches<cr>
nmap <Leader>a <cmd>Telescope diagnostics<cr>
" Resize window " Resize window
nnoremap <C-L> :vertical resize +5<CR> nnoremap <C-L> :vertical resize +5<CR>
@ -601,9 +598,6 @@ autocmd BufWritePre *.go lua go_org_imports()
" Conf " Conf
au BufNewFile,BufRead *.conf setfiletype conf au BufNewFile,BufRead *.conf setfiletype conf
" Mikrotik
au BufNewFile,BufRead *.mikrotik setfiletype routeros
" Automatically deletes all trailing whitespace and newlines at end of file on save. " Automatically deletes all trailing whitespace and newlines at end of file on save.
autocmd BufWritePre * %s/\s\+$//e autocmd BufWritePre * %s/\s\+$//e
autocmd BufWritepre * %s/\n\+\%$//e autocmd BufWritepre * %s/\n\+\%$//e

View File

@ -1,38 +1,15 @@
# Default shell configuration set -g prefix C-a
set-option -g default-shell /bin/zsh set-option -g default-shell /bin/zsh
set -g default-terminal "screen-256color" set -g default-terminal "screen-256color"
set -ga terminal-overrides ",*256col*:Tc" set -ga terminal-overrides ",*256col*:Tc"
# Keybindings
unbind C-b # Unbind a default keys conbination
unbind q # Unbind a q key
set -g prefix C-a # Set a default keys conbination
bind-key C-a send-prefix # Set a default keys conbination
bind q confirm kill-window # Set a kill-window keybind
bind Q confirm kill-pane # Set a kill-pane keybind
bind - split-window -v # Split window vertical
bind _ split-window -h # Split window horizontal
bind > swap-pane -D # Swap current pane with the next one
bind < swap-pane -U # Swap current pane with the previous one
bind C-w select-pane -l # Go to last panel
bind h select-pane -L # Go to left panel
bind j select-pane -D # Go to down panel
bind k select-pane -U # Go to up panel
bind l select-pane -R # Go to right panel
bind -r H resize-pane -L 2 # Resize panel left
bind -r J resize-pane -D 2 # Resize panel down
bind -r K resize-pane -U 2 # Resize panel up
bind -r L resize-pane -R 2 # Resize panel right
bind -r C-h previous-window # Select previous window
bind -r C-l next-window # Select next window
bind Tab last-window # Move to last active window
bind C-c new-session # Keybind for a new session
bind C-f command-prompt -p find-session 'switch-client -t %%'
bind-key -n C-f copy-mode \; send-key ?
# Copying a output from panel the terminal to file ~/tmux.history
bind-key p command-prompt -p 'save history to filename:' -I '~/tmux.history' 'capture-pane -JS -32768 ; save-buffer %1 ; delete-buffer' bind-key p command-prompt -p 'save history to filename:' -I '~/tmux.history' 'capture-pane -JS -32768 ; save-buffer %1 ; delete-buffer'
unbind C-b
bind-key C-a send-prefix
unbind q
bind q confirm kill-window
bind Q confirm kill-pane
set -g status on
bind-key -n C-f copy-mode \; send-key ?
set -g history-limit 20000 set -g history-limit 20000
set-option -sg escape-time 0 set-option -sg escape-time 0
set -g base-index 1 # start windows numbering at 1 set -g base-index 1 # start windows numbering at 1
@ -46,14 +23,26 @@ set -g status-interval 10 # redraw status line every 10 seconds
set -g monitor-activity on set -g monitor-activity on
set -g visual-activity off set -g visual-activity off
set -g visual-bell off set -g visual-bell off
bind C-c new-session
bind C-f command-prompt -p find-session 'switch-client -t %%'
bind - split-window -v
bind _ split-window -h
bind > swap-pane -D # swap current pane with the next one
bind < swap-pane -U # swap current pane with the previous one
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
bind -r H resize-pane -L 2
bind -r J resize-pane -D 2
bind -r K resize-pane -U 3
bind -r L resize-pane -R 2
bind -r C-h previous-window # select previous window
bind -r C-l next-window # select next window
bind Tab last-window # move to last active window
# Coloring of the panel # Source of example configuration
set -g pane-border-style fg=default # https://arcolinux.com/everything-you-need-to-know-about-tmux-status-bar/
set -g pane-active-border-style "bg=default fg=color244"
# Status bar
## Source of example configuration
## https://arcolinux.com/everything-you-need-to-know-about-tmux-status-bar/
set-option -g status on set-option -g status on
set-option -g status-interval 1 set-option -g status-interval 1
set-option -g status-position bottom set-option -g status-position bottom
@ -63,3 +52,5 @@ set-option -g status-left-style default
set-option -g status-right-length 140 set-option -g status-right-length 140
set-option -g status-right-style default set-option -g status-right-style default
set-option -g status-right "%a %H:%M:%S %Y-%m-%d" set-option -g status-right "%a %H:%M:%S %Y-%m-%d"
set -g pane-border-style fg=default
set -g pane-active-border-style "bg=default fg=color244"