6 files changed,
33 insertions(+),
43 deletions(-)
M
config/kitty/kitty.conf
··· 5 5 cursor_blink_interval 0 6 6 tab_bar_edge bottom 7 7 tab_bar_style separator 8 +tab_separator "" 8 9 tab_title_template "{index}: {title}" 9 10 10 11 map ctrl+equal change_font_size all +2 ··· 32 33 color13 #9a5feb 33 34 color14 #67fff0 34 35 color15 #ffffff 35 -background #0e1019 36 +# background #0e1019 37 +background #1e1e1e 36 38 selection_foreground #0e1019 37 39 cursor #ff0018 38 40 foreground #fffaf4
M
config/nvim/README.md
··· 2 2 3 3 ## Install nvim 4 4 ```bash 5 +# From AUR 5 6 yay -S neovim-nightly-bin 7 + 8 +# From pacman 9 +sudo pacman -S neovim 6 10 ``` 7 11 8 -## Install plugin manager(`packer`) 12 +## Install plugin manager(`vim-plug`) 13 +```bash 14 +sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' 15 +``` 9 16 10 17 ## Install LSP servers 11 18 ```bash
M
config/nvim/init.vim
··· 1 1 call plug#begin('~/.vim/plugged') 2 - " Plug 'Smirnov-O/nten.vim' 3 - Plug 'projekt0n/github-nvim-theme' 2 + Plug 'Smirnov-O/nten.vim' 4 3 Plug 'hoob3rt/lualine.nvim' 5 4 Plug 'romgrk/barbar.nvim' 6 5 Plug 'b3nj5m1n/kommentary' 7 6 Plug 'jiangmiao/auto-pairs' 8 7 Plug 'nvim-lua/plenary.nvim' 8 + Plug 'lewis6991/gitsigns.nvim' 9 + " LSP 10 + Plug 'hrsh7th/nvim-compe' 11 + Plug 'neovim/nvim-lspconfig' 12 + Plug 'kabouzeid/nvim-lspinstall' 9 13 " Files 10 14 Plug 'junegunn/fzf.vim', {'on': ['Files', 'GFiles']} 11 - " Plug 'kyazdani42/nvim-tree.lua', {'on': 'NvimTreeToggle'} 12 15 " Syntax 13 - Plug 'sheerun/vim-polyglot' 14 16 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} 15 - " Completion 16 - Plug 'neovim/nvim-lspconfig' 17 - Plug 'hrsh7th/nvim-compe' 18 - Plug 'kabouzeid/nvim-lspinstall' 19 - " Git 20 - Plug 'lewis6991/gitsigns.nvim' 21 - " Plug 'TimUntersberger/neogit' 17 + Plug 'sheerun/vim-polyglot' 22 18 call plug#end() 23 19 24 -" colo codedark 20 +colo codedark 25 21 let mapleader=";" 26 22 27 23 "== Config ··· 54 50 set sta et ai 55 51 56 52 "== Custom commands 57 -com! Prettier :sil !prettier -w % 53 +com! Prettier :sil !prettier --no-semi -w % 58 54 com! Term :vs|winc L|se nonu nornu|start|term 59 55 com! GoFmt :sil !gofmt -w % 60 56 com! Black :sil !black % ··· 65 61 au FileType python setl et ts=4 sw=4 sts=4 ai 66 62 autocmd BufReadPost,FileReadPost lua require "lsp_signature".on_attach() 67 63 68 - 69 64 "== Config's 70 -lua require'config' 65 +lua require"config" 71 66 so $HOME/.config/nvim/vimscript/barbar.vim 72 67 so $HOME/.config/nvim/vimscript/mappings.vim
M
config/nvim/lua/config.lua
··· 3 3 -- require"lspconfig".pyls.setup {} 4 4 -- require"lspconfig".rls.setup {} 5 5 -- require"lspconfig".denols.setup {} 6 -require"lspconfig".lua.setup{} 6 +-- require"lspconfig".lua.setup{} 7 7 require"tsserver" 8 8 require"efm" 9 - 10 --- Theme 11 -require"github-theme".setup {} 12 9 13 10 -- Compe 14 11 require'compe'.setup { ··· 24 21 25 22 -- LuaLine 26 23 require'lualine'.setup {options={ 27 - theme = "github" 24 + theme = "codedark" 28 25 }} 29 26 30 27 -- GitSigns ··· 45 42 use_internal_diff = true, 46 43 } 47 44 48 --- NvimTree 49 -vim.g.nvim_tree_side = "right" 50 -vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "env"} 51 --- vim.g.nvim_tree_auto_close = 0 52 -vim.g.nvim_tree_width = 24 53 - 54 - 55 45 -- TreeSitter 56 46 require'nvim-treesitter.configs'.setup { 57 47 ensure_installed = {'javascript', 'typescript', 'jsdoc', 'python', 'go', 'bash'}; 58 - highlight = {enable=true}; 48 + highlight = { 49 + enable=true 50 + }; 59 51 }
M
config/nvim/vimscript/mappings.vim
··· 2 2 nno <C-p> :GFiles<cr> 3 3 nno <C-n> :enew<cr> 4 4 nno <leader>; :Files<cr> 5 -" nno <leader>e :NvimTreeToggle<cr> 6 5 nno <space> :noh<cr> 7 6 8 7 " Buffer ··· 24 23 nno <C-h> :winc h<cr> 25 24 nno <C-j> :winc j<cr> 26 25 nno <C-k> :winc k<cr> 27 -nno <C-l> :winc l<cr> 26 +nno<C-l> :winc l<cr> 28 27 29 28 nno <A-h> :vert res +3<cr> 30 29 nno <A-j> :res -3<cr> 31 30 nno <A-k> :res +3<cr> 32 31 nno <A-l> :vert res -3<cr> 33 32 34 -nno spv :vs<cr> 35 -nno sph :sp<cr> 33 +nno spv :vnew<cr> 34 +nno sph :new<cr> 36 35 nno spk :winc K<cr> 37 36 nno spl :winc L<cr>
M
zshrc
··· 1 1 ## StartShip 2 -#eval "$(starship init zsh)" 2 +# eval "$(starship init zsh)" 3 3 4 4 ## Variables 5 5 export GOPATH="$HOME/go" 6 -export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$PATH" 6 +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$PATH" 7 7 export EDITOR="nvim" 8 8 9 9 ## FzF 10 10 export FZF_DEFAULT_COMMAND="fd -t f -t l -E node_modules -E env -E __pycache__" 11 11 12 12 ## Oh my zsh 13 -plugins=(dotenv) 13 +plugins=(dotenv yarn node) 14 14 ZSH_THEME="simple" 15 15 source "$HOME/.oh-my-zsh/oh-my-zsh.sh" 16 16 ··· 20 20 ## Aliases 21 21 alias cls="clear" cp="cp -r" mkdir="mkdir -p" 22 22 alias vim="nvim" vi="vim" e="$EDITOR" 23 -alias ...="cd ../.." .3="cd ../../.." .4="cd ../../../.." 23 +alias ...="cd ../.." .3="cd ../../.." 24 24 alias gor="go run" gob="go build" gog="go get" goi="go install" 25 -alias pac="sudo pacman" pacs="pac -S" pacr="pac -R" pacss="pac -Ss" 26 25 27 26 if [[ -f "/bin/exa" ]]; then 28 27 alias ls="exa -l" la="ls -a" 29 28 fi 30 - 31 -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! 32 -export SDKMAN_DIR="/home/sasha/.sdkman" 33 -[[ -s "/home/sasha/.sdkman/bin/sdkman-init.sh" ]] && source "/home/sasha/.sdkman/bin/sdkman-init.sh"