9 files changed,
83 insertions(+),
106 deletions(-)
M
config/bspwm/bspwmrc
··· 45 45 R kitty desktop='^1' focus=on follow=on 46 46 R Google-chrome desktop='^2' focus=on follow=on 47 47 R Brave desktop='^2' focus=on follow=on 48 -R Code desktop='^3' focus=on follow=on 48 +R Code desktop='^3' focus=on follow=on state=fullscreen 49 49 R Postman desktop='^4' focus=off follow=off 50 50 R Simplenote desktop='^4' focus=off follow=off 51 51 R Zathura desktop='^4' focus=on follow=on state=tiled
M
config/kitty/kitty.conf
··· 3 3 enable_audio_bell no 4 4 open_url_modifiers ctrl 5 5 cursor_blink_interval 0 6 -tab_bar_style powerline 6 +tab_bar_edge bottom 7 +tab_bar_style separator 8 +tab_title_template "{index}: {title}" 7 9 8 -# HotKeys 9 10 map ctrl+equal change_font_size all +2 10 11 map ctrl+minus change_font_size all -2 11 12 map ctrl+backspace change_font_size all 0 12 -map ctrl+1 first_window 13 -map ctrl+2 second_window 14 -map ctrl+3 third_window 15 -map ctrl+4 fourth_window 13 +map ctrl+alt+r load_config_file 14 +map ctrl+1 goto_tab 1 15 +map ctrl+2 goto_tab 2 16 +map ctrl+3 goto_tab 3 17 +map ctrl+4 goto_tab 4 16 18 17 -# Theme 18 19 color0 #232323 19 20 color1 #ff000f 20 21 color2 #8ce10b ··· 36 37 cursor #ff0018 37 38 foreground #fffaf4 38 39 selection_background #fffaf4 39 -
M
config/nvim/README.md
··· 6 6 ``` 7 7 8 8 ## Install plugin manager(`packer`) 9 -```bash 10 -git clone https://github.com/wbthomason/packer.nvim\ 11 - ~/.local/share/nvim/site/pack/packer/start/packer.nvim 12 -``` 13 9 14 10 ## Install LSP servers 15 11 ```bash 16 12 # Go(gopls) 17 13 go get golang.org/x/tools/gopls@latest 18 14 15 +# Efm (linters) 16 +go get github.com/mattn/efm-langserver 17 + 19 18 # Python(pyls) 20 19 pip install python-language-server 21 20 22 21 # JS/TS 23 22 nvim +"LspInstall typescript" 23 + 24 +# Lua 25 +nvim +"LspInstall lua" 24 26 ```
M
config/nvim/init.vim
··· 1 1 call plug#begin('~/.vim/plugged') 2 + " Plug 'Smirnov-O/nten.vim' 3 + Plug 'projekt0n/github-nvim-theme' 4 + Plug 'hoob3rt/lualine.nvim' 5 + Plug 'romgrk/barbar.nvim' 2 6 Plug 'b3nj5m1n/kommentary' 7 + Plug 'jiangmiao/auto-pairs' 3 8 Plug 'nvim-lua/plenary.nvim' 4 - Plug 'kyazdani42/nvim-tree.lua', {'on': 'NvimTreeToggle'} 9 + " Files 5 10 Plug 'junegunn/fzf.vim', {'on': ['Files', 'GFiles']} 6 - " Appereance 7 - Plug 'Smirnov-O/nten.vim' 8 - Plug 'hoob3rt/lualine.nvim' 9 - Plug 'romgrk/barbar.nvim' 10 - " LSP 11 + " Plug 'kyazdani42/nvim-tree.lua', {'on': 'NvimTreeToggle'} 12 + " Syntax 13 + Plug 'sheerun/vim-polyglot' 14 + Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} 15 + " Completion 11 16 Plug 'neovim/nvim-lspconfig' 12 - Plug 'kabouzeid/nvim-lspinstall' 13 17 Plug 'hrsh7th/nvim-compe' 14 - Plug 'jiangmiao/auto-pairs' 18 + Plug 'kabouzeid/nvim-lspinstall' 15 19 " Git 16 - Plug 'TimUntersberger/neogit' 17 20 Plug 'lewis6991/gitsigns.nvim' 18 - " Syntax 19 - Plug 'sheerun/vim-polyglot' 20 - Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} 21 - 22 - " Plug 'mattn/emmet-vim', {'on': 'EmmetInstall'} 23 - " Plug 'norcalli/nvim-colorizer.lua' 21 + " Plug 'TimUntersberger/neogit' 24 22 call plug#end() 25 23 26 -colo codedark 24 +" colo codedark 27 25 let mapleader=";" 28 26 29 27 "== Config ··· 61 59 com! GoFmt :sil !gofmt -w % 62 60 com! Black :sil !black % 63 61 64 -"== Emmet 65 -" let g:user_emmet_mode = 'i' 66 -" let g:user_emmet_expandabbr_key ='<c-j>' 67 -" au FileType html,jst,pug,vue,css,less,scss :EmmetInstall 68 - 69 62 "== Filetypes 70 63 au FileType go setl noet 71 64 au FileType javascript,yaml,json setl et ts=2 sw=2 sts=4 72 65 au FileType python setl et ts=4 sw=4 sts=4 ai 66 +autocmd BufReadPost,FileReadPost lua require "lsp_signature".on_attach() 67 + 73 68 74 69 "== Config's 75 70 lua require'config'
M
config/nvim/lua/config.lua
··· 1 --- LSP servers 2 -require'lspinstall'.setup {} 3 -require'lspconfig'.gopls.setup {} -- Go 4 -require'lspconfig'.pyls.setup {} -- Python 5 -require'lspconfig'.lua.setup {} -- Lua 6 -require'tsserver' -- JS/TS 7 -require'efm' -- Linter's 1 +require"lspinstall".setup {} 2 +require"lspconfig".gopls.setup {} 3 +-- require"lspconfig".pyls.setup {} 4 +-- require"lspconfig".rls.setup {} 5 +-- require"lspconfig".denols.setup {} 6 +require"lspconfig".lua.setup{} 7 +require"tsserver" 8 +require"efm" 9 + 10 +-- Theme 11 +require"github-theme".setup {} 8 12 9 13 -- Compe 10 14 require'compe'.setup { ··· 20 24 21 25 -- LuaLine 22 26 require'lualine'.setup {options={ 23 - theme = "codedark" 27 + theme = "github" 24 28 }} 25 29 26 30 -- GitSigns ··· 41 45 use_internal_diff = true, 42 46 } 43 47 44 --- NeoGit 45 -require'neogit'.setup {} 46 - 47 48 -- NvimTree 48 49 vim.g.nvim_tree_side = "right" 49 -vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "venv", "env"} 50 -vim.g.nvim_tree_auto_close = 0 51 -vim.g.nvim_tree_quit_on_open = 0 50 +vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "env"} 51 +-- vim.g.nvim_tree_auto_close = 0 52 52 vim.g.nvim_tree_width = 24 53 53 54 + 54 55 -- TreeSitter 55 56 require'nvim-treesitter.configs'.setup { 56 - ensure_installed = {'javascript', 'typescript', 'jsdoc', 'python', 'go'}; 57 + ensure_installed = {'javascript', 'typescript', 'jsdoc', 'python', 'go', 'bash'}; 57 58 highlight = {enable=true}; 58 59 } 59 - 60 --- Colorizer 61 -require'colorizer'.setup({'*';}, { 62 - mode = 'background'; 63 - RGB = true; 64 - RRGGBB = true; 65 - RRGGBBAA = false; 66 - rgb_fn = true; 67 - hsl_fn = false; 68 - css = false; 69 - css_fn = true; 70 - names = false; 71 -})
M
config/nvim/lua/tsserver.lua
··· 1 +local root_pattern = require("lspconfig/util").root_pattern 2 + 1 3 require('lspconfig').typescript.setup({ 2 - handlers = { 3 - ["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _, config) 4 - if params.diagnostics ~= nil then 5 - local idx = 1 6 - while idx <= #params.diagnostics do 7 - if params.diagnostics[idx].code == 80001 then 8 - table.remove(params.diagnostics, idx) 9 - else 10 - idx = idx + 1 11 - end 12 - end 13 - end 14 - vim.lsp.diagnostics.on_publish_diagnostics(_, _, params, client_id, _, config) 15 - end, 16 - }, 4 + handlers = { 5 + ["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _, config) 6 + if params.diagnostics ~= nil then 7 + local idx = 1 8 + while idx <= #params.diagnostics do 9 + if params.diagnostics[idx].code == 80001 then 10 + table.remove(params.diagnostics, idx) 11 + else 12 + idx = idx + 1 13 + end 14 + end 15 + end 16 + vim.lsp.diagnostic.on_publish_diagnostics(_, _, params, client_id, _, config) 17 + end, 18 + }, 19 + filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" }; 20 + root_dir = root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"); 17 21 })
M
config/nvim/vimscript/mappings.vim
··· 1 -ino jk <esc> 2 1 nno <C-s> :w<cr> 3 2 nno <C-p> :GFiles<cr> 4 -nno <space> :noh<cr> 5 -nno <leader>t :Term<cr> 6 -nno <leader>e :NvimTreeToggle<cr> 3 +nno <C-n> :enew<cr> 7 4 nno <leader>; :Files<cr> 8 -nno <leader>g :Neogit<cr> 5 +" nno <leader>e :NvimTreeToggle<cr> 6 +nno <space> :noh<cr> 9 7 10 8 " Buffer 11 9 nno <leader>j :bn<cr> ··· 37 35 nno sph :sp<cr> 38 36 nno spk :winc K<cr> 39 37 nno spl :winc L<cr> 40 - 41 -" Terminal 42 -tno <esc> <c-\><c-n> 43 -tno <C-h> <c-\><cmd>winc h<cr> 44 -tno <C-j> <c-\><cmd>winc j<cr> 45 -tno <C-k> <c-\><cmd>winc k<cr> 46 -tno <C-l> <c-\><cmd>winc k<cr>
M
vscode/settings.json
··· 1 1 { 2 2 "update.showReleaseNotes": false, 3 - "window.menuBarVisibility": "hidden", 3 + "window.menuBarVisibility": "toggle", 4 4 "workbench.iconTheme": "material-icon-theme", 5 - 5 + "workbench.colorTheme": "GitHub Dark", 6 6 "workbench.sideBar.location": "right", 7 7 "workbench.editor.untitled.hint": "hidden", 8 8 "workbench.startupEditor": "none", 9 - 9 + "workbench.panel.defaultLocation": "left", 10 + "workbench.activityBar.visible": false, 10 11 "explorer.compactFolders": false, 11 12 "explorer.confirmDragAndDrop": false, 12 13 "explorer.confirmDelete": false, 13 - 14 14 // "editor.cursorSmoothCaretAnimation": true, 15 15 "editor.fontFamily": "'Jetbrains Mono', monospace", 16 - "editor.hover.enabled": false, 17 - // "editor.lightbulb.enabled""cSpell.userWords": ["postgres"]: false, 16 + "editor.hover.enabled": true, 18 17 "editor.minimap.enabled": false, 18 + "editor.suggestSelection": "first", 19 19 "editor.smoothScrolling": true, 20 20 "editor.mouseWheelZoom": true, 21 21 "editor.formatOnPaste": false, ··· 24 24 "editor.wordWrap": "off", 25 25 "editor.fontSize": 14, 26 26 "editor.tabSize": 4, 27 - 28 27 "files.insertFinalNewline": true, 29 28 "files.trimFinalNewlines": true, 30 29 "files.trimTrailingWhitespace": true, 31 30 "search.quickOpen.includeHistory": false, 32 - 33 31 "gitlens.codeLens.enabled": true, 34 32 "git.autofetch": true, 35 33 "git.confirmSync": false, 36 34 "git.enableSmartCommit": true, 37 - 38 - "cSpell.userWords": ["postgres"], 39 35 "extensions.ignoreRecommendations": true, 40 36 "docker.showStartPage": false, 41 37 "prettier.semi": false, 42 38 "javascript.suggestionActions.enabled": false, 43 39 "typescript.suggestionActions.enabled": false, 44 - 45 40 "files.exclude": { 46 41 "**/.cache": true, 47 - "**/node_modules": true 42 + "**/node_modules": true, 43 + "**/env": true 48 44 }, 49 - 50 - "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", 51 - 52 45 "[javascript]": { 53 46 "editor.defaultFormatter": "esbenp.prettier-vscode", 54 47 "editor.tabSize": 2 55 48 }, 56 - "editor.suggestSelection": "first", 57 - "cSpell.enabled": false 49 + "vim.useSystemClipboard": true, 50 + "editor.inlineSuggest.enabled": true, 58 51 }
M
zshrc
··· 27 27 if [[ -f "/bin/exa" ]]; then 28 28 alias ls="exa -l" la="ls -a" 29 29 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"