Deleting old unused stuff, move some configs to _saved.
This commit is contained in:
parent
623c114870
commit
9e8fd82547
37 changed files with 1 additions and 408 deletions
175
_saved/neovim/init.lua
Normal file
175
_saved/neovim/init.lua
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
-- disable netrw
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
|
||||
-- install Lazy
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- define plugins
|
||||
require("lazy").setup({
|
||||
"jdhao/whitespace.nvim",
|
||||
"lewis6991/gitsigns.nvim",
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
"numToStr/Comment.nvim",
|
||||
"NvChad/nvim-colorizer.lua",
|
||||
"nvim-lualine/lualine.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"tanvirtin/monokai.nvim",
|
||||
{ "nvim-telescope/telescope.nvim",
|
||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||
},
|
||||
{ "nvim-neo-tree/neo-tree.nvim",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"MunifTanjim/nui.nvim"
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
config = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
require("which-key").setup({
|
||||
})
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
-- start & setup plugins
|
||||
-- colorscheme has to be first
|
||||
require("monokai").setup()
|
||||
require("gitsigns").setup({
|
||||
signs = {
|
||||
add = { text = "▎" },
|
||||
change = { text = "▎" },
|
||||
delete = { text = "▎" },
|
||||
topdelete = { text = "契" },
|
||||
changedelete = { text = "▎" },
|
||||
untracked = { text = "▎" },
|
||||
},
|
||||
})
|
||||
require("indent_blankline").setup()
|
||||
require("Comment").setup()
|
||||
require("colorizer").setup()
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
component_separators = '',
|
||||
icons_enabled = true,
|
||||
section_separators = '',
|
||||
theme = "molokai",
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { { "filename", file_status = true, path = 1 } },
|
||||
lualine_c = { "branch" },
|
||||
lualine_x = { "filetype" },
|
||||
lualine_y = { "progress" },
|
||||
lualine_z = { "location" },
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = { "buffers" },
|
||||
},
|
||||
})
|
||||
require("nvim-treesitter.configs").setup({
|
||||
build = ":TSUpdate",
|
||||
ensure_installed = { "bash", "python", "terraform", "vim", "yaml" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
},
|
||||
})
|
||||
|
||||
require("neo-tree").setup({
|
||||
close_if_last_window = false,
|
||||
sort_case_insensitive = true,
|
||||
window = {
|
||||
position = "left",
|
||||
auto_expand_width = true,
|
||||
-- width = 100,
|
||||
mappings = {
|
||||
["s"] = "open_split",
|
||||
["v"] = "open_vsplit",
|
||||
},
|
||||
},
|
||||
nesting_rules = {},
|
||||
filesystem = {
|
||||
filtered_items = {
|
||||
visible = true,
|
||||
hide_dotfiles = false,
|
||||
hide_gitignored = true,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- modify colorcheme
|
||||
vim.api.nvim_set_hl(0, "ColorColumn", { bg = "#770000" })
|
||||
vim.api.nvim_set_hl(0, "DiffChange", { bg = NONE, fg = "#e7c547" })
|
||||
vim.api.nvim_set_hl(0, "DiffText", { bg = NONE, fg = "#ff8700" })
|
||||
vim.api.nvim_set_hl(0, "LineNr", { bg = NONE, fg = "#465457" })
|
||||
vim.api.nvim_set_hl(0, "NonText", { bg = NONE })
|
||||
vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
|
||||
vim.api.nvim_set_hl(0, "SignColumn", { bg = NONE })
|
||||
vim.api.nvim_set_hl(0, "SpellBad", { bg = "#770000", fg = "#ffffff" })
|
||||
vim.api.nvim_set_hl(0, "Visual", { bg = "#005577", fg = "#ffffff" })
|
||||
|
||||
-- global options
|
||||
vim.opt.list = true
|
||||
vim.opt.cursorline = true
|
||||
vim.opt.expandtab = true
|
||||
vim.opt.gdefault = true
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.ignorecase = true
|
||||
vim.opt.number = true
|
||||
vim.opt.shiftround = true
|
||||
vim.opt.showmode = false
|
||||
vim.opt.smartcase = true
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.writebackup = false
|
||||
vim.opt.clipboard = ""
|
||||
vim.opt.mouse = ""
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.scrolloff = 5
|
||||
vim.opt.updatetime = 100
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.opt.showtabline = 2
|
||||
vim.opt.softtabstop = 2
|
||||
|
||||
-- configure mappings
|
||||
vim.g.mapleader = " "
|
||||
vim.keymap.set("i", "<C-a>", "<esc>I", { silent = true })
|
||||
vim.keymap.set("i", "<C-e>", "<esc>A", { silent = true })
|
||||
vim.keymap.set("n", "<esc><cr>", "<esc><cmd>wq!<cr>", { silent = true })
|
||||
vim.keymap.set("n", "<leader>/", "<esc><cmd>lua require('Comment.api').toggle.linewise.count(vim.v.count > 0 and vim.v.count or 1)<cr>", { silent = true, desc = "toggle comment" })
|
||||
vim.keymap.set("n", "<leader>c", '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true, desc = "toggle column" })
|
||||
vim.keymap.set("n", "<leader>fb", require("telescope.builtin").buffers, { desc = "find buffer" })
|
||||
vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, { desc = "find file" })
|
||||
vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, { desc = "find text" })
|
||||
vim.keymap.set("n", "<leader>h", "<cmd>set hlsearch!<cr>", { silent = true, desc = "toggle hlsearch" })
|
||||
vim.keymap.set("n", "<leader>j", "<cmd>bprevious<cr>", { silent = true, desc = "previous buffer" })
|
||||
vim.keymap.set("n", "<leader>k", "<cmd>bnext<cr>", { silent = true, desc = "next buffer" })
|
||||
vim.keymap.set("n", "<leader>n", "<cmd>set nonumber!<cr><cmd>Gitsigns toggle_signs<cr><cmd>IndentBlanklineToggle<cr>", { silent = true, desc = "toggle decorations" })
|
||||
vim.keymap.set("n", "<leader>s", "<cmd>set spell!<cr>", { silent = true, desc = "toggle spell" })
|
||||
vim.keymap.set("n", "<leader>t", "<cmd>Neotree toggle<cr>", { silent = true, desc = "toggle tree" })
|
||||
vim.keymap.set("n", "<leader>x", "<cmd>bd<cr>", { silent = true, desc = "close buffer" })
|
||||
vim.keymap.set("n", "<tab>", "<C-w>w", { silent = true })
|
||||
vim.keymap.set("v", "<leader>/", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", { silent = true, desc = "toggle comment" })
|
||||
|
||||
-- autocmd
|
||||
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
|
||||
pattern = {"*.gotmpl"},
|
||||
callback = function() vim.bo.filetype = "yaml" end,
|
||||
})
|
||||
110
_saved/neovim/init.vim
Normal file
110
_saved/neovim/init.vim
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
call plug#begin('$XDG_DATA_HOME/nvim/plugins')
|
||||
Plug 'kamykn/skyknight'
|
||||
Plug 'NvChad/nvim-colorizer.lua'
|
||||
Plug 'junegunn/fzf'
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'tpope/vim-commentary'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug 'itchyny/vim-gitbranch'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'hashivim/vim-terraform'
|
||||
Plug 'bitc/vim-bad-whitespace'
|
||||
call plug#end()
|
||||
|
||||
lua require 'colorizer'.setup()
|
||||
|
||||
set number
|
||||
set gdefault
|
||||
set expandtab
|
||||
set smartcase
|
||||
set splitbelow
|
||||
set splitright
|
||||
set ignorecase
|
||||
set nohlsearch
|
||||
set noshowmode
|
||||
set shiftround
|
||||
set cursorline
|
||||
set nowritebackup
|
||||
|
||||
set mouse=
|
||||
set spelllang=en_us,pl
|
||||
set tabstop=2
|
||||
set scrolloff=5
|
||||
set shortmess-=S
|
||||
set matchpairs+=(:),{:},[:],<:>,':',":"
|
||||
set updatetime=100
|
||||
set shiftwidth=2
|
||||
set showtabline=0
|
||||
set softtabstop=2
|
||||
|
||||
nmap <tab> <C-w>w
|
||||
nmap <Esc><CR> :wq!<CR>
|
||||
nmap <C-p> :Files<CR>
|
||||
nmap <C-a> :Files ~<CR>
|
||||
|
||||
map <leader>b <Esc>:set cc=80,120<CR>
|
||||
map <leader>nb <Esc>:set cc=0<CR>
|
||||
map <leader>n <Esc>:set nonumber!<CR>:GitGutterSignsToggle<CR>
|
||||
map <leader>p <Esc>:set paste!<CR>
|
||||
map <leader>s <Esc>:set spell!<CR>
|
||||
|
||||
set bg=dark
|
||||
set termguicolors
|
||||
colorscheme skyknight
|
||||
|
||||
hi Comment gui=italic
|
||||
hi Normal guibg=NONE
|
||||
hi BadWhitespace guibg=#770000
|
||||
hi ColorColumn guibg=#770000
|
||||
hi DiffChange guibg=#465457
|
||||
hi DiffText guifg=#ff8700 guibg=#465457
|
||||
hi FoldColumn guifg=#465457 guibg=#272822
|
||||
hi GitGutterChange guifg=#bbbb00 guibg=#272822
|
||||
hi LineNr guifg=#465457 guibg=#272822
|
||||
hi NonText guifg=#465457 guibg=NONE
|
||||
hi SignColumn guifg=#465457 guibg=#272822
|
||||
hi Visual guibg=#005577
|
||||
hi SpellBad guibg=#770000
|
||||
|
||||
let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
|
||||
command! -bang -nargs=? -complete=dir Files
|
||||
\ call fzf#vim#files(<q-args>, {'options': ['-e', '--layout=reverse', '--preview', 'bat --color=always --style=plain --theme=Monokai\ Extended\ Bright {}']}, <bang>0)
|
||||
command! -bang -nargs=? -complete=dir Colors
|
||||
\ call fzf#vim#colors({'options': ['-e', '--layout=reverse', '--preview', '']}, <bang>0)
|
||||
|
||||
let g:vim_json_conceal=0
|
||||
let g:markdown_syntax_conceal=0
|
||||
let g:gitgutter_sign_modified = '~'
|
||||
let g:Hexokinase_highlighters = [ 'backgroundfull' ]
|
||||
|
||||
let g:lightline = {
|
||||
\ 'active': {
|
||||
\ 'left': [ [ 'mode', 'paste' ],
|
||||
\ [ 'readonly', 'gitbranch', 'filename' ] ],
|
||||
\ 'right': [ [ 'lineinfo' ],
|
||||
\ [ 'percent' ],
|
||||
\ [ 'filetype' ] ]
|
||||
\ },
|
||||
\ 'component_function': {
|
||||
\ 'readonly': 'LightLineReadonly',
|
||||
\ 'filename': 'LightLineFilename',
|
||||
\ 'gitbranch': 'gitbranch#name'
|
||||
\ }
|
||||
\ }
|
||||
|
||||
function! LightLineReadonly()
|
||||
return &readonly && &filetype !=# 'help' ? '' : ''
|
||||
endfunction
|
||||
|
||||
function! LightLineFilename()
|
||||
let root = fnamemodify(get(b:, 'gitbranch_path'), ':h:h')
|
||||
let path = expand('%:p')
|
||||
if path[:len(root)-1] ==# root
|
||||
return path[len(root)+1:]
|
||||
endif
|
||||
return expand('%')
|
||||
endfunction
|
||||
|
||||
if filereadable(glob('~/.local/config/init.vim'))
|
||||
source ~/.local/config/init.vim
|
||||
endif
|
||||
86
_saved/omp/omp.toml
Normal file
86
_saved/omp/omp.toml
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
'$schema' = 'https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json'
|
||||
final_space = true
|
||||
version = 2
|
||||
|
||||
disable_notice = true
|
||||
auto_upgrade = false
|
||||
|
||||
[[blocks]]
|
||||
type = 'prompt'
|
||||
alignment = 'left'
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'python'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = '15'
|
||||
template = ' {{ .Venv }} '
|
||||
|
||||
[blocks.segments.properties]
|
||||
home_enabled = true
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'session'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground_templates = [
|
||||
"{{ if .Root }}196{{ else }}246{{ end }}"
|
||||
]
|
||||
template = '{{ if or (.SSHSession) (.Root) }}{{ .UserName }}@{{ .HostName }} {{ end }}'
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'path'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = '37'
|
||||
template = '{{ if not .Writable }} {{ end }}{{ $segment := .Segments.Git }}{{ if $segment.Dir }}{{ $segment.RepoName}}{{if ne $segment.RepoName .Path}}{{ trimPrefix $segment.Dir .PWD }}{{ end }}{{ else }}{{ .Path }}{{ end }} '
|
||||
|
||||
[blocks.segments.properties]
|
||||
style = 'full'
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'git'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = '246'
|
||||
template = '{{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} {{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}{{ if gt .StashCount 0 }}≡ {{ end }}'
|
||||
|
||||
[blocks.segments.properties]
|
||||
branch_icon = ' '
|
||||
commit_icon = '@'
|
||||
fetch_status = true
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'text'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground_templates = [
|
||||
'{{ if eq .Code 0 }}76{{ else }}196{{ end }}'
|
||||
]
|
||||
template = '❯'
|
||||
|
||||
[transient_prompt]
|
||||
background = 'transparent'
|
||||
foreground_templates = [
|
||||
'{{ if eq .Code 0 }}76{{ else }}196{{ end }}'
|
||||
]
|
||||
template = '❯ '
|
||||
|
||||
[secondary_prompt]
|
||||
background = 'transparent'
|
||||
foreground = '220'
|
||||
template = '❯❯ '
|
||||
|
||||
[[blocks]]
|
||||
type = 'rprompt'
|
||||
overflow = 'hidden'
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'executiontime'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = '220'
|
||||
|
||||
[blocks.segments.properties]
|
||||
style = 'round'
|
||||
threshold = 3000
|
||||
70
_saved/starship.toml
Normal file
70
_saved/starship.toml
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
add_newline = false
|
||||
|
||||
format="""
|
||||
$python\
|
||||
$username\
|
||||
$hostname\
|
||||
$directory\
|
||||
$git_branch\
|
||||
$git_status\
|
||||
$jobs\
|
||||
$character
|
||||
"""
|
||||
|
||||
right_format="""
|
||||
$cmd_duration
|
||||
"""
|
||||
|
||||
[python]
|
||||
format = '[(${symbol} $virtualenv)]($style) '
|
||||
style = '15'
|
||||
symbol = ''
|
||||
|
||||
[username]
|
||||
format = '[$user]($style)'
|
||||
style_user = 'normal'
|
||||
style_root = 'bold 196'
|
||||
show_always = true
|
||||
|
||||
[hostname]
|
||||
format = '([@$hostname]($style))'
|
||||
style = 'normal'
|
||||
|
||||
[directory]
|
||||
format = '[ ($read_only )]($read_only_style)[$path]($style) '
|
||||
style = '37'
|
||||
read_only_style = '37'
|
||||
read_only = ''
|
||||
truncation_length = 0
|
||||
|
||||
[git_state]
|
||||
format = '\([$state( $progress_current/$progress_total)]($style)\) '
|
||||
style = 'bright-black'
|
||||
|
||||
[git_branch]
|
||||
format = '[$symbol$branch]($style)'
|
||||
style = '246'
|
||||
symbol = ' '
|
||||
|
||||
[git_status]
|
||||
format = '[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed) ]($style)'
|
||||
style = 'green'
|
||||
conflicted = ''
|
||||
untracked = ''
|
||||
modified = ''
|
||||
staged = ''
|
||||
renamed = ''
|
||||
deleted = ''
|
||||
stashed = '≡'
|
||||
|
||||
[jobs]
|
||||
style = '70'
|
||||
symbol = '⇶'
|
||||
|
||||
[character]
|
||||
success_symbol = '[❯](76)'
|
||||
error_symbol = '[❯](196)'
|
||||
|
||||
[cmd_duration]
|
||||
format = '[$duration]($style)'
|
||||
style = '220'
|
||||
Loading…
Add table
Add a link
Reference in a new issue