From 139614b7f380db7e1d614646e1a8ca4af2185b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Sat, 11 Jun 2022 09:33:19 -0500 Subject: [PATCH 01/46] feat: add ghci prompt --- .ghc/ghci.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ghc/ghci.conf diff --git a/.ghc/ghci.conf b/.ghc/ghci.conf new file mode 100644 index 0000000..c5d58f2 --- /dev/null +++ b/.ghc/ghci.conf @@ -0,0 +1 @@ +:set prompt "λ: " From a18a07195e929709861a9c1e62d3bc6fc60ddf46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Sat, 11 Jun 2022 09:34:24 -0500 Subject: [PATCH 02/46] feat: improve dotfiles feat: add BufOnly function to vimrc feat: add copilot and coc improvements to plugins feat: add yarn aliases to zsh --- .vim/plugins.vim | 12 ++++++++++++ .vimrc | 1 + .zsh_aliases | 2 ++ 3 files changed, 15 insertions(+) diff --git a/.vim/plugins.vim b/.vim/plugins.vim index b6f775b..8790798 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -52,6 +52,8 @@ Plug 'lervag/vimtex' " Themes Plug 'rafi/awesome-vim-colorschemes' + +Plug 'github/copilot.vim' cal plug#end() @@ -200,6 +202,16 @@ nn f :cal CocActionAsync('format') ino coc#refresh() nn u :CocAction +nn K :call ShowDocumentation() + +fun! ShowDocumentation() + if CocAction('hasProvider', 'hover') + call CocActionAsync('doHover') + el + call feedkeys('K', 'in') + en +endfun + let g:coc_sources_disable_map = { \ 'python': ['tag'] \ } diff --git a/.vimrc b/.vimrc index 7230b83..5f47602 100644 --- a/.vimrc +++ b/.vimrc @@ -96,5 +96,6 @@ so $HOME/.vim/functions.vim " Has initial background function nnoremap :set spell! inoremap :set spell! tnoremap +command! BufOnly silent! execute "%bd|e#|bd#" cal InitialBackground("10:00", "19:00") diff --git a/.zsh_aliases b/.zsh_aliases index 9139438..8db2e71 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -47,6 +47,8 @@ alias sym="bin/console" alias ypr="yarn prod" alias yw="yarn watch" alias yyw="yarn && yarn watch" +alias yyd="yarn && yarn dev" +alias yd="yarn dev" alias bserve="browser-sync start -s -f . --no-notify\ --host $(hostname -i | cut -d' ' -f1)" From 625cb6f7736313a7b707fa13422cb8c605d3bb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 29 Jun 2022 22:35:07 -0500 Subject: [PATCH 03/46] feat: update vim and coc settings --- .config/coc/extensions/package.json | 9 ++++++--- .config/khotkeysrc | 2 +- .config/nvim/coc-settings.json | 8 +++++--- .vim/ftplugin/php.vim | 1 + .vim/plugins.vim | 4 +++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index 1e922c7..c3b89fc 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -1,10 +1,13 @@ { "dependencies": { + "@yaegassy/coc-volar": ">=0.18.1", + "@yaegassy/coc-volar-tools": ">=0.1.2", "coc-css": ">=1.3.0", - "coc-json": ">=1.4.1", + "coc-json": ">=1.4.2", "coc-phpactor": ">=1.0.3", "coc-phpls": ">=2.2.2", - "coc-snippets": ">=3.0.8", - "coc-tsserver": ">=1.9.16" + "coc-pyls": ">=1.0.6", + "coc-snippets": ">=3.0.14", + "coc-tsserver": ">=1.10.5" } } \ No newline at end of file diff --git a/.config/khotkeysrc b/.config/khotkeysrc index 6e4a736..c172154 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1,5 +1,5 @@ [$Version] -update_info=spectacle_shortcuts.upd:spectacle-migrate-shortcuts +update_info=spectacle_shortcuts.upd:spectacle-migrate-shortcuts,konsole_globalaccel.upd:konsole_globalaccel [ColorEffects:Disabled] ChangeSelectionColor[$d] diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 036f40b..08f7b5e 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -1,7 +1,7 @@ { - "diagnostic.virtualText": true, + "diagnostic.virtualText": false, "diagnostic.virtualTextCurrentLineOnly": true, - "diagnostic.enable": false, + "diagnostic.enable": true, "phpls.path": "/home/hali/Documents/Playground/Php/Intelephense", "phpls.enable": true, "intelephense.files.exclude": [ @@ -25,5 +25,7 @@ "excludeDirectories": ["node_modules", "vendor"] }, "phpactor.enable": true, - "phpactor.path": "/home/hali/.config/composer/vendor/bin/phpactor" + "phpactor.path": "/home/hali/.config/composer/vendor/bin/phpactor", + "prettier.disableLanguages": ["vue"], + "svelte.enable-ts-plugin": true } diff --git a/.vim/ftplugin/php.vim b/.vim/ftplugin/php.vim index 09355fb..5368ebf 100644 --- a/.vim/ftplugin/php.vim +++ b/.vim/ftplugin/php.vim @@ -5,5 +5,6 @@ setl softtabstop=4 setl commentstring=//\ %s nn :cal CocActionAsync('format') +nn f :cal CocActionAsync('format') " let @x="\n\n /* |----------------| */\n /* | Business logic | */\n /* |----------------| */" diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 8790798..92bdefe 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -33,6 +33,8 @@ Plug 'vim-airline/vim-airline' " Git Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-rhubarb' +Plug 'shumphrey/fugitive-gitlab.vim' Plug 'mhinz/vim-signify' Plug 'junegunn/gv.vim' @@ -53,7 +55,7 @@ Plug 'lervag/vimtex' " Themes Plug 'rafi/awesome-vim-colorschemes' -Plug 'github/copilot.vim' +" Plug 'github/copilot.vim' cal plug#end() From 357b5289f6a7f33f89007674a40c75f484d7a421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 28 Sep 2022 17:39:39 -0500 Subject: [PATCH 04/46] feat: update stuff --- .config/coc/extensions/package.json | 13 +++++++++---- .config/khotkeysrc | 3 ++- .config/konsolerc | 9 ++++++++- .config/xsettingsd/xsettingsd.conf | 2 +- .gitconfig | 2 ++ .vim/ftplugin/markdown.vim | 6 ++++-- .vim/plugins.vim | 16 ++++++++++------ .zshrc | 5 +++++ 8 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index c3b89fc..a0a391c 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -1,13 +1,18 @@ { "dependencies": { - "@yaegassy/coc-volar": ">=0.18.1", - "@yaegassy/coc-volar-tools": ">=0.1.2", + "@yaegassy/coc-volar": ">=0.21.5", + "@yaegassy/coc-volar-tools": ">=0.1.4", "coc-css": ">=1.3.0", "coc-json": ">=1.4.2", "coc-phpactor": ">=1.0.3", "coc-phpls": ">=2.2.2", "coc-pyls": ">=1.0.6", "coc-snippets": ">=3.0.14", - "coc-tsserver": ">=1.10.5" - } + "coc-svelte": ">=0.4.2", + "coc-tsserver": ">=1.10.5", + "coc-vue": ">=0.8.1" + }, + "disabled": [], + "locked": [], + "lastUpdate": 1664051793053 } \ No newline at end of file diff --git a/.config/khotkeysrc b/.config/khotkeysrc index c172154..1f58c07 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1053,7 +1053,7 @@ Comment=Simple_action TriggersCount=1 [Data_4_1Triggers0] -Key=Meta+D +Key=Meta+Space Type=SHORTCUT Uuid={6ca13963-abb1-4065-8570-a0f1b796df83} @@ -1265,6 +1265,7 @@ Show Speedbar[$d] Show hidden files[$d] Sort by[$d] Sort directories first[$d] +Sort hidden files last[$d] Sort reversed[$d] Speedbar Width[$d] View Style[$d] diff --git a/.config/konsolerc b/.config/konsolerc index 35968de..81e0b55 100644 --- a/.config/konsolerc +++ b/.config/konsolerc @@ -15,6 +15,9 @@ Favorites=Yakuake.profile,Gifs.profile,Yakuake-Day.profile scrollbackUseCacheLocation=true scrollbackUseSystemLocation=false +[General] +ConfigVersion=1 + [KFileDialog Settings] listViewIconSize=0 @@ -23,6 +26,10 @@ ShowMenuBarByDefault=false UseSingleInstance=true [MainWindow] +HDMI-1 eDP-1 Height 1920x1080=740 +HDMI-1 eDP-1 Width 1920x1080=1366 +HDMI-1 eDP-1 XPosition 1920x1080=1643 +HDMI-1 eDP-1 YPosition 1920x1080=168 Height 1080=1051 Height 720=711 Height 768=740 @@ -48,4 +55,4 @@ eDP-1 XPosition 1366x768=0 eDP-1 YPosition 1366x768=50 [UiSettings] -ColorScheme=Default +ColorScheme= diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index 2fe5ec9..babfc48 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -7,5 +7,5 @@ Gtk/ButtonImages 1 Gtk/CursorThemeSize 24 Gtk/CursorThemeName "Breeze_Obsidian" Net/IconThemeName "Papirus-Dark" -Gtk/FontName "Montserrat, 10" +Gtk/FontName "IBM Plex Sans, 10" diff --git a/.gitconfig b/.gitconfig index 5b9f747..5c69914 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,3 +16,5 @@ helper = /usr/lib/git-core/git-credential-libsecret [commit] gpgSign = true +[push] + autoSetupRemote = true diff --git a/.vim/ftplugin/markdown.vim b/.vim/ftplugin/markdown.vim index fec722b..391ce61 100644 --- a/.vim/ftplugin/markdown.vim +++ b/.vim/ftplugin/markdown.vim @@ -1,5 +1,7 @@ -se cfu=emoji#complete -se et +setl cfu=emoji#complete +setl et +setl wrap +setl tw=0 nn f :Prettier nn c :!pandoc --wrap=preserve -s -o %:r.pdf % diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 92bdefe..2a76b81 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -16,6 +16,7 @@ Plug 'neoclide/coc.nvim', { 'branch': 'release' } Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' +Plug 'rajasegar/vim-astro', { 'branch': 'main' } if has('nvim') Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' } @@ -54,6 +55,9 @@ Plug 'lervag/vimtex' " Themes Plug 'rafi/awesome-vim-colorschemes' +Plug 'artanikin/vim-synthwave84' + +Plug 'phpactor/phpactor', { 'for': 'php', 'tag': '*', 'do': 'composer install --no-dev -o' } " Plug 'github/copilot.vim' cal plug#end() @@ -207,11 +211,11 @@ nn u :CocAction nn K :call ShowDocumentation() fun! ShowDocumentation() - if CocAction('hasProvider', 'hover') - call CocActionAsync('doHover') - el - call feedkeys('K', 'in') - en + if CocAction('hasProvider', 'hover') + call CocActionAsync('doHover') + el + call feedkeys('K', 'in') + en endfun let g:coc_sources_disable_map = { @@ -302,4 +306,4 @@ if has('nvim') nn :Denite buffer file/rec endif -colo gruvbox +colo synthwave84 diff --git a/.zshrc b/.zshrc index 2d6fde4..b0deaa9 100644 --- a/.zshrc +++ b/.zshrc @@ -132,3 +132,8 @@ bindkey "^e" edit-command-line stty -ixon source /usr/share/nvm/init-nvm.sh + +# pnpm +export PNPM_HOME="$HOME/.local/share/pnpm" +export PATH="$PNPM_HOME:$PATH" +# pnpm end From 82ac8252d489eb71c0ac63116642cfa8a6ee580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 9 Nov 2022 19:31:10 -0600 Subject: [PATCH 05/46] feat: move to nvim-lsp --- .config/coc/extensions/package.json | 2 +- .config/khotkeysrc | 6 ++- .config/nvim/init.vim | 5 -- .vim/ftplugin/vue.vim | 2 +- .vim/plugins.vim | 71 ++++++++--------------------- .vimrc | 1 + 6 files changed, 26 insertions(+), 61 deletions(-) delete mode 100644 .config/nvim/init.vim diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index a0a391c..bef6d3c 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -14,5 +14,5 @@ }, "disabled": [], "locked": [], - "lastUpdate": 1664051793053 + "lastUpdate": 1664650153382 } \ No newline at end of file diff --git a/.config/khotkeysrc b/.config/khotkeysrc index 1f58c07..fbb56de 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1119,7 +1119,7 @@ Type=SIMPLE_ACTION_DATA ActionsCount=1 [Data_4_4Actions0] -CommandURL=firefox +CommandURL=firefox-developer-edition Type=COMMAND_URL [Data_4_4Conditions] @@ -1270,6 +1270,10 @@ Sort reversed[$d] Speedbar Width[$d] View Style[$d] +[KScreen] +ScaleFactor[$d] +ScreenScaleFactors[$d] + [Main] AlreadyImported=defaults,kde32b1,konqueror_gestures_kde321,konsole Disabled=false diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index a80c0d0..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,5 +0,0 @@ -set runtimepath^=~/.vim runtimepath+=~/.vim/after -let &packpath=&runtimepath -source ~/.vimrc - -set guicursor=a:hor50-Cursor-blinkwait175-blinkoff150-blinkon175 diff --git a/.vim/ftplugin/vue.vim b/.vim/ftplugin/vue.vim index 3797490..2ee2bb1 100644 --- a/.vim/ftplugin/vue.vim +++ b/.vim/ftplugin/vue.vim @@ -1,3 +1,3 @@ se sw=2 se ts=2 -nn f :Prettier +" nn f :Prettier diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 2a76b81..65b62cf 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -12,7 +12,6 @@ Plug 'vim-test/vim-test' Plug 'dhruvasagar/vim-table-mode' Plug 'bronson/vim-visual-star-search' Plug 'sheerun/vim-polyglot' -Plug 'neoclide/coc.nvim', { 'branch': 'release' } Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' @@ -20,6 +19,11 @@ Plug 'rajasegar/vim-astro', { 'branch': 'main' } if has('nvim') Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' } + Plug 'neovim/nvim-lspconfig' + Plug 'hrsh7th/nvim-cmp' + Plug 'williamboman/mason.nvim' + Plug 'quangnguyen30192/cmp-nvim-ultisnips' + Plug 'mhartington/formatter.nvim' else Plug 'Shougo/denite.nvim' Plug 'roxma/nvim-yarp' @@ -40,6 +44,7 @@ Plug 'mhinz/vim-signify' Plug 'junegunn/gv.vim' " Snippets +Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' " Frontend @@ -57,9 +62,8 @@ Plug 'lervag/vimtex' Plug 'rafi/awesome-vim-colorschemes' Plug 'artanikin/vim-synthwave84' +" PHP Plug 'phpactor/phpactor', { 'for': 'php', 'tag': '*', 'do': 'composer install --no-dev -o' } - -" Plug 'github/copilot.vim' cal plug#end() @@ -171,56 +175,15 @@ nn t :TestVisit " | LSP | " |-----| -nn vd :lua vim.lsp.buf.definition() -nn vi :lua vim.lsp.buf.implementation() -nn vsh :lua vim.lsp.buf.signature_help() -nn vrr :lua vim.lsp.buf.references() -nn vrn :lua vim.lsp.buf.rename() -nn vh :lua vim.lsp.buf.hover() -nn vca :lua vim.lsp.buf.code_action() -nn vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics() -nn vn :lua vim.lsp.diagnostic.goto_next() - - -" |-----| -" | Coc | -" |-----| - -ino pumvisible() ? "\" : "\" -ino pumvisible() ? "\" : "\" - -ino pumvisible() ? coc#_select_confirm() : "\" -ino pumvisible() ? coc#_select_confirm() : "\" - -let g:coc_suggest_disable = 1 -let g:coc_snippet_next = '' -let g:coc_snippet_prev = '' - -nm gd (coc-definition) -nm gy (coc-type-definition) -nm gi (coc-implementation) -nm gr (coc-references) -nm grc (coc-rename-current) -nm gf (coc-fix-current) -com! -nargs=0 Format :cal CocActionAsync('format') -nn es :CocCommand snippets.editSnippets -nn f :cal CocActionAsync('format') -ino coc#refresh() -nn u :CocAction - -nn K :call ShowDocumentation() - -fun! ShowDocumentation() - if CocAction('hasProvider', 'hover') - call CocActionAsync('doHover') - el - call feedkeys('K', 'in') - en -endfun - -let g:coc_sources_disable_map = { - \ 'python': ['tag'] - \ } +" nn vd :lua vim.lsp.buf.definition() +" nn vi :lua vim.lsp.buf.implementation() +" nn vsh :lua vim.lsp.buf.signature_help() +" nn vrr :lua vim.lsp.buf.references() +" nn vrn :lua vim.lsp.buf.rename() +" nn vh :lua vim.lsp.buf.hover() +" nn vca :lua vim.lsp.buf.code_action() +" nn vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics() +" nn vn :lua vim.lsp.diagnostic.goto_next() " |------| @@ -306,4 +269,6 @@ if has('nvim') nn :Denite buffer file/rec endif +nn f :Format + colo synthwave84 diff --git a/.vimrc b/.vimrc index 5f47602..55f07cf 100644 --- a/.vimrc +++ b/.vimrc @@ -70,6 +70,7 @@ vn p "+p vn J :m '>+1gv=gv vn K :m '<-2gv=gv +ino ino `<< « ino `>> » ino From fb3bf35ed2decff3aeeb3692ad0e8e0fd69831f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Fri, 2 Dec 2022 21:07:34 -0600 Subject: [PATCH 06/46] feat: update plugins --- .vim/ftplugin/html.vim | 2 +- .vim/ftplugin/json.vim | 2 +- .vim/ftplugin/php.vim | 4 ++-- .vim/plugins.vim | 20 ++++++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.vim/ftplugin/html.vim b/.vim/ftplugin/html.vim index 7992b6f..ba6e5cb 100644 --- a/.vim/ftplugin/html.vim +++ b/.vim/ftplugin/html.vim @@ -1 +1 @@ -nn :Prettier +" nn :Prettier diff --git a/.vim/ftplugin/json.vim b/.vim/ftplugin/json.vim index ba76084..9df4fe3 100644 --- a/.vim/ftplugin/json.vim +++ b/.vim/ftplugin/json.vim @@ -1 +1 @@ -nn f :Prettier +" nn f :Prettier diff --git a/.vim/ftplugin/php.vim b/.vim/ftplugin/php.vim index 5368ebf..68869f4 100644 --- a/.vim/ftplugin/php.vim +++ b/.vim/ftplugin/php.vim @@ -4,7 +4,7 @@ setl tabstop=4 setl softtabstop=4 setl commentstring=//\ %s -nn :cal CocActionAsync('format') -nn f :cal CocActionAsync('format') +" nn :cal CocActionAsync('format') +" nn f :cal CocActionAsync('format') " let @x="\n\n /* |----------------| */\n /* | Business logic | */\n /* |----------------| */" diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 65b62cf..8b2e543 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -15,15 +15,21 @@ Plug 'sheerun/vim-polyglot' Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' -Plug 'rajasegar/vim-astro', { 'branch': 'main' } +" Plug 'rajasegar/vim-astro', { 'branch': 'main' } if has('nvim') Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' } Plug 'neovim/nvim-lspconfig' - Plug 'hrsh7th/nvim-cmp' Plug 'williamboman/mason.nvim' + Plug 'hrsh7th/cmp-nvim-lsp' + Plug 'hrsh7th/cmp-buffer' + Plug 'hrsh7th/cmp-path' + Plug 'hrsh7th/cmp-cmdline' + Plug 'hrsh7th/nvim-cmp' + Plug 'SirVer/ultisnips' Plug 'quangnguyen30192/cmp-nvim-ultisnips' - Plug 'mhartington/formatter.nvim' + Plug 'nvim-lua/plenary.nvim' + Plug 'jose-elias-alvarez/null-ls.nvim' else Plug 'Shougo/denite.nvim' Plug 'roxma/nvim-yarp' @@ -44,8 +50,8 @@ Plug 'mhinz/vim-signify' Plug 'junegunn/gv.vim' " Snippets -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' +" Plug 'SirVer/ultisnips' +" Plug 'honza/vim-snippets' " Frontend Plug 'mattn/emmet-vim' @@ -63,7 +69,7 @@ Plug 'rafi/awesome-vim-colorschemes' Plug 'artanikin/vim-synthwave84' " PHP -Plug 'phpactor/phpactor', { 'for': 'php', 'tag': '*', 'do': 'composer install --no-dev -o' } +" Plug 'phpactor/phpactor', { 'for': 'php', 'tag': '*', 'do': 'composer install --no-dev -o' } cal plug#end() @@ -269,6 +275,4 @@ if has('nvim') nn :Denite buffer file/rec endif -nn f :Format - colo synthwave84 From a1c289b472e243fe9664ec052830e6f0d26a5787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Fri, 2 Dec 2022 21:25:47 -0600 Subject: [PATCH 07/46] feat: merge main --- .config/coc/extensions/package.json | 2 +- .config/khotkeysrc | 4 +++- .config/xsettingsd/xsettingsd.conf | 8 ++++---- .zsh_aliases | 3 --- .zshrc | 1 + 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index bef6d3c..0cf85bc 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -15,4 +15,4 @@ "disabled": [], "locked": [], "lastUpdate": 1664650153382 -} \ No newline at end of file + diff --git a/.config/khotkeysrc b/.config/khotkeysrc index fbb56de..1ee891f 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1197,7 +1197,7 @@ Type=SIMPLE_ACTION_DATA ActionsCount=1 [Data_4_7Actions0] -CommandURL=/opt/Telegram/Telegram +CommandURL=telegram-desktop Type=COMMAND_URL [Data_4_7Conditions] @@ -1224,8 +1224,10 @@ ColorScheme[$d] ColorSchemeHash[$d] TerminalApplication[$d] TerminalService[$d] +UseSystemBell[$d] XftHintStyle[$d] XftSubPixel[$d] +accentColorFromWallpaper[$d] fixed[$d] font[$d] menuFont[$d] diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index babfc48..457a4a3 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -1,11 +1,11 @@ Gtk/EnableAnimations 1 -Gtk/DecorationLayout "close,minimize,maximize:icon" +Gtk/DecorationLayout "icon:minimize,maximize,close" Gtk/PrimaryButtonWarpsSlider 0 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 Gtk/ButtonImages 1 Gtk/CursorThemeSize 24 -Gtk/CursorThemeName "Breeze_Obsidian" -Net/IconThemeName "Papirus-Dark" -Gtk/FontName "IBM Plex Sans, 10" +Gtk/CursorThemeName "breeze_cursors" +Net/IconThemeName "ePapirus-Dark" +Gtk/FontName "Montserrat, 10" diff --git a/.zsh_aliases b/.zsh_aliases index 8db2e71..5ef1560 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -50,7 +50,4 @@ alias yyw="yarn && yarn watch" alias yyd="yarn && yarn dev" alias yd="yarn dev" -alias bserve="browser-sync start -s -f . --no-notify\ - --host $(hostname -i | cut -d' ' -f1)" - alias phpunit="./vendor/bin/phpunit" diff --git a/.zshrc b/.zshrc index b0deaa9..3d51ef2 100644 --- a/.zshrc +++ b/.zshrc @@ -57,6 +57,7 @@ else fi _CurrentDirFile="$HOME/.currentDirs/$_DirNum" +mkdir "$HOME/.currentDirs" > /dev/null 2>&1 unset _Tp _Tn _DirNum if [ $_Tx = "alacritty" ] || [ $_Tx = "konsole" ]; then alias cd=changeDir; From 2022e056bc1cc665c1073451d5bfc51ad13ce74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Fri, 2 Dec 2022 21:35:36 -0600 Subject: [PATCH 08/46] feat: add nvim init.lua --- .config/nvim/init.lua | 195 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 .config/nvim/init.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..c7d95a1 --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,195 @@ +vim.cmd([[ + se runtimepath^=~/.vim runtimepath+=~/.vim/after + let &packpath=&runtimepath + source ~/.vimrc + + se mouse=c + + se completeopt=menu,menuone,noselect + + se guicursor=a:hor50-Cursor-blinkwait175-blinkoff150-blinkon175 +]]) + +local cmp = require 'cmp' + +local null_ls = require("null-ls") + +cmp.setup({ + snippet = { + expand = function(args) + vim.fn["UltiSnips#Anon"](args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'ultisnips' }, + }, { + { name = 'buffer' }, + }) +}) + +-- Set up lspconfig. +local capabilities = require('cmp_nvim_lsp').default_capabilities() + +-- Mappings. +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +local opts = { noremap = true, silent = true } +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) + +-- Use an on_attach function to only map the following keys +-- after the language server attaches to the current buffer +local on_attach = function(client, bufnr) + -- Enable completion triggered by + -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gh', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) +end + +local lsp_flags = { + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, +} + +require('lspconfig')['tsserver'].setup { + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} + +local util = require 'lspconfig.util' +local path = util.path +local volar_path = path.join(vim.fn.stdpath 'data', 'lsp_servers', 'volar', 'node_modules') +local global_ts_server_path = path.join(volar_path, 'typescript', 'lib') + +local function get_typescript_lib_path(root_dir) + local project_root = util.find_node_modules_ancestor(root_dir) + return project_root and (path.join(project_root, 'node_modules', 'typescript', 'lib')) + or global_ts_server_path +end + +require('lspconfig')['volar'].setup { + on_attach = on_attach, + filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' }, + capabilities = capabilities, + init_options = { + typescript = { + tsdk = '/home/hali/.config/yarn/global/node_modules/typescript/lib/tsserverlibrary.js', + }, + }, + on_new_config = function(new_config, new_root_dir) + new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) + end, + settings = { + volar = { autoCompleteRefs = true }, + }, +} + +require('lspconfig')['astro'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + +require('lspconfig')['sumneko_lua'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + +require('lspconfig')['phpactor'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + +require('lspconfig')['intelephense'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + +require('lspconfig')['jsonls'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + +null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.diagnostics.eslint, + null_ls.builtins.completion.spell, + null_ls.builtins.formatting.blade_formatter, + }, + on_attach = on_attach, +}) + +require("mason").setup({ + install_root_dir = vim.fn.stdpath "data", + + PATH = "prepend", + + pip = { + install_args = {}, + }, + + log_level = vim.log.levels.INFO, + + max_concurrent_installers = 4, + + github = { + download_url_template = "https://github.com/%s/releases/download/%s/%s", + }, + + ui = { + check_outdated_packages_on_open = true, + + border = "none", + + icons = { + package_installed = "💚", + package_pending = "⏯", + package_uninstalled = "❤️", + }, + + keymaps = { + -- Keymap to expand a package + toggle_package_expand = "", + -- Keymap to install the package under the current cursor position + install_package = "i", + -- Keymap to reinstall/update the package under the current cursor position + update_package = "u", + -- Keymap to check for new version for the package under the current cursor position + check_package_version = "c", + -- Keymap to update all installed packages + update_all_packages = "U", + -- Keymap to check which installed packages are outdated + check_outdated_packages = "C", + -- Keymap to uninstall a package + uninstall_package = "X", + -- Keymap to cancel a package installation + cancel_installation = "", + -- Keymap to apply language filter + apply_language_filter = "", + }, + }, +}) From 6f1e09b913460627359793c4171c326b10dd4012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Tue, 6 Dec 2022 16:27:51 -0600 Subject: [PATCH 09/46] fix: remove eslint --- .config/nvim/init.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index c7d95a1..446d0f4 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -136,8 +136,6 @@ require('lspconfig')['jsonls'].setup { null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, - null_ls.builtins.diagnostics.eslint, - null_ls.builtins.completion.spell, null_ls.builtins.formatting.blade_formatter, }, on_attach = on_attach, From 0cda8dcb7737634823504cd18c1d74ebe35f3214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 14 Dec 2022 09:33:05 -0600 Subject: [PATCH 10/46] feat: update i3 files --- .config/i3/conf.d/01-base.i3config | 1 + .config/i3/conf.d/applications.i3config | 5 +++-- .config/i3/conf.d/bars.i3config | 1 + .config/i3/conf.d/layout.i3config | 4 ++-- .config/i3/conf.d/shortcuts.i3config | 3 ++- .wallpapers/.gitkeep | 0 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .wallpapers/.gitkeep diff --git a/.config/i3/conf.d/01-base.i3config b/.config/i3/conf.d/01-base.i3config index 43970d0..ff4c807 100644 --- a/.config/i3/conf.d/01-base.i3config +++ b/.config/i3/conf.d/01-base.i3config @@ -25,3 +25,4 @@ bindsym $mod+$alt+Control+c exec $HOME/.bin/i3-mkconfig && i3-msg reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+$alt+Control+r exec $HOME/.bin/i3-mkconfig && i3-msg restart + diff --git a/.config/i3/conf.d/applications.i3config b/.config/i3/conf.d/applications.i3config index 7061fe7..b0960fb 100644 --- a/.config/i3/conf.d/applications.i3config +++ b/.config/i3/conf.d/applications.i3config @@ -2,8 +2,8 @@ # | Applications | # |--------------| -bindsym $mod+$alt+t exec /opt/Telegram/Telegram -bindsym $mod+$alt+b exec /bin/firefox +bindsym $mod+$alt+t exec /usr/bin/telegram-desktop +bindsym $mod+$alt+b exec /usr/bin/firefox-developer-edition bindsym $mod+$alt+m exec /usr/bin/thunderbird bindsym $mod+$alt+d exec /bin/discord bindsym $mod+$alt+4 exec /bin/TogglDesktop @@ -14,3 +14,4 @@ bindsym $mod+$alt+n exec nemo bindsym $mod+$alt+z exec zoom exec --no-startup-id kdeconnect-indicator + diff --git a/.config/i3/conf.d/bars.i3config b/.config/i3/conf.d/bars.i3config index d7affdc..5217ee5 100644 --- a/.config/i3/conf.d/bars.i3config +++ b/.config/i3/conf.d/bars.i3config @@ -53,3 +53,4 @@ bar { urgent_workspace $color-binding_mode_indicator } } + diff --git a/.config/i3/conf.d/layout.i3config b/.config/i3/conf.d/layout.i3config index ba62812..b8aa9fd 100644 --- a/.config/i3/conf.d/layout.i3config +++ b/.config/i3/conf.d/layout.i3config @@ -29,10 +29,10 @@ bindcode $mod+59 layout tabbed bindsym $mod+e layout toggle split # Toggle tiling / floating -bindsym $mod+Shift+space floating toggle +bindsym $mod+Shift+d floating toggle # Change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +bindsym $mod+d focus mode_toggle bindsym $mod+Up resize grow height 3 px or 3 ppt bindsym $mod+Right resize grow width 3 px or 3 ppt diff --git a/.config/i3/conf.d/shortcuts.i3config b/.config/i3/conf.d/shortcuts.i3config index 744611f..9f92219 100644 --- a/.config/i3/conf.d/shortcuts.i3config +++ b/.config/i3/conf.d/shortcuts.i3config @@ -6,7 +6,7 @@ bindsym $mod+Return exec --no-startup-id $term # Launcher -bindsym $mod+d exec --no-startup-id rofi -show combi +bindsym $mod+space exec --no-startup-id rofi -show combi # Use amixer to adjust volume in PulseAudio. bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 5%+ @@ -30,3 +30,4 @@ bindsym $mod+u [urgent=latest] focus bindsym $mod+period exec --no-startup-id splatmoji type bindsym $mod+Control+z exec --no-startup-id $HOME/.bin/change-primary-screen + diff --git a/.wallpapers/.gitkeep b/.wallpapers/.gitkeep new file mode 100644 index 0000000..e69de29 From 0dab5148fff708990e85ea5c23eee76417b5e0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 14 Dec 2022 10:41:12 -0600 Subject: [PATCH 11/46] feat: update gtk config --- .config/gtk-3.0/settings.ini | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/gtk-3.0/settings.ini diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..939fb79 --- /dev/null +++ b/.config/gtk-3.0/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-cursor-theme-name=Breeze_Obsidian From ed6d20edbcb3a48efd6575c43ed8037bf9920ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 14 Dec 2022 10:47:14 -0600 Subject: [PATCH 12/46] feat: remove unused shortcut --- .config/i3/conf.d/applications.i3config | 3 ++- .config/i3/conf.d/layout.i3config | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/i3/conf.d/applications.i3config b/.config/i3/conf.d/applications.i3config index b0960fb..222e6c6 100644 --- a/.config/i3/conf.d/applications.i3config +++ b/.config/i3/conf.d/applications.i3config @@ -2,12 +2,13 @@ # | Applications | # |--------------| +bindsym $mod+e exec --no-startup-id $term -e /bin/vifm + bindsym $mod+$alt+t exec /usr/bin/telegram-desktop bindsym $mod+$alt+b exec /usr/bin/firefox-developer-edition bindsym $mod+$alt+m exec /usr/bin/thunderbird bindsym $mod+$alt+d exec /bin/discord bindsym $mod+$alt+4 exec /bin/TogglDesktop -bindsym $mod+$alt+e exec --no-startup-id $term -e /bin/vifm bindsym $mod+$alt+p exec pavucontrol bindsym $mod+$alt+c exec $HOME/.bin/vscode bindsym $mod+$alt+n exec nemo diff --git a/.config/i3/conf.d/layout.i3config b/.config/i3/conf.d/layout.i3config index b8aa9fd..0d8bd82 100644 --- a/.config/i3/conf.d/layout.i3config +++ b/.config/i3/conf.d/layout.i3config @@ -26,7 +26,6 @@ bindsym $mod+f fullscreen toggle bindsym $mod+o layout stacking # 59 = , bindcode $mod+59 layout tabbed -bindsym $mod+e layout toggle split # Toggle tiling / floating bindsym $mod+Shift+d floating toggle From 9e501e48851769fd81c3f8b64bb418f11cd4a290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 14 Dec 2022 21:33:04 -0600 Subject: [PATCH 13/46] feat: update i3 files --- .config/i3/conf.d/applications.i3config | 3 +-- .config/i3/conf.d/layout.i3config | 4 +++- .xinitrc | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.config/i3/conf.d/applications.i3config b/.config/i3/conf.d/applications.i3config index 222e6c6..d794936 100644 --- a/.config/i3/conf.d/applications.i3config +++ b/.config/i3/conf.d/applications.i3config @@ -2,8 +2,7 @@ # | Applications | # |--------------| -bindsym $mod+e exec --no-startup-id $term -e /bin/vifm - +bindsym $mod+$alt+e exec --no-startup-id $term -e /bin/vifm bindsym $mod+$alt+t exec /usr/bin/telegram-desktop bindsym $mod+$alt+b exec /usr/bin/firefox-developer-edition bindsym $mod+$alt+m exec /usr/bin/thunderbird diff --git a/.config/i3/conf.d/layout.i3config b/.config/i3/conf.d/layout.i3config index 0d8bd82..9d79359 100644 --- a/.config/i3/conf.d/layout.i3config +++ b/.config/i3/conf.d/layout.i3config @@ -25,7 +25,9 @@ bindsym $mod+f fullscreen toggle # Change container layout (stacked, tabbed, toggle split) bindsym $mod+o layout stacking # 59 = , -bindcode $mod+59 layout tabbed +# bindcode $mod+59 layout tabbed +bindsym $mod+t layout tabbed +bindsym $mod+e layout toggle split # Toggle tiling / floating bindsym $mod+Shift+d floating toggle diff --git a/.xinitrc b/.xinitrc index 5401085..588530f 100644 --- a/.xinitrc +++ b/.xinitrc @@ -9,5 +9,7 @@ picom -b eval $(gnome-keyring-daemon --start) export SSH_AUTH_SOCK +setxkbmap -option compose:ralt + export DESKTOP_SESSION='i3' exec i3 > $HOME/.cache/i3out 2> $HOME/.cache/i3err From 2c88cbe9e3cf5e662bc3f411e1d39dacc441596a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 15 Dec 2022 21:13:24 -0600 Subject: [PATCH 14/46] feat: add dunst --- .config/dunst/dunstrc | 454 +++++++++++++++++++++++++++++++++++ .config/gtk-3.0/settings.ini | 13 + .xinitrc | 4 +- 3 files changed, 469 insertions(+), 2 deletions(-) create mode 100644 .config/dunst/dunstrc diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc new file mode 100644 index 0000000..0a8c8b7 --- /dev/null +++ b/.config/dunst/dunstrc @@ -0,0 +1,454 @@ +# See dunst(5) for all configuration options + +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = none + + ### Geometry ### + + # dynamic width from 0 to 300 + # width = (0, 300) + # constant width of 300 + width = 300 + + # The maximum height of a single notification, excluding the frame. + height = 300 + + # Position the notification in the top right corner + origin = top-right + + # Offset from the origin + offset = 10x50 + + # Scale factor. It is auto-detected if value is 0. + scale = 0 + + # Maximum number of notification (0 means no limit) + notification_limit = 0 + + ### Progress bar ### + + # Turn on the progess bar. It appears when a progress hint is passed with + # for example dunstify -h int:value:12 + progress_bar = true + + # Set the progress bar height. This includes the frame, so make sure + # it's at least twice as big as the frame width. + progress_bar_height = 10 + + # Set the frame width of the progress bar + progress_bar_frame_width = 1 + + # Set the minimum width for the progress bar + progress_bar_min_width = 150 + + # Set the maximum width for the progress bar + progress_bar_max_width = 300 + + + # Show how many messages are currently hidden (because of + # notification_limit). + indicate_hidden = yes + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). (X11 only) + transparency = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + # If gap_size is greater than 0, this setting will be ignored. + separator_height = 2 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 8 + + # Padding between text and icon. + text_icon_padding = 0 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 3 + + # Defines color of the frame around the notification window. + frame_color = "#aaaaaa" + + # Size of gap to display between notifications - requires a compositor. + # If value is greater than 0, separator_height will be ignored and a border + # of size frame_width will be drawn around each notification instead. + # Click events on gaps do not currently propagate to applications below. + gap_size = 0 + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # A client can set the 'transient' hint to bypass this. See the rules + # section for how to disable this if necessary + # idle_threshold = 120 + + ### Text ### + + font = Monospace 8 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Vertical alignment of message text and icon. + # Possible values are "top", "center" and "bottom". + vertical_alignment = center + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Specify where to make an ellipsis in long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Stack together notifications with the same content + stack_duplicates = true + + # Hide the count of stacked notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Recursive icon lookup. You can set a single theme, instead of having to + # define all lookup paths. + enable_recursive_icon_lookup = true + + # Set icon theme (only used for recursive icon lookup) + icon_theme = Adwaita + # You can also set multiple icon themes, with the leftmost one being used first. + # icon_theme = "Adwaita, breeze" + + # Align icons left/right/top/off + icon_position = left + + # Scale small icons up to this size, set to 0 to disable. Helpful + # for e.g. small files or high-dpi screens. In case of conflict, + # max_icon_size takes precedence over this. + min_icon_size = 32 + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 128 + + # Paths to default icons (only neccesary when not using recursive icon lookup) + icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/xdg-open + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + corner_radius = 0 + + # Ignore the dbus closeNotification message. + # Useful to enforce the timeout set by dunst configuration. Without this + # parameter, an application may close the notification sent before the + # user defined timeout. + ignore_dbusclose = false + + ### Wayland ### + # These settings are Wayland-specific. They have no effect when using X11 + + # Uncomment this if you want to let notications appear under fullscreen + # applications (default: overlay) + # layer = top + + # Set this to true to use X11 output on Wayland. + force_xwayland = false + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + + ### mouse + + # Defines list of actions for each mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: Invoke the action determined by the action_name rule. If there is no + # such action, open the context menu. + # * open_url: If the notification has exactly one url, open it. If there are multiple + # ones, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + # * context: Open context menu for the notification. + # * context_all: Open context menu for all notifications. + # These values can be strung together for each mouse event, and + # will be executed in sequence. + mouse_left_click = close_current + mouse_middle_click = do_action, close_current + mouse_right_click = close_all + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#222222" + foreground = "#888888" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #default_icon = /path/to/icon + +[urgency_normal] + background = "#285577" + foreground = "#ffffff" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #default_icon = /path/to/icon + +[urgency_critical] + background = "#900000" + foreground = "#ffffff" + frame_color = "#ff0000" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #default_icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# +# Messages can be matched by +# appname (discouraged, see desktop_entry) +# body +# category +# desktop_entry +# icon +# match_transient +# msg_urgency +# stack_tag +# summary +# +# and you can override the +# background +# foreground +# format +# frame_color +# fullscreen +# new_icon +# set_stack_tag +# set_transient +# set_category +# timeout +# urgency +# icon_position +# skip_display +# history_ignore +# action_name +# word_wrap +# ellipsize +# alignment +# hide_text +# +# Shell-like globbing will get expanded. +# +# Instead of the appname filter, it's recommended to use the desktop_entry filter. +# GLib based applications export their desktop-entry name. In comparison to the appname, +# the desktop-entry won't get localized. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +# Disable the transient hint so that idle_threshold cannot be bypassed from the +# client +#[transient_disable] +# match_transient = yes +# set_transient = no +# +# Make the handling of transient notifications more strict by making them not +# be placed in history. +#[transient_history_ignore] +# match_transient = yes +# history_ignore = yes + +# fullscreen values +# show: show the notifications, regardless if there is a fullscreen window opened +# delay: displays the new notification, if there is no fullscreen window active +# If the notification is already drawn, it won't get undrawn. +# pushback: same as delay, but when switching into fullscreen, the notification will get +# withdrawn from screen again and will get delayed like a new notification +#[fullscreen_delay_everything] +# fullscreen = delay +#[fullscreen_show_critical] +# msg_urgency = critical +# fullscreen = show + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# skip_display = true + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[skip-display] +# # This notification will not be displayed, but will be included in the history +# summary = "foobar" +# skip_display = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +#[stack-volumes] +# appname = "some_volume_notifiers" +# set_stack_tag = "volume" +# +# vim: ft=cfg diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 939fb79..c5ac9b3 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,2 +1,15 @@ [Settings] gtk-cursor-theme-name=Breeze_Obsidian +gtk-theme-name=Breeze +gtk-icon-theme-name=Papirus-Light +gtk-font-name=Montserrat 11 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintmedium diff --git a/.xinitrc b/.xinitrc index 588530f..3af146a 100644 --- a/.xinitrc +++ b/.xinitrc @@ -2,6 +2,8 @@ xrdb -merge ~/.Xresources picom -b +systemctl --user import-environment DISPLAY XAUTHORITY + /home/hali/.fehbg & /usr/bin/blueman-applet & /usr/lib/kdeconnectd & @@ -9,7 +11,5 @@ picom -b eval $(gnome-keyring-daemon --start) export SSH_AUTH_SOCK -setxkbmap -option compose:ralt - export DESKTOP_SESSION='i3' exec i3 > $HOME/.cache/i3out 2> $HOME/.cache/i3err From 50bc20bb465eecc1c035cc6dd00dece76061c608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 15 Dec 2022 23:33:42 -0600 Subject: [PATCH 15/46] feat: create script for toggle sinks --- .bin/toggle-sink | 18 ++++++++++++++++++ .config/i3/conf.d/clients.i3config | 2 +- .config/nvim/init.lua | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100755 .bin/toggle-sink diff --git a/.bin/toggle-sink b/.bin/toggle-sink new file mode 100755 index 0000000..c326758 --- /dev/null +++ b/.bin/toggle-sink @@ -0,0 +1,18 @@ +#! /bin/bash + +AVAILABLE=($(pacmd list-sinks | rg 'index:' | awk '{ print $2 }')) +LEN=${#AVAILABLE[@]} + +if [ $LEN -le 1 ]; then + exit 1 +fi + +for (( i = 0; i < LEN; i++ )); do + if [ "${AVAILABLE[$i]}" == "index:" ]; then + break; + fi +done + +NEXT=$(( ($i + 1) % $LEN )) + +pacmd set-default-sink ${AVAILABLE[$NEXT]} diff --git a/.config/i3/conf.d/clients.i3config b/.config/i3/conf.d/clients.i3config index 1cc6c38..55efc49 100644 --- a/.config/i3/conf.d/clients.i3config +++ b/.config/i3/conf.d/clients.i3config @@ -2,7 +2,7 @@ # | Clients | # |---------| -assign [class="^Thunderbird$"] → $ws9 +assign [class="^thunderbird$"] → $ws9 assign [class="^TelegramDesktop$"] → $ws3 assign [class="^discord$"] → $ws4 assign [class="^zoom$" instance="^zoom$"] → $ws5 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 446d0f4..133ac5e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -133,6 +133,11 @@ require('lspconfig')['jsonls'].setup { capabilities = capabilities, } +require('lspconfig')['bashls'].setup { + on_attach = on_attach, + capabilities = capabilities, +} + null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, From 0ddedd0431dbbdd3ffca1e79fd317af5168c4b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 21 Dec 2022 21:08:10 -0600 Subject: [PATCH 16/46] feat: update i3 config --- .config/i3/conf.d/applications.i3config | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/i3/conf.d/applications.i3config b/.config/i3/conf.d/applications.i3config index d794936..2ca1911 100644 --- a/.config/i3/conf.d/applications.i3config +++ b/.config/i3/conf.d/applications.i3config @@ -12,6 +12,7 @@ bindsym $mod+$alt+p exec pavucontrol bindsym $mod+$alt+c exec $HOME/.bin/vscode bindsym $mod+$alt+n exec nemo bindsym $mod+$alt+z exec zoom +bindsym $mod+$alt+o exec /usr/bin/obsidian exec --no-startup-id kdeconnect-indicator From feb43269db5d859ab8efa0c64bda20efa8c23dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 21 Dec 2022 22:28:46 -0600 Subject: [PATCH 17/46] feat: add dunst config --- .config/dunst/dunstrc | 200 ++++++------------------------------------ 1 file changed, 26 insertions(+), 174 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 0a8c8b7..cc63061 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -1,102 +1,54 @@ -# See dunst(5) for all configuration options - [global] - ### Display ### - # Which monitor should the notifications be displayed on. - monitor = 0 - - # Display notification on focused monitor. Possible modes are: - # mouse: follow mouse pointer - # keyboard: follow window with keyboard focus - # none: don't follow anything - # - # "keyboard" needs a window manager that exports the - # _NET_ACTIVE_WINDOW property. - # This should be the case for almost all modern window managers. - # - # If this option is set to mouse or keyboard, the monitor option - # will be ignored. - follow = none + enable_posix_regex = true ### Geometry ### # dynamic width from 0 to 300 # width = (0, 300) # constant width of 300 - width = 300 + width = (100, 400) # The maximum height of a single notification, excluding the frame. height = 300 - # Position the notification in the top right corner - origin = top-right - # Offset from the origin - offset = 10x50 - - # Scale factor. It is auto-detected if value is 0. - scale = 0 + offset = 10x40 # Maximum number of notification (0 means no limit) - notification_limit = 0 + notification_limit = 10 ### Progress bar ### - # Turn on the progess bar. It appears when a progress hint is passed with - # for example dunstify -h int:value:12 - progress_bar = true - - # Set the progress bar height. This includes the frame, so make sure - # it's at least twice as big as the frame width. - progress_bar_height = 10 - # Set the frame width of the progress bar - progress_bar_frame_width = 1 + progress_bar_frame_width = 0 # Set the minimum width for the progress bar - progress_bar_min_width = 150 + progress_bar_min_width = 100 # Set the maximum width for the progress bar - progress_bar_max_width = 300 - - - # Show how many messages are currently hidden (because of - # notification_limit). - indicate_hidden = yes + progress_bar_max_width = 1000 # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). (X11 only) - transparency = 0 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - # If gap_size is greater than 0, this setting will be ignored. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 + transparency = 6 # Padding between text and icon. - text_icon_padding = 0 + text_icon_padding = 10 # Defines width in pixels of frame around the notification window. # Set to 0 to disable. - frame_width = 3 + frame_width = 2 # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" + frame_color = "#282828" # Size of gap to display between notifications - requires a compositor. # If value is greater than 0, separator_height will be ignored and a border # of size frame_width will be drawn around each notification instead. # Click events on gaps do not currently propagate to applications below. - gap_size = 0 + gap_size = 6 # Define a color for the separator. # possible values are: @@ -104,25 +56,11 @@ # * foreground: use the same color as the foreground; # * frame: use the same color as the frame; # * anything else will be interpreted as a X color. - separator_color = frame - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - # idle_threshold = 120 + separator_color = auto ### Text ### - font = Monospace 8 - - # The spacing between lines. If the height is smaller than the - # font height, it will get raised to the font height. - line_height = 0 + font = Montserrat 12 # Possible values are: # full: Allow a small subset of html markup in notifications: @@ -148,47 +86,6 @@ # regardless of what this is set to. markup = full - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "%s\n%b" - - # Alignment of message text. - # Possible values are "left", "center" and "right". - alignment = left - - # Vertical alignment of message text and icon. - # Possible values are "top", "center" and "bottom". - vertical_alignment = center - - # Show age of message if message is older than show_age_threshold - # seconds. - # Set to -1 to disable. - show_age_threshold = 60 - - # Specify where to make an ellipsis in long lines. - # Possible values are "start", "middle" and "end". - ellipsize = middle - - # Ignore newlines '\n' in notifications. - ignore_newline = no - - # Stack together notifications with the same content - stack_duplicates = true - - # Hide the count of stacked notifications with the same content - hide_duplicate_count = false - - # Display indicators for URLs (U) and actions (A). - show_indicators = yes - ### Icons ### # Recursive icon lookup. You can set a single theme, instead of having to @@ -196,72 +93,27 @@ enable_recursive_icon_lookup = true # Set icon theme (only used for recursive icon lookup) - icon_theme = Adwaita + icon_theme = "Papirus-Dark, Adwaita" # You can also set multiple icon themes, with the leftmost one being used first. # icon_theme = "Adwaita, breeze" - # Align icons left/right/top/off - icon_position = left - - # Scale small icons up to this size, set to 0 to disable. Helpful - # for e.g. small files or high-dpi screens. In case of conflict, - # max_icon_size takes precedence over this. - min_icon_size = 32 - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 128 - # Paths to default icons (only neccesary when not using recursive icon lookup) - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 + # icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ ### Misc/Advanced ### # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: + dmenu = /usr/bin/rofi -p dunst: # Browser for opening urls in context menu. browser = /usr/bin/xdg-open - # Always run rule-defined scripts, even if the notification is suppressed - always_run_script = true - - # Define the title of the windows spawned by dunst - title = Dunst - - # Define the class of the windows spawned by dunst - class = Dunst - # Define the corner radius of the notification window # in pixel size. If the radius is 0, you have no rounded # corners. # The radius will be automatically lowered if it exceeds half of the # notification height to avoid clipping text and/or icons. - corner_radius = 0 - - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = false - - ### Wayland ### - # These settings are Wayland-specific. They have no effect when using X11 - - # Uncomment this if you want to let notications appear under fullscreen - # applications (default: overlay) - # layer = top - - # Set this to true to use X11 output on Wayland. - force_xwayland = false + corner_radius = 3 ### Legacy @@ -290,9 +142,9 @@ # * context_all: Open context menu for all notifications. # These values can be strung together for each mouse event, and # will be executed in sequence. - mouse_left_click = close_current - mouse_middle_click = do_action, close_current - mouse_right_click = close_all + mouse_left_click = do_action, close_current + mouse_middle_click = open_url, close_current + mouse_right_click = context, close_all # Experimental features that may or may not work correctly. Do not expect them # to have a consistent behaviour across releases. @@ -308,23 +160,23 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "#222222" - foreground = "#888888" + background = "#458588" + foreground = "#eeeeee" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #default_icon = /path/to/icon [urgency_normal] - background = "#285577" + background = "#D79921" foreground = "#ffffff" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #default_icon = /path/to/icon [urgency_critical] - background = "#900000" + background = "#cc241d" foreground = "#ffffff" - frame_color = "#ff0000" + frame_color = "#b31f19" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable #default_icon = /path/to/icon From 3e7e695d7d08b642950eb7ffe0208018fa45e79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 21 Dec 2022 22:29:33 -0600 Subject: [PATCH 18/46] feat: update icons --- .config/gtk-3.0/settings.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index c5ac9b3..e8a69fd 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-cursor-theme-name=Breeze_Obsidian gtk-theme-name=Breeze -gtk-icon-theme-name=Papirus-Light +gtk-icon-theme-name=Papirus-Dark gtk-font-name=Montserrat 11 gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ From 1139ec11719faba96c198899bd8baaac5ba41543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 21 Dec 2022 22:30:03 -0600 Subject: [PATCH 19/46] chore: lowercase --- .config/dunst/dunstrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index cc63061..a92a6b7 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -167,7 +167,7 @@ #default_icon = /path/to/icon [urgency_normal] - background = "#D79921" + background = "#d79921" foreground = "#ffffff" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable From 45d9fb086216945c9aae2c535d4ae414d585c5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 22 Dec 2022 08:52:29 -0600 Subject: [PATCH 20/46] feat: improve dunst colors --- .config/dunst/dunstrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index a92a6b7..613efab 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -32,7 +32,7 @@ # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). (X11 only) - transparency = 6 + transparency = 3 # Padding between text and icon. text_icon_padding = 10 @@ -161,14 +161,14 @@ # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. background = "#458588" - foreground = "#eeeeee" + foreground = "#000000" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #default_icon = /path/to/icon [urgency_normal] - background = "#d79921" - foreground = "#ffffff" + background = "#98971a" + foreground = "#000000" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #default_icon = /path/to/icon From 7e3f835d5e2f09abec4f93825743230bded2ce41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 28 Dec 2022 17:32:43 -0600 Subject: [PATCH 21/46] feat: update dunst files --- .config/dunst/dunstrc | 2 +- .config/i3/conf.d/bars.i3config | 6 +++-- .config/i3status/config | 4 +-- .config/rofi/dmenu.rasi | 47 +++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 .config/rofi/dmenu.rasi diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 613efab..db122e3 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -103,7 +103,7 @@ ### Misc/Advanced ### # dmenu path. - dmenu = /usr/bin/rofi -p dunst: + dmenu = "/usr/bin/dmenu -theme dmenu -p dunst:" # Browser for opening urls in context menu. browser = /usr/bin/xdg-open diff --git a/.config/i3/conf.d/bars.i3config b/.config/i3/conf.d/bars.i3config index 5217ee5..162c207 100644 --- a/.config/i3/conf.d/bars.i3config +++ b/.config/i3/conf.d/bars.i3config @@ -13,12 +13,12 @@ set $color-urgent_workspace #282828 #CC241D #282828 bar { id primary_bar output primary - status_command i3status tray_output primary tray_padding 6 px position top workspace_buttons yes strip_workspace_numbers yes + status_command $HOME/.bin/i3status colors { background $color-background @@ -40,7 +40,7 @@ bar { tray_output none workspace_buttons yes strip_workspace_name yes - status_command i3status --config $HOME/.config/i3status/second.config + status_command $HOME/.bin/i3status --config $HOME/.config/i3status/second.config colors { background $color-background @@ -52,5 +52,7 @@ bar { binding_mode $color-binding_mode urgent_workspace $color-binding_mode_indicator } + + bindsym button1 exec $HOME/.bin/logwheel } diff --git a/.config/i3status/config b/.config/i3status/config index 6de164e..e578646 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -16,7 +16,7 @@ general { } # order += "ipv6" -order += "wireless wlo1" +order += "wireless wlan0" order += "ethernet _first_" order += "battery 0" # order += "disk /" @@ -25,7 +25,7 @@ order += "battery 0" order += "volume master" order += "tztime local" -wireless wlo1 { +wireless wlan0 { format_up = " %essid (%quality)" format_down = "" } diff --git a/.config/rofi/dmenu.rasi b/.config/rofi/dmenu.rasi new file mode 100644 index 0000000..de4553a --- /dev/null +++ b/.config/rofi/dmenu.rasi @@ -0,0 +1,47 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ + +* { + background-color: #282828; + border-color: #ebdbb2; + text-color: #ebdbb2; + font: "Iosevka 11"; +} +window { + anchor: north; + location: north; + width: 100%; + padding: 3px; + children: [ horibox ]; +} +horibox { + orientation: horizontal; + children: [ prompt, entry, listview ]; +} +listview { + layout: horizontal; + spacing: 6px; + lines: 100; +} +prompt { + margin: 0 6px 0 0; +} +entry { + expand: false; + width: 10em; +} +element { + padding: 0px 2px; +} +element selected { + background-color: #b8bb26; + text-color: #282828; +} + +element-text, element-icon { + background-color: inherit; + text-color: inherit; +} From 0383cd11c2ab814cb7d09dce75bdea9ce14a4ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Fri, 30 Dec 2022 17:38:42 -0600 Subject: [PATCH 22/46] feat: update dunst actions --- .config/dunst/dunstrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index db122e3..bcccd12 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -144,7 +144,7 @@ # will be executed in sequence. mouse_left_click = do_action, close_current mouse_middle_click = open_url, close_current - mouse_right_click = context, close_all + mouse_right_click = context # Experimental features that may or may not work correctly. Do not expect them # to have a consistent behaviour across releases. From 2acec96cd5c00a9c0c79df7185ce8d5e66e2eea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 5 Jan 2023 08:40:34 -0600 Subject: [PATCH 23/46] fix: bar wasn't displaying in nonprimary screen --- .config/i3/conf.d/20-workspaces.i3config | 4 ++-- .config/i3/conf.d/bars.i3config | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 05f4d33..8316358 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary eDP-1 -set $nonprimary HDMI-1 +set $primary HDMI-1 +set $nonprimary eDP-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.config/i3/conf.d/bars.i3config b/.config/i3/conf.d/bars.i3config index 162c207..2033141 100644 --- a/.config/i3/conf.d/bars.i3config +++ b/.config/i3/conf.d/bars.i3config @@ -12,13 +12,13 @@ set $color-urgent_workspace #282828 #CC241D #282828 bar { id primary_bar - output primary + output $primary tray_output primary tray_padding 6 px position top workspace_buttons yes strip_workspace_numbers yes - status_command $HOME/.bin/i3status + status_command i3status colors { background $color-background @@ -34,13 +34,13 @@ bar { bar { id secondary_bar - output nonprimary + output $nonprimary binding_mode_indicator no position top tray_output none workspace_buttons yes strip_workspace_name yes - status_command $HOME/.bin/i3status --config $HOME/.config/i3status/second.config + status_command i3status --config $HOME/.config/i3status/second.config colors { background $color-background From b05803750bd760c668bef09a2fbe8938e55c3e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 1 Mar 2023 21:23:59 -0600 Subject: [PATCH 24/46] feat: update bins and nvim config --- .bin/change-primary-screen | 6 + .bin/toggle-sink | 1 + .config/i3/conf.d/screen-mode.i3config | 1 + .config/i3/conf.d/shortcuts.i3config | 2 + .config/nvim/coc-settings.json | 24 +- .config/nvim/init.lua | 329 ++++++++++++++----------- .gitignore | 1 + .vim/plugins.vim | 2 + .xinitrc | 1 - .zshrc | 17 +- 10 files changed, 221 insertions(+), 163 deletions(-) diff --git a/.bin/change-primary-screen b/.bin/change-primary-screen index b43ff73..2ce536b 100755 --- a/.bin/change-primary-screen +++ b/.bin/change-primary-screen @@ -1,5 +1,11 @@ #!/bin/sh +WORKSPACES=$(i3-msg -t get_workspaces | jq '.[].name' -r) + +for i in $WORKSPACES; do + i3-msg "[workspace=\"$i\"]" move workspace to output next +done + PRIMARY=$(xrandr --prop | rg primary | awk '{ print $1 }') NONPRIMARY=$(xrandr --prop | rg connected | rg -v primary | awk '{ print $1 }') diff --git a/.bin/toggle-sink b/.bin/toggle-sink index c326758..e1576ab 100755 --- a/.bin/toggle-sink +++ b/.bin/toggle-sink @@ -16,3 +16,4 @@ done NEXT=$(( ($i + 1) % $LEN )) pacmd set-default-sink ${AVAILABLE[$NEXT]} +echo $AVAILALE[$NEXT] diff --git a/.config/i3/conf.d/screen-mode.i3config b/.config/i3/conf.d/screen-mode.i3config index 3cc099d..4d141e6 100644 --- a/.config/i3/conf.d/screen-mode.i3config +++ b/.config/i3/conf.d/screen-mode.i3config @@ -11,6 +11,7 @@ mode "$m_screen" { bindsym s exec --no-startup-id "xrandr --output HDMI-1 --same-as eDP-1" bindsym k exec --no-startup-id "xrandr --output HDMI-1 --above eDP-1" bindsym j exec --no-startup-id "xrandr --output HDMI-1 --below eDP-1" + bindsym t exec --no-startup-id "$HOME/.bin/change-primary-screen" bindsym Return mode "default" bindsym Escape mode "default" diff --git a/.config/i3/conf.d/shortcuts.i3config b/.config/i3/conf.d/shortcuts.i3config index 9f92219..10b9ca8 100644 --- a/.config/i3/conf.d/shortcuts.i3config +++ b/.config/i3/conf.d/shortcuts.i3config @@ -24,7 +24,9 @@ bindsym $mod+Shift+b exec --no-startup-id $HOME/.local/bin/alacritty-colorscheme bindsym $mod+q kill bindsym Print exec --no-startup-id $HOME/.bin/snap full +bindsym $mod+p exec --no-startup-id $HOME/.bin/snap full bindsym Shift+Print exec --no-startup-id $HOME/.bin/snap area +bindsym $mod+Shift+p exec --no-startup-id $HOME/.bin/snap area bindsym $mod+u [urgent=latest] focus bindsym $mod+period exec --no-startup-id splatmoji type diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 08f7b5e..d6455d6 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -15,17 +15,29 @@ "snippets.userSnippetsDirectory": "/home/hali/.vim/snippets-used", "snippets.loadFromExtensions": false, "snippets.extends": { - "blade": ["html"], - "liquid": ["markdown"], - "vimwiki": ["markdown"] + "blade": [ + "html" + ], + "liquid": [ + "markdown" + ], + "vimwiki": [ + "markdown" + ] }, "languageserver": {}, "npm.binPath": "yarn", "tsserver.watchOptions": { - "excludeDirectories": ["node_modules", "vendor"] + "excludeDirectories": [ + "node_modules", + "vendor" + ] }, "phpactor.enable": true, "phpactor.path": "/home/hali/.config/composer/vendor/bin/phpactor", - "prettier.disableLanguages": ["vue"], - "svelte.enable-ts-plugin": true + "prettier.disableLanguages": [ + "vue" + ], + "svelte.enable-ts-plugin": true, + "sumneko-lua.enableNvimLuaDev": true } diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 133ac5e..d7be9db 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -10,189 +10,222 @@ vim.cmd([[ se guicursor=a:hor50-Cursor-blinkwait175-blinkoff150-blinkon175 ]]) -local cmp = require 'cmp' +local cmp = require("cmp") +local home = os.getenv("HOME") local null_ls = require("null-ls") cmp.setup({ - snippet = { - expand = function(args) - vim.fn["UltiSnips#Anon"](args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'ultisnips' }, - }, { - { name = 'buffer' }, - }) + snippet = { + expand = function(args) + vim.fn["UltiSnips#Anon"](args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "ultisnips" }, + }, { + { name = "buffer" }, + }), }) -- Set up lspconfig. -local capabilities = require('cmp_nvim_lsp').default_capabilities() +local capabilities = require("cmp_nvim_lsp").default_capabilities() -- Mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions local opts = { noremap = true, silent = true } -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) +vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) +vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) - -- Enable completion triggered by - -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gh', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) + -- Enable completion triggered by + -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts) + vim.keymap.set("n", "gh", vim.lsp.buf.hover, bufopts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts) + vim.keymap.set("n", "", vim.lsp.buf.signature_help, bufopts) + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) + vim.keymap.set("n", "f", function() + vim.lsp.buf.format({ async = true }) + end, bufopts) end local lsp_flags = { - -- This is the default in Nvim 0.7+ - debounce_text_changes = 150, + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, } -require('lspconfig')['tsserver'].setup { - on_attach = on_attach, - flags = lsp_flags, - capabilities = capabilities, -} +require("lspconfig")["tsserver"].setup({ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +}) -local util = require 'lspconfig.util' +local util = require("lspconfig.util") local path = util.path -local volar_path = path.join(vim.fn.stdpath 'data', 'lsp_servers', 'volar', 'node_modules') -local global_ts_server_path = path.join(volar_path, 'typescript', 'lib') +local volar_path = path.join(vim.fn.stdpath("data"), "lsp_servers", "volar", "node_modules") +local global_ts_server_path = path.join(volar_path, "typescript", "lib") local function get_typescript_lib_path(root_dir) - local project_root = util.find_node_modules_ancestor(root_dir) - return project_root and (path.join(project_root, 'node_modules', 'typescript', 'lib')) - or global_ts_server_path + local project_root = util.find_node_modules_ancestor(root_dir) + return project_root and (path.join(project_root, "node_modules", "typescript", "lib")) or global_ts_server_path end -require('lspconfig')['volar'].setup { - on_attach = on_attach, - filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' }, - capabilities = capabilities, - init_options = { - typescript = { - tsdk = '/home/hali/.config/yarn/global/node_modules/typescript/lib/tsserverlibrary.js', - }, - }, - on_new_config = function(new_config, new_root_dir) - new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) - end, - settings = { - volar = { autoCompleteRefs = true }, - }, -} +require("lspconfig")["volar"].setup({ + on_attach = on_attach, + filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, + capabilities = capabilities, + init_options = { + typescript = { + tsdk = path.join( + home, + ".config", + "yarn", + "global", + "node_modules", + "typescript", + "lib", + "tsserverlibrary.js" + ), + }, + }, + on_new_config = function(new_config, new_root_dir) + new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) + end, + settings = { + volar = { autoCompleteRefs = true }, + }, +}) -require('lspconfig')['astro'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +require("lspconfig")["astro"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) -require('lspconfig')['sumneko_lua'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +require("lspconfig")["lua_ls"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) -require('lspconfig')['phpactor'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +-- require('lspconfig')['phpactor'].setup { +-- on_attach = on_attach, +-- capabilities = capabilities, +-- } -require('lspconfig')['intelephense'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +require("lspconfig")["intelephense"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) -require('lspconfig')['jsonls'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +require("lspconfig")["jsonls"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) -require('lspconfig')['bashls'].setup { - on_attach = on_attach, - capabilities = capabilities, -} +require("lspconfig")["bashls"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) + +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") +project_name = project_name:gsub("%W", "_") +local workspace_folder = vim.fn.expand("$HOME/.cache/jdtls/data/") .. project_name + +require("lspconfig")["jdtls"].setup({ + cmd = { + path.join(vim.fn.stdpath("data"), "bin", "jdtls"), + "-data", + workspace_folder + }, + -- root_dir = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1]), + on_attach = on_attach, + capabilities = capabilities, + settings = { + java = { + format = { + settings = { + -- Use Google Java style guidelines for formatting + -- To use, make sure to download the file from https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml + -- and place it in the ~/.local/share/eclipse directory + url = path.join(home, ".local", "share", "eclipse", "eclipse-java-google-style.xml"), + profile = "GoogleStyle", + }, + }, + }, + }, +}) null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.blade_formatter, - }, - on_attach = on_attach, + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.blade_formatter, + }, + on_attach = on_attach, }) require("mason").setup({ - install_root_dir = vim.fn.stdpath "data", - - PATH = "prepend", - - pip = { - install_args = {}, - }, - - log_level = vim.log.levels.INFO, - - max_concurrent_installers = 4, - - github = { - download_url_template = "https://github.com/%s/releases/download/%s/%s", - }, - - ui = { - check_outdated_packages_on_open = true, - - border = "none", - - icons = { - package_installed = "💚", - package_pending = "⏯", - package_uninstalled = "❤️", - }, - - keymaps = { - -- Keymap to expand a package - toggle_package_expand = "", - -- Keymap to install the package under the current cursor position - install_package = "i", - -- Keymap to reinstall/update the package under the current cursor position - update_package = "u", - -- Keymap to check for new version for the package under the current cursor position - check_package_version = "c", - -- Keymap to update all installed packages - update_all_packages = "U", - -- Keymap to check which installed packages are outdated - check_outdated_packages = "C", - -- Keymap to uninstall a package - uninstall_package = "X", - -- Keymap to cancel a package installation - cancel_installation = "", - -- Keymap to apply language filter - apply_language_filter = "", - }, - }, + install_root_dir = vim.fn.stdpath("data"), + PATH = "prepend", + pip = { + install_args = {}, + }, + log_level = vim.log.levels.INFO, + max_concurrent_installers = 4, + github = { + download_url_template = "https://github.com/%s/releases/download/%s/%s", + }, + ui = { + check_outdated_packages_on_open = true, + + border = "none", + + icons = { + package_installed = "💚", + package_pending = "⏯", + package_uninstalled = "❤️", + }, + + keymaps = { + -- Keymap to expand a package + toggle_package_expand = "", + -- Keymap to install the package under the current cursor position + install_package = "i", + -- Keymap to reinstall/update the package under the current cursor position + update_package = "u", + -- Keymap to check for new version for the package under the current cursor position + check_package_version = "c", + -- Keymap to update all installed packages + update_all_packages = "U", + -- Keymap to check which installed packages are outdated + check_outdated_packages = "C", + -- Keymap to uninstall a package + uninstall_package = "X", + -- Keymap to cancel a package installation + cancel_installation = "", + -- Keymap to apply language filter + apply_language_filter = "", + }, + }, }) diff --git a/.gitignore b/.gitignore index 2d23a67..46ff70c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Pictures/ Videos/ wiki_list.vim +*.class diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 8b2e543..d930b09 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -30,6 +30,7 @@ if has('nvim') Plug 'quangnguyen30192/cmp-nvim-ultisnips' Plug 'nvim-lua/plenary.nvim' Plug 'jose-elias-alvarez/null-ls.nvim' + Plug 'mfussenegger/nvim-jdtls' else Plug 'Shougo/denite.nvim' Plug 'roxma/nvim-yarp' @@ -245,6 +246,7 @@ if has('nvim') autocmd FileType denite-filter cal s:denite_filter_my_settings() fu! s:denite_filter_my_settings() abort + lua require('cmp').setup.buffer { enabled = false } im (denite_filter_update) ino denite#do_map('do_action') ino denite#do_map('do_action', 'tabopen') diff --git a/.xinitrc b/.xinitrc index 3af146a..c51a6db 100644 --- a/.xinitrc +++ b/.xinitrc @@ -6,7 +6,6 @@ systemctl --user import-environment DISPLAY XAUTHORITY /home/hali/.fehbg & /usr/bin/blueman-applet & -/usr/lib/kdeconnectd & eval $(gnome-keyring-daemon --start) export SSH_AUTH_SOCK diff --git a/.zshrc b/.zshrc index 3d51ef2..6e986d9 100644 --- a/.zshrc +++ b/.zshrc @@ -19,14 +19,15 @@ export BLOGPATH="$HOME/Documents/Code/halivert.dev" export WORKPATH="$HOME/Documents/Projects" export JWPATH="$HOME/Documents/JW" -PATH="$PATH:/home/hali/.bin" -PATH="$PATH:/home/hali/.config/composer/vendor/bin" -PATH="$PATH:/home/hali/.local/share/gem/ruby/3.0.0/bin" -PATH="$PATH:/home/hali/.yarn/bin" -PATH="$PATH:/home/hali/.npm/bin" -PATH="$PATH:/home/hali/.local/bin" -PATH="$PATH:/home/hali/.go/bin" -PATH="$PATH:/home/hali/.cargo/bin" +PATH="$PATH:$HOME/.bin" +PATH="$PATH:$HOME/.config/composer/vendor/bin" +PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin" +PATH="$PATH:$HOME/.yarn/bin" +PATH="$PATH:$HOME/.npm/bin" +PATH="$PATH:$HOME/.local/bin" +PATH="$PATH:$HOME/.go/bin" +PATH="$PATH:$HOME/.cargo/bin" +PATH="$PATH:$HOME/.local/share/nvim/bin" # Prompt only last 3 directories from PWD function min_path_prompt () { From ac8b70017d8da4539c4144f88a2adc5be9bdd46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 1 Mar 2023 22:53:43 -0600 Subject: [PATCH 25/46] feat: try to add improvements --- .bin/change-primary-screen | 40 +++++++++++++++++------- .config/i3/conf.d/20-workspaces.i3config | 4 +-- .config/i3/conf.d/bars.i3config | 2 -- .xinitrc | 3 +- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.bin/change-primary-screen b/.bin/change-primary-screen index 2ce536b..918e20f 100755 --- a/.bin/change-primary-screen +++ b/.bin/change-primary-screen @@ -1,20 +1,38 @@ #!/bin/sh -WORKSPACES=$(i3-msg -t get_workspaces | jq '.[].name' -r) +# # # # # # # # # # # # # # # # # # # # # # # # +# Setup to change screens with i3 and xrandr # +# # # # # # # # # # # # # # # # # # # # # # # # -for i in $WORKSPACES; do - i3-msg "[workspace=\"$i\"]" move workspace to output next -done +get_workspaces () { + i3-msg -t get_workspaces | jq ".[] | select(.output==\"$1\").name" -r +} -PRIMARY=$(xrandr --prop | rg primary | awk '{ print $1 }') -NONPRIMARY=$(xrandr --prop | rg connected | rg -v primary | awk '{ print $1 }') +workspace_toggle_output () { + for i in $1; do + i3-msg "[workspace=\"$i\"]" move workspace to output $2 > /dev/null 2>&1 + done +} -xrandr --output $PRIMARY --noprimary -xrandr --output $NONPRIMARY --primary +get_selected_output () { + rg "set $1" ~/.config/i3/conf.d/20-workspaces.i3config | awk '{ print $3 }' +} + +PRIMARY=$(get_selected_output '\$primary') +NOPRIMARY=$(get_selected_output '\$nonprimary') + +xrandr --output "$PRIMARY" --noprimary +xrandr --output "$NOPRIMARY" --primary sed -i \ - -e "5 s/$PRIMARY/$NONPRIMARY/" \ - -e "6 s/$NONPRIMARY/$PRIMARY/" \ + -e "5 s/$PRIMARY/$NOPRIMARY/" \ + -e "6 s/$NOPRIMARY/$PRIMARY/" \ $HOME/.config/i3/conf.d/20-workspaces.i3config -$HOME/.bin/i3-mkconfig && i3-msg restart +$HOME/.bin/i3-mkconfig && i3-msg restart > /dev/null + +PRIMARY_WORKSPACES=$(get_workspaces "$PRIMARY") +NOPRIMARY_WORKSPACES=$(get_workspaces "$NOPRIMARY") + +workspace_toggle_output "$PRIMARY_WORKSPACES" "$NOPRIMARY" +workspace_toggle_output "$NOPRIMARY_WORKSPACES" "$PRIMARY" diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 8316358..05f4d33 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary HDMI-1 -set $nonprimary eDP-1 +set $primary eDP-1 +set $nonprimary HDMI-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.config/i3/conf.d/bars.i3config b/.config/i3/conf.d/bars.i3config index 2033141..b7c52a6 100644 --- a/.config/i3/conf.d/bars.i3config +++ b/.config/i3/conf.d/bars.i3config @@ -13,7 +13,6 @@ set $color-urgent_workspace #282828 #CC241D #282828 bar { id primary_bar output $primary - tray_output primary tray_padding 6 px position top workspace_buttons yes @@ -37,7 +36,6 @@ bar { output $nonprimary binding_mode_indicator no position top - tray_output none workspace_buttons yes strip_workspace_name yes status_command i3status --config $HOME/.config/i3status/second.config diff --git a/.xinitrc b/.xinitrc index c51a6db..0b26fca 100644 --- a/.xinitrc +++ b/.xinitrc @@ -4,8 +4,9 @@ picom -b systemctl --user import-environment DISPLAY XAUTHORITY -/home/hali/.fehbg & +$HOME/.fehbg & /usr/bin/blueman-applet & +$HOME/.bin/set-last-outputs eval $(gnome-keyring-daemon --start) export SSH_AUTH_SOCK From 2b1af851a73574be0d299a5a2cf7cc84873b5ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Wed, 1 Mar 2023 22:57:34 -0600 Subject: [PATCH 26/46] fix: tray in bars --- .config/i3/conf.d/bars.i3config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/i3/conf.d/bars.i3config b/.config/i3/conf.d/bars.i3config index b7c52a6..88bf5b7 100644 --- a/.config/i3/conf.d/bars.i3config +++ b/.config/i3/conf.d/bars.i3config @@ -13,6 +13,7 @@ set $color-urgent_workspace #282828 #CC241D #282828 bar { id primary_bar output $primary + tray_output primary tray_padding 6 px position top workspace_buttons yes @@ -35,6 +36,7 @@ bar { id secondary_bar output $nonprimary binding_mode_indicator no + tray_output none position top workspace_buttons yes strip_workspace_name yes From d6f11d7f663cd4447156e724bed22a79057361c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 2 Mar 2023 14:07:19 -0600 Subject: [PATCH 27/46] feat: improve zshrc files --- .config/i3/conf.d/20-workspaces.i3config | 4 ++-- .zshrc | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 05f4d33..8316358 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary eDP-1 -set $nonprimary HDMI-1 +set $primary HDMI-1 +set $nonprimary eDP-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.zshrc b/.zshrc index 6e986d9..24a856c 100644 --- a/.zshrc +++ b/.zshrc @@ -61,16 +61,15 @@ _CurrentDirFile="$HOME/.currentDirs/$_DirNum" mkdir "$HOME/.currentDirs" > /dev/null 2>&1 unset _Tp _Tn _DirNum if [ $_Tx = "alacritty" ] || [ $_Tx = "konsole" ]; then - alias cd=changeDir; - - changeDir() { - \cd $1; + save_current_dir() { pwd > "$_CurrentDirFile" } if [ -e $_CurrentDirFile ]; then cd "$(cat $_CurrentDirFile)" fi + + chpwd_functions=( save_current_dir ) fi source ~/.zsh_aliases From 46689d6e2d6e8c7c2f6b436162980319cdd322ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Sat, 1 Apr 2023 23:34:13 -0600 Subject: [PATCH 28/46] feat: add luasnip --- .config/i3/conf.d/20-workspaces.i3config | 4 +- .config/nvim/coc-settings.json | 3 +- .config/nvim/init.lua | 359 +++++++++++++---------- .vim/ftplugin/markdown.vim | 2 +- .vim/ftplugin/vue.vim | 2 +- .vim/plugins.vim | 23 +- .zsh_aliases | 15 +- .zshrc | 4 +- 8 files changed, 223 insertions(+), 189 deletions(-) diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 8316358..05f4d33 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary HDMI-1 -set $nonprimary eDP-1 +set $primary eDP-1 +set $nonprimary HDMI-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index d6455d6..9e45a39 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -39,5 +39,6 @@ "vue" ], "svelte.enable-ts-plugin": true, - "sumneko-lua.enableNvimLuaDev": true + "sumneko-lua.enableNvimLuaDev": true, + "volar.formatting.printWidth": 80 } diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d7be9db..e8cdd8e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -15,27 +15,52 @@ local home = os.getenv("HOME") local null_ls = require("null-ls") +-- luasnip setup +local luasnip = require 'luasnip' + cmp.setup({ - snippet = { - expand = function(args) - vim.fn["UltiSnips#Anon"](args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "ultisnips" }, - }, { - { name = "buffer" }, - }), + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { 'i', 's' }), + }), + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = "buffer" }, + { name = "path" }, + } }) +require("luasnip.loaders.from_vscode").lazy_load() + -- Set up lspconfig. local capabilities = require("cmp_nvim_lsp").default_capabilities() @@ -48,39 +73,39 @@ vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) - -- Enable completion triggered by - -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts) - vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts) - vim.keymap.set("n", "gh", vim.lsp.buf.hover, bufopts) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts) - vim.keymap.set("n", "", vim.lsp.buf.signature_help, bufopts) - vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set("n", "wl", function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) - vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) - vim.keymap.set("n", "f", function() - vim.lsp.buf.format({ async = true }) - end, bufopts) + -- Enable completion triggered by + -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts) + vim.keymap.set("n", "gh", vim.lsp.buf.hover, bufopts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts) + vim.keymap.set("n", "", vim.lsp.buf.signature_help, bufopts) + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) + vim.keymap.set("n", "f", function() + vim.lsp.buf.format({ async = true }) + end, bufopts) end local lsp_flags = { - -- This is the default in Nvim 0.7+ - debounce_text_changes = 150, + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, } require("lspconfig")["tsserver"].setup({ - on_attach = on_attach, - flags = lsp_flags, - capabilities = capabilities, + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, }) local util = require("lspconfig.util") @@ -89,64 +114,59 @@ local volar_path = path.join(vim.fn.stdpath("data"), "lsp_servers", "volar", "no local global_ts_server_path = path.join(volar_path, "typescript", "lib") local function get_typescript_lib_path(root_dir) - local project_root = util.find_node_modules_ancestor(root_dir) - return project_root and (path.join(project_root, "node_modules", "typescript", "lib")) or global_ts_server_path + local project_root = util.find_node_modules_ancestor(root_dir) + return project_root and (path.join(project_root, "node_modules", "typescript", "lib")) or global_ts_server_path end require("lspconfig")["volar"].setup({ - on_attach = on_attach, - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, - capabilities = capabilities, - init_options = { - typescript = { - tsdk = path.join( - home, - ".config", - "yarn", - "global", - "node_modules", - "typescript", - "lib", - "tsserverlibrary.js" - ), - }, - }, - on_new_config = function(new_config, new_root_dir) - new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) - end, - settings = { - volar = { autoCompleteRefs = true }, - }, + on_attach = on_attach, + filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, + capabilities = capabilities, + init_options = { + typescript = { + tsdk = path.join(home, ".config", "yarn", "global", "node_modules", "typescript", "lib", "tsserverlibrary.js"), + }, + }, + on_new_config = function(new_config, new_root_dir) + new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) + end, + settings = { + volar = { + autoCompleteRefs = true, + printWidth = 80, + }, + }, +}) + +require("lspconfig")["cssls"].setup({ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, }) require("lspconfig")["astro"].setup({ - on_attach = on_attach, - capabilities = capabilities, + on_attach = on_attach, + capabilities = capabilities, }) require("lspconfig")["lua_ls"].setup({ - on_attach = on_attach, - capabilities = capabilities, + on_attach = on_attach, + capabilities = capabilities, }) --- require('lspconfig')['phpactor'].setup { --- on_attach = on_attach, --- capabilities = capabilities, --- } - -require("lspconfig")["intelephense"].setup({ - on_attach = on_attach, - capabilities = capabilities, +require("lspconfig")["phpactor"].setup({ + on_attach = on_attach, + capabilities = capabilities, }) require("lspconfig")["jsonls"].setup({ - on_attach = on_attach, - capabilities = capabilities, + on_attach = on_attach, + capabilities = capabilities, }) require("lspconfig")["bashls"].setup({ - on_attach = on_attach, - capabilities = capabilities, + on_attach = on_attach, + capabilities = capabilities, }) local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") @@ -154,78 +174,109 @@ project_name = project_name:gsub("%W", "_") local workspace_folder = vim.fn.expand("$HOME/.cache/jdtls/data/") .. project_name require("lspconfig")["jdtls"].setup({ - cmd = { - path.join(vim.fn.stdpath("data"), "bin", "jdtls"), - "-data", - workspace_folder - }, - -- root_dir = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1]), - on_attach = on_attach, - capabilities = capabilities, - settings = { - java = { - format = { - settings = { - -- Use Google Java style guidelines for formatting - -- To use, make sure to download the file from https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml - -- and place it in the ~/.local/share/eclipse directory - url = path.join(home, ".local", "share", "eclipse", "eclipse-java-google-style.xml"), - profile = "GoogleStyle", - }, - }, - }, - }, + cmd = { + path.join(vim.fn.stdpath("data"), "bin", "jdtls"), + "-data", + workspace_folder, + }, + -- root_dir = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1]), + on_attach = on_attach, + capabilities = capabilities, + settings = { + java = { + format = { + settings = { + -- Use Google Java style guidelines for formatting + -- To use, make sure to download the file from https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml + -- and place it in the ~/.local/share/eclipse directory + url = path.join(home, ".local", "share", "eclipse", "eclipse-java-google-style.xml"), + profile = "GoogleStyle", + }, + }, + }, + }, }) null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.blade_formatter, - }, - on_attach = on_attach, + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.blade_formatter, + }, + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.keymap.set("n", "f", function() + vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) + end, { buffer = bufnr, desc = "[lsp] format" }) + end + + if client.supports_method("textDocument/rangeFormatting") then + vim.keymap.set("x", "f", function() + vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) + end, { buffer = bufnr, desc = "[lsp] format" }) + end + end, +}) + +require("prettier").setup({ + bin = "prettier", + filetypes = { + "css", + "graphql", + "html", + "javascript", + "javascriptreact", + "json", + "less", + "markdown", + "scss", + "typescript", + "typescriptreact", + "yaml", + }, + cli_options = { + print_width = 80, + semi = false, + }, }) require("mason").setup({ - install_root_dir = vim.fn.stdpath("data"), - PATH = "prepend", - pip = { - install_args = {}, - }, - log_level = vim.log.levels.INFO, - max_concurrent_installers = 4, - github = { - download_url_template = "https://github.com/%s/releases/download/%s/%s", - }, - ui = { - check_outdated_packages_on_open = true, - - border = "none", - - icons = { - package_installed = "💚", - package_pending = "⏯", - package_uninstalled = "❤️", - }, - - keymaps = { - -- Keymap to expand a package - toggle_package_expand = "", - -- Keymap to install the package under the current cursor position - install_package = "i", - -- Keymap to reinstall/update the package under the current cursor position - update_package = "u", - -- Keymap to check for new version for the package under the current cursor position - check_package_version = "c", - -- Keymap to update all installed packages - update_all_packages = "U", - -- Keymap to check which installed packages are outdated - check_outdated_packages = "C", - -- Keymap to uninstall a package - uninstall_package = "X", - -- Keymap to cancel a package installation - cancel_installation = "", - -- Keymap to apply language filter - apply_language_filter = "", - }, - }, + install_root_dir = vim.fn.stdpath("data"), + PATH = "prepend", + pip = { + install_args = {}, + }, + log_level = vim.log.levels.INFO, + max_concurrent_installers = 4, + github = { + download_url_template = "https://github.com/%s/releases/download/%s/%s", + }, + ui = { + check_outdated_packages_on_open = true, + border = "none", + icons = { + package_installed = "💚", + package_pending = "⏯", + package_uninstalled = "❤️", + }, + keymaps = { + -- Keymap to expand a package + toggle_package_expand = "", + -- Keymap to install the package under the current cursor position + install_package = "i", + -- Keymap to reinstall/update the package under the current cursor position + update_package = "u", + -- Keymap to check for new version for the package under the current cursor position + check_package_version = "c", + -- Keymap to update all installed packages + update_all_packages = "U", + -- Keymap to check which installed packages are outdated + check_outdated_packages = "C", + -- Keymap to uninstall a package + uninstall_package = "X", + -- Keymap to cancel a package installation + cancel_installation = "", + -- Keymap to apply language filter + apply_language_filter = "", + }, + }, }) diff --git a/.vim/ftplugin/markdown.vim b/.vim/ftplugin/markdown.vim index 391ce61..e440a43 100644 --- a/.vim/ftplugin/markdown.vim +++ b/.vim/ftplugin/markdown.vim @@ -1,7 +1,7 @@ setl cfu=emoji#complete setl et setl wrap -setl tw=0 +setl tw=80 nn f :Prettier nn c :!pandoc --wrap=preserve -s -o %:r.pdf % diff --git a/.vim/ftplugin/vue.vim b/.vim/ftplugin/vue.vim index 2ee2bb1..5681682 100644 --- a/.vim/ftplugin/vue.vim +++ b/.vim/ftplugin/vue.vim @@ -1,3 +1,3 @@ se sw=2 se ts=2 -" nn f :Prettier +nn g :Prettier diff --git a/.vim/plugins.vim b/.vim/plugins.vim index d930b09..563a002 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -26,11 +26,13 @@ if has('nvim') Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' - Plug 'SirVer/ultisnips' - Plug 'quangnguyen30192/cmp-nvim-ultisnips' Plug 'nvim-lua/plenary.nvim' Plug 'jose-elias-alvarez/null-ls.nvim' Plug 'mfussenegger/nvim-jdtls' + Plug 'MunifTanjim/prettier.nvim' + Plug 'saadparwaiz1/cmp_luasnip' + Plug 'L3MON4D3/LuaSnip' + Plug 'rafamadriz/friendly-snippets' else Plug 'Shougo/denite.nvim' Plug 'roxma/nvim-yarp' @@ -178,21 +180,6 @@ nn t :TestLast nn t :TestVisit -" |-----| -" | LSP | -" |-----| - -" nn vd :lua vim.lsp.buf.definition() -" nn vi :lua vim.lsp.buf.implementation() -" nn vsh :lua vim.lsp.buf.signature_help() -" nn vrr :lua vim.lsp.buf.references() -" nn vrn :lua vim.lsp.buf.rename() -" nn vh :lua vim.lsp.buf.hover() -" nn vca :lua vim.lsp.buf.code_action() -" nn vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics() -" nn vn :lua vim.lsp.diagnostic.goto_next() - - " |------| " | Test | " |------| @@ -277,4 +264,4 @@ if has('nvim') nn :Denite buffer file/rec endif -colo synthwave84 +colo gruvbox diff --git a/.zsh_aliases b/.zsh_aliases index 5ef1560..888bb71 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -1,14 +1,12 @@ -alias ..="cd .." -alias .="cd ." alias la="ls -A" alias ll="ls -lh" alias dof="/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME" -alias goBlog="cd $BLOGPATH" -alias goJW="cd $JWPATH" -alias goCode="cd $CODEPATH" -alias goWork="cd $WORKPATH" -alias goDotfiles="cd $HOME/.dotfiles" +alias blog="cd $BLOGPATH" +alias jw="cd $JWPATH" +alias code="cd $CODEPATH" +alias work="cd $WORKPATH" +alias dotfiles="cd $HOME/.dotfiles" alias mv="mv -i" alias n="nvim" @@ -40,9 +38,6 @@ alias sail="[ -f sail ] && bash sail || bash vendor/bin/sail" alias queue="sail artisan queue:work" alias serve="WWWUSER=$(id -u) docker-compose up" alias tinker="sail artisan tinker" -# alias tinker="docker exec -it alpha-laravel.test-1 php artisan tinker" - -alias sym="bin/console" alias ypr="yarn prod" alias yw="yarn watch" diff --git a/.zshrc b/.zshrc index 24a856c..f75af9b 100644 --- a/.zshrc +++ b/.zshrc @@ -52,9 +52,9 @@ _Tn="$(ps -f -p $_Tp | tail -1 | sed 's/^.* //')" _Tx="$(basename '/'$_Tn)" if [[ i3-msg ]]; then - _DirNum="dir" -else _DirNum="$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num' -r)" +else + _DirNum="dir" fi _CurrentDirFile="$HOME/.currentDirs/$_DirNum" From 0bc814f7c3d46a4ddef02afb2821311511a70060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Fri, 7 Apr 2023 22:12:20 -0600 Subject: [PATCH 29/46] feat: update vim plugins --- .config/i3/conf.d/20-workspaces.i3config | 4 ++-- .config/nvim/init.lua | 9 +++++++++ .vim/plugins.vim | 17 +---------------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 05f4d33..8316358 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary eDP-1 -set $nonprimary HDMI-1 +set $primary HDMI-1 +set $nonprimary eDP-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index e8cdd8e..d26706c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -159,6 +159,15 @@ require("lspconfig")["phpactor"].setup({ capabilities = capabilities, }) +require("lspconfig")["intelephense"].setup({ + on_attach = on_attach, + capabilities = capabilities, + cmd = { 'intelephense', '--stdio' }, + init_options = { + globalStoragePath = path.join(home, ".intelephense"), + } +}) + require("lspconfig")["jsonls"].setup({ on_attach = on_attach, capabilities = capabilities, diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 563a002..6cb85eb 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -139,21 +139,6 @@ let g:jekyll_post_template=[ \ ] -" |-----| -" | Php | -" |-----| -" no u :PhpactorImportClass -" no mm :PhpactorContextMenu -" no nn :PhpactorNavigate -" no o :PhpactorGotoDefinition -" no K :PhpactorHover -" no tt :PhpactorTransform -" no cc :PhpactorClassNew -" no ee :PhpactorExtractExpression(v:false) -" vn ee :PhpactorExtractExpression(v:true) -" vn em :PhpactorExtractMethod - - " |-----| " | C++ | " |-----| @@ -264,4 +249,4 @@ if has('nvim') nn :Denite buffer file/rec endif -colo gruvbox +colo synthwave84 From 99257b3c35f6a5b8f96b42a2d8a6c61c40586717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V?= Date: Thu, 25 May 2023 16:34:49 -0600 Subject: [PATCH 30/46] feat: improve zshrc --- .config/khotkeysrc | 4 ++-- .config/konsolerc | 1 + .config/xsettingsd/xsettingsd.conf | 10 ++++++---- .zshrc | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.config/khotkeysrc b/.config/khotkeysrc index 1ee891f..48d550b 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1,5 +1,5 @@ [$Version] -update_info=spectacle_shortcuts.upd:spectacle-migrate-shortcuts,konsole_globalaccel.upd:konsole_globalaccel +update_info=spectacle_shortcuts.upd:spectacle-migrate-shortcuts,konsole_globalaccel.upd:konsole_globalaccel,konsole.upd:konsole_globalaccel [ColorEffects:Disabled] ChangeSelectionColor[$d] @@ -1197,7 +1197,7 @@ Type=SIMPLE_ACTION_DATA ActionsCount=1 [Data_4_7Actions0] -CommandURL=telegram-desktop +CommandURL=/opt/Telegram/Telegram Type=COMMAND_URL [Data_4_7Conditions] diff --git a/.config/konsolerc b/.config/konsolerc index 81e0b55..3733904 100644 --- a/.config/konsolerc +++ b/.config/konsolerc @@ -36,6 +36,7 @@ Height 768=740 Height 800=711 Height 900=871 MenuBar=Disabled +RestorePositionForNextInstance=false State=AAAA/wAAAAD9AAAAAAAABVYAAALOAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAIAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAAAAAAHABzAGUAcwBzAGkAbwBuAFQAbwBvAGwAYgBhAHIAAAAAAP////8AAAAAAAAAAA== StatusBar=Disabled ToolBarsMovable=Disabled diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index 457a4a3..f33cfd7 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -1,11 +1,13 @@ +Gdk/UnscaledDPI 98304 +Gdk/WindowScalingFactor 1 Gtk/EnableAnimations 1 -Gtk/DecorationLayout "icon:minimize,maximize,close" +Gtk/DecorationLayout "close,minimize,maximize:icon" Gtk/PrimaryButtonWarpsSlider 0 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 Gtk/ButtonImages 1 Gtk/CursorThemeSize 24 -Gtk/CursorThemeName "breeze_cursors" -Net/IconThemeName "ePapirus-Dark" -Gtk/FontName "Montserrat, 10" +Gtk/CursorThemeName "Breeze_Obsidian" +Net/IconThemeName "Papirus-Dark" +Gtk/FontName "IBM Plex Sans, 10" diff --git a/.zshrc b/.zshrc index f75af9b..2378004 100644 --- a/.zshrc +++ b/.zshrc @@ -51,7 +51,7 @@ _Tp="$(cat /proc/$(echo $$)/stat | cut -d \ -f 4)" _Tn="$(ps -f -p $_Tp | tail -1 | sed 's/^.* //')" _Tx="$(basename '/'$_Tn)" -if [[ i3-msg ]]; then +if command -v i3-msg >/dev/null 2>&1; then _DirNum="$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num' -r)" else _DirNum="dir" From c7eb69c1336bf476257256c99c54c2cbc189c0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Wed, 6 Sep 2023 11:24:07 -0600 Subject: [PATCH 31/46] chore: update --- .config/nvim/init.lua | 38 ++++++++++++++++++++++---------------- .vim/ftplugin/markdown.vim | 2 +- .vim/ftplugin/vue.vim | 3 ++- .vim/plugins.vim | 8 +++++--- .zsh_aliases | 2 ++ 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d26706c..2e2dd52 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -16,7 +16,7 @@ local home = os.getenv("HOME") local null_ls = require("null-ls") -- luasnip setup -local luasnip = require 'luasnip' +local luasnip = require("luasnip") cmp.setup({ snippet = { @@ -25,14 +25,14 @@ cmp.setup({ end, }, mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.confirm { + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true, - }, - [''] = cmp.mapping(function(fallback) + }), + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -40,8 +40,8 @@ cmp.setup({ else fallback() end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif luasnip.jumpable(-1) then @@ -49,14 +49,14 @@ cmp.setup({ else fallback() end - end, { 'i', 's' }), + end, { "i", "s" }), }), sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, + { name = "nvim_lsp" }, + { name = "luasnip" }, { name = "buffer" }, { name = "path" }, - } + }, }) require("luasnip.loaders.from_vscode").lazy_load() @@ -134,6 +134,7 @@ require("lspconfig")["volar"].setup({ volar = { autoCompleteRefs = true, printWidth = 80, + shiftWidth = 2, }, }, }) @@ -162,10 +163,10 @@ require("lspconfig")["phpactor"].setup({ require("lspconfig")["intelephense"].setup({ on_attach = on_attach, capabilities = capabilities, - cmd = { 'intelephense', '--stdio' }, + cmd = { "intelephense", "--stdio" }, init_options = { globalStoragePath = path.join(home, ".intelephense"), - } + }, }) require("lspconfig")["jsonls"].setup({ @@ -178,6 +179,11 @@ require("lspconfig")["bashls"].setup({ capabilities = capabilities, }) +require("lspconfig")["clangd"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) + local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") project_name = project_name:gsub("%W", "_") local workspace_folder = vim.fn.expand("$HOME/.cache/jdtls/data/") .. project_name @@ -236,7 +242,6 @@ require("prettier").setup({ "javascriptreact", "json", "less", - "markdown", "scss", "typescript", "typescriptreact", @@ -245,6 +250,7 @@ require("prettier").setup({ cli_options = { print_width = 80, semi = false, + shift_width = 2, }, }) diff --git a/.vim/ftplugin/markdown.vim b/.vim/ftplugin/markdown.vim index e440a43..b16c4a3 100644 --- a/.vim/ftplugin/markdown.vim +++ b/.vim/ftplugin/markdown.vim @@ -4,4 +4,4 @@ setl wrap setl tw=80 nn f :Prettier -nn c :!pandoc --wrap=preserve -s -o %:r.pdf % +nn c :!pandoc --wrap=preserve -s -o "%:r.pdf" "%" diff --git a/.vim/ftplugin/vue.vim b/.vim/ftplugin/vue.vim index 5681682..ab5bfd0 100644 --- a/.vim/ftplugin/vue.vim +++ b/.vim/ftplugin/vue.vim @@ -1,3 +1,4 @@ se sw=2 se ts=2 -nn g :Prettier +nn f :Prettier +nn :Prettier diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 6cb85eb..46f1a2a 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -15,7 +15,7 @@ Plug 'sheerun/vim-polyglot' Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' -" Plug 'rajasegar/vim-astro', { 'branch': 'main' } +Plug 'rajasegar/vim-astro' if has('nvim') Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' } @@ -71,6 +71,8 @@ Plug 'lervag/vimtex' Plug 'rafi/awesome-vim-colorschemes' Plug 'artanikin/vim-synthwave84' +Plug 'brenoprata10/nvim-highlight-colors' + " PHP " Plug 'phpactor/phpactor', { 'for': 'php', 'tag': '*', 'do': 'composer install --no-dev -o' } cal plug#end() @@ -80,7 +82,7 @@ cal plug#end() " | Closetag | " |----------| let g:closetag_filenames = '*.html,*.php,*.jsx' -let g:closetag_filetypes = 'html,blade,vue,markdown,liquid' +let g:closetag_filetypes = 'html,blade,vue,markdown,liquid,astro' let g:closetag_xhtml_filenames = '*.xhtml,*.jsx' @@ -193,7 +195,7 @@ let g:vimtex_view_method = 'zathura' " |--------| if has('nvim') cal denite#custom#var('file/rec', 'command', [ - \ 'rg', '--files', '--hidden', + \ 'rg', '--files', '--hidden' \ ]) autocmd FileType denite cal s:denite_my_settings() diff --git a/.zsh_aliases b/.zsh_aliases index 888bb71..56b0ec9 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -46,3 +46,5 @@ alias yyd="yarn && yarn dev" alias yd="yarn dev" alias phpunit="./vendor/bin/phpunit" + +alias cremeriaXilo="ssh u440-2tzuhg2wm3b4@ssh.cremeriaxilo.com -p 18765" From d5cde9f8995a20825f0c80acd8c9eaefab2de3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Sat, 30 Dec 2023 23:00:33 -0600 Subject: [PATCH 32/46] feat: update dotfiles --- .bin/get-m3u-video | 6 +++++ .bin/i3status | 7 ++++++ .bin/kramdown-template | 37 +++++++++++++++++++++++++++++++ .bin/logwheel | 3 +++ .bin/reset-hdmi | 6 +++++ .bin/set-last-outputs | 16 ++++++++++++++ .config/konsolerc | 5 +++++ .config/nvim/init.lua | 50 ++++++++++++++++++++++++++++-------------- .vim/ftplugin/html.vim | 2 +- .vim/plugins.vim | 7 ++++-- .xinitrc | 5 +++-- .zsh_aliases | 1 - .zshrc | 4 ++++ 13 files changed, 127 insertions(+), 22 deletions(-) create mode 100755 .bin/get-m3u-video create mode 100755 .bin/i3status create mode 100755 .bin/kramdown-template create mode 100755 .bin/logwheel create mode 100755 .bin/reset-hdmi create mode 100755 .bin/set-last-outputs diff --git a/.bin/get-m3u-video b/.bin/get-m3u-video new file mode 100755 index 0000000..d084c86 --- /dev/null +++ b/.bin/get-m3u-video @@ -0,0 +1,6 @@ +#! /bin/bash + +# https://video.twimg.com/amplify_video/1669785809682046976/pl/720x720/4Et86JY_QPiiaGS-.m3u8?container=fmp4 +URL=$1 +OUT=$2 +ffmpeg -i "$URL" -c copy -bsf:a aac_adtstoasc $OUT diff --git a/.bin/i3status b/.bin/i3status new file mode 100755 index 0000000..8c35836 --- /dev/null +++ b/.bin/i3status @@ -0,0 +1,7 @@ +#! /bin/bash + +i3status $@ | while : +do + read line + echo "$line" || exit 1 +done diff --git a/.bin/kramdown-template b/.bin/kramdown-template new file mode 100755 index 0000000..27ef184 --- /dev/null +++ b/.bin/kramdown-template @@ -0,0 +1,37 @@ +#! /bin/bash + +PROGRAM=$(basename $0) + +OPTS=$(getopt -o 't:p:' --long 'template:,placeholder:' -n "$PROGRAM" -- "$@") + +if [ $? != 0 ] ; then echo "Error" >&2 ; exit 1 ; fi + +eval set -- "$OPTS" +unset OPTS + +TEMPLATE="template.html" +PLACEHOLDER="{{ content }}" + +while true; do + case "$1" in + -t | --template ) TEMPLATE="$2"; shift 2 ;; + -p | --placeholder ) PLACEHOLDER="$2"; shift 2 ;; + -- ) shift; break ;; + * ) break ;; + esac +done + +INPUT=$1 + +if [ ! -e "$INPUT" ]; then + echo "Archivo $INPUT no existe :("; + exit 1; +fi + +EXP="/$PLACEHOLDER/r" +REMOVE="s/$PLACEHOLDER//g" + +OUT=$(basename $INPUT .md) + +sed "$EXP"<(kramdown $INPUT) $TEMPLATE | sed "$REMOVE" > $OUT.html +echo "¡$OUT.html generado! 🎉" diff --git a/.bin/logwheel b/.bin/logwheel new file mode 100755 index 0000000..2bc1cd4 --- /dev/null +++ b/.bin/logwheel @@ -0,0 +1,3 @@ +#! /bin/bash + +echo "Params: $@" >> $HOME/.cache/wheelevent diff --git a/.bin/reset-hdmi b/.bin/reset-hdmi new file mode 100755 index 0000000..ea441ab --- /dev/null +++ b/.bin/reset-hdmi @@ -0,0 +1,6 @@ +#! /bin/bash + +xrandr --output HDMI-1 --off \ + && xrandr --output HDMI-1 --above eDP-1 --mode 1920x1080 + +~/.fehbg diff --git a/.bin/set-last-outputs b/.bin/set-last-outputs new file mode 100755 index 0000000..bab3282 --- /dev/null +++ b/.bin/set-last-outputs @@ -0,0 +1,16 @@ +#!/bin/bash + +# # # # # # # # # # # # # # # # # # # # # # # # # # # +# Setup to set last output arrangement with xrandr # +# # # # # # # # # # # # # # # # # # # # # # # # # # # + +get_selected_output () { + rg "set $1" ~/.config/i3/conf.d/20-workspaces.i3config | awk '{ print $3 }' +} + +PRIMARY=$(get_selected_output '\$primary') +NOPRIMARY=$(get_selected_output '\$nonprimary') + +xrandr --output "$NOPRIMARY" --noprimary +xrandr --output "$PRIMARY" --primary + diff --git a/.config/konsolerc b/.config/konsolerc index 3733904..fdc3ca1 100644 --- a/.config/konsolerc +++ b/.config/konsolerc @@ -26,6 +26,11 @@ ShowMenuBarByDefault=false UseSingleInstance=true [MainWindow] +2 screens: Height=1053 +2 screens: Width=640 +2 screens: XPosition=1280 +2 screens: YPosition=27 +HDMI-1 eDP-1=HDMI-1 HDMI-1 eDP-1 Height 1920x1080=740 HDMI-1 eDP-1 Width 1920x1080=1366 HDMI-1 eDP-1 XPosition 1920x1080=1643 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2e2dd52..c2c40bf 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -109,26 +109,29 @@ require("lspconfig")["tsserver"].setup({ }) local util = require("lspconfig.util") -local path = util.path -local volar_path = path.join(vim.fn.stdpath("data"), "lsp_servers", "volar", "node_modules") -local global_ts_server_path = path.join(volar_path, "typescript", "lib") - -local function get_typescript_lib_path(root_dir) - local project_root = util.find_node_modules_ancestor(root_dir) - return project_root and (path.join(project_root, "node_modules", "typescript", "lib")) or global_ts_server_path +local function get_typescript_server_path(root_dir) + local global_ts = + util.path.join(home, ".nvm", "versions", "node", "v18.17.1", "lib", "node_modules", "typescript", "lib") + local found_ts = "" + local function check_dir(path) + found_ts = util.path.join(path, "node_modules", "typescript", "lib") + if util.path.exists(found_ts) then + return path + end + end + if util.search_ancestors(root_dir, check_dir) then + return found_ts + else + return global_ts + end end require("lspconfig")["volar"].setup({ on_attach = on_attach, filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, capabilities = capabilities, - init_options = { - typescript = { - tsdk = path.join(home, ".config", "yarn", "global", "node_modules", "typescript", "lib", "tsserverlibrary.js"), - }, - }, on_new_config = function(new_config, new_root_dir) - new_config.init_options.typescript.tsdk = get_typescript_lib_path(new_root_dir) + new_config.init_options.typescript.tsdk = get_typescript_server_path(new_root_dir) end, settings = { volar = { @@ -165,7 +168,7 @@ require("lspconfig")["intelephense"].setup({ capabilities = capabilities, cmd = { "intelephense", "--stdio" }, init_options = { - globalStoragePath = path.join(home, ".intelephense"), + globalStoragePath = util.path.join(home, ".intelephense"), }, }) @@ -184,13 +187,26 @@ require("lspconfig")["clangd"].setup({ capabilities = capabilities, }) +local project_library_path = "/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" +local cmd = + { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } + +require("lspconfig")["angularls"].setup({ + on_attach = on_attach, + capabilities = capabilities, + cmd = cmd, + on_new_config = function(new_config, new_root_dir) + new_config.cmd = cmd + end, +}) + local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") project_name = project_name:gsub("%W", "_") local workspace_folder = vim.fn.expand("$HOME/.cache/jdtls/data/") .. project_name require("lspconfig")["jdtls"].setup({ cmd = { - path.join(vim.fn.stdpath("data"), "bin", "jdtls"), + util.path.join(vim.fn.stdpath("data"), "bin", "jdtls"), "-data", workspace_folder, }, @@ -204,7 +220,7 @@ require("lspconfig")["jdtls"].setup({ -- Use Google Java style guidelines for formatting -- To use, make sure to download the file from https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml -- and place it in the ~/.local/share/eclipse directory - url = path.join(home, ".local", "share", "eclipse", "eclipse-java-google-style.xml"), + url = util.path.join(home, ".local", "share", "eclipse", "eclipse-java-google-style.xml"), profile = "GoogleStyle", }, }, @@ -254,6 +270,8 @@ require("prettier").setup({ }, }) +print(vim.fn.stdpath("data")) + require("mason").setup({ install_root_dir = vim.fn.stdpath("data"), PATH = "prepend", diff --git a/.vim/ftplugin/html.vim b/.vim/ftplugin/html.vim index ba6e5cb..86157d3 100644 --- a/.vim/ftplugin/html.vim +++ b/.vim/ftplugin/html.vim @@ -1 +1 @@ -" nn :Prettier +nn :Prettier diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 46f1a2a..77c6fb2 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -15,7 +15,8 @@ Plug 'sheerun/vim-polyglot' Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' -Plug 'rajasegar/vim-astro' +Plug 'wuelnerdotexe/vim-astro' +" Plug 'rajasegar/vim-astro' if has('nvim') Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' } @@ -251,4 +252,6 @@ if has('nvim') nn :Denite buffer file/rec endif -colo synthwave84 +let g:astro_typescript = 'enable' + +colo gruvbox diff --git a/.xinitrc b/.xinitrc index 0b26fca..fd239cd 100644 --- a/.xinitrc +++ b/.xinitrc @@ -8,8 +8,9 @@ $HOME/.fehbg & /usr/bin/blueman-applet & $HOME/.bin/set-last-outputs -eval $(gnome-keyring-daemon --start) -export SSH_AUTH_SOCK +#eval $(kwalletd5) +# eval $(gnome-keyring-daemon --start) +# export SSH_AUTH_SOCK export DESKTOP_SESSION='i3' exec i3 > $HOME/.cache/i3out 2> $HOME/.cache/i3err diff --git a/.zsh_aliases b/.zsh_aliases index 56b0ec9..d61ae8a 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -4,7 +4,6 @@ alias dof="/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME" alias blog="cd $BLOGPATH" alias jw="cd $JWPATH" -alias code="cd $CODEPATH" alias work="cd $WORKPATH" alias dotfiles="cd $HOME/.dotfiles" diff --git a/.zshrc b/.zshrc index 2378004..0433155 100644 --- a/.zshrc +++ b/.zshrc @@ -138,3 +138,7 @@ source /usr/share/nvm/init-nvm.sh export PNPM_HOME="$HOME/.local/share/pnpm" export PATH="$PNPM_HOME:$PATH" # pnpm end + + +# Load Angular CLI autocompletion. +source <(ng completion script) From 2a91dccc3abb24c07f83413a84ce46bbf21eab15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Tue, 2 Jan 2024 09:11:04 -0600 Subject: [PATCH 33/46] feat: update alacritty --- .config/alacritty/alacritty.toml | 76 +++++++++++++++++++++++++++++ .config/alacritty/alacritty.yml | 82 -------------------------------- 2 files changed, 76 insertions(+), 82 deletions(-) create mode 100644 .config/alacritty/alacritty.toml delete mode 100644 .config/alacritty/alacritty.yml diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..5d05e07 --- /dev/null +++ b/.config/alacritty/alacritty.toml @@ -0,0 +1,76 @@ +[colors] +draw_bold_text_with_bright_colors = true + +[colors.bright] +black = "0x928374" +blue = "0x83a598" +cyan = "0x8ec07c" +green = "0xb8bb26" +magenta = "0xd3869b" +red = "0xfb4934" +white = "0xebdbb2" +yellow = "0xfabd2f" + +[colors.cursor] +cursor = "0x878787" +text = "0xeeeeee" + +[colors.dim] +black = "0x31363b" +blue = "0x1b668f" +cyan = "0x186c60" +green = "0x17a262" +magenta = "0x614a73" +red = "0x783228" +white = "0x63686d" +yellow = "0xb65619" + +[colors.normal] +black = "0x282828" +blue = "0x458588" +cyan = "0x689d6a" +green = "0x98971a" +magenta = "0xb16286" +red = "0xcc241d" +white = "0xa89984" +yellow = "0xd79921" + +[colors.primary] +background = "0x282828" +foreground = "0xebdbb2" + +[cursor] +style = "Underline" + +[font] +size = 12 + +[font.bold] +family = "Iosevka" +style = "Bold" + +[font.italic] +family = "Iosevka" +style = "Italic" + +[font.normal] +family = "Iosevka" +style = "Regular" + +[[keyboard.bindings]] +chars = "\u001B[27;5;9~" +key = "Tab" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[27;6;9~" +key = "Tab" +mods = "Control|Shift" + +[mouse] +hide_when_typing = true + +[window] +dynamic_padding = true +opacity = 0.93 +title = "Terminal" diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index cb6c033..0000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,82 +0,0 @@ -window: - title: Terminal - dynamic_padding: true - opacity: 0.93 - -font: - normal: - family: Iosevka - style: Regular - - bold: - family: Iosevka - style: Bold - - italic: - family: Iosevka - style: Italic - - size: 12 - - draw_bold_text_with_bright_colors: true - -mouse: - hide_when_typing: true - -cursor: - style: Underline - -key_bindings: - - {key: Tab, mods: Control, chars: "\e[27;5;9~"} - - {key: Tab, mods: Control|Shift, chars: "\e[27;6;9~"} - -# shell: -# program: /bin/zsh - -# color_start -# gruvbox_light.yaml -# Colors (Gruvbox light) -colors: - # COLORSCHEME: gruvbox_dark.yaml - # Default colors - primary: - # hard contrast: background = '0xf9f5d7' - background: '0x282828' - # soft contrast: background = '0x32302f' - foreground: '0xebdbb2' - - # Normal colors - normal: - black: '0x282828' - red: '0xcc241d' - green: '0x98971a' - yellow: '0xd79921' - blue: '0x458588' - magenta: '0xb16286' - cyan: '0x689d6a' - white: '0xa89984' - - # Bright colors - bright: - black: '0x928374' - red: '0xfb4934' - green: '0xb8bb26' - yellow: '0xfabd2f' - blue: '0x83a598' - magenta: '0xd3869b' - cyan: '0x8ec07c' - white: '0xebdbb2' - dim: - black: '0x31363b' - red: '0x783228' - green: '0x17a262' - yellow: '0xb65619' - blue: '0x1b668f' - magenta: '0x614a73' - cyan: '0x186c60' - white: '0x63686d' - cursor: - text: '0xeeeeee' - cursor: '0x878787' - - # Normal colors From 1e8443176282f6e2c2a831da6f5d2dfc275c15af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 8 Jan 2024 08:26:14 -0600 Subject: [PATCH 34/46] feat: update submodules names --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index de7f871..76dfc5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule ".config/alacritty/themes"] +[submodule "alacritty-themes"] path = .config/alacritty/themes url = https://github.com/eendroroy/alacritty-theme -[submodule ".config/vifm/colors"] +[submodule "vifm-colors"] path = .config/vifm/colors url = https://github.com/vifm/vifm-colors.git From e2dbf7ed0314a7cd161ddd0ef2af76397026d178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 8 Jan 2024 08:32:06 -0600 Subject: [PATCH 35/46] feat: update submodules --- .config/alacritty/themes | 2 +- .config/vifm/colors | 2 +- .gitmodules | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/alacritty/themes b/.config/alacritty/themes index ade1c91..4651f27 160000 --- a/.config/alacritty/themes +++ b/.config/alacritty/themes @@ -1 +1 @@ -Subproject commit ade1c9114cf37d0239c3499b74c8196cf1e6aee4 +Subproject commit 4651f270f942d52fda766e47f7dc439addb39051 diff --git a/.config/vifm/colors b/.config/vifm/colors index 0bbf3de..a5ddebd 160000 --- a/.config/vifm/colors +++ b/.config/vifm/colors @@ -1 +1 @@ -Subproject commit 0bbf3de1ad44b92a55a654eeb68fd06c37a6cd70 +Subproject commit a5ddebd615dff1ae9bd7ad31b628dad6edf3c991 diff --git a/.gitmodules b/.gitmodules index 76dfc5a..4edbc8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,8 @@ [submodule "alacritty-themes"] path = .config/alacritty/themes url = https://github.com/eendroroy/alacritty-theme + branch = master [submodule "vifm-colors"] path = .config/vifm/colors url = https://github.com/vifm/vifm-colors.git + branch = master From 96138300a2b8b71b20c9717b5d6c28324d380177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 8 Jan 2024 08:45:20 -0600 Subject: [PATCH 36/46] feat: update alacritty-themes url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4edbc8b..12f5518 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "alacritty-themes"] path = .config/alacritty/themes - url = https://github.com/eendroroy/alacritty-theme + url = https://github.com/alacritty/alacritty-theme.git branch = master [submodule "vifm-colors"] path = .config/vifm/colors From 0a3e6940425a46fa5d31898fc671c807eb6cc3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 8 Jan 2024 08:48:47 -0600 Subject: [PATCH 37/46] feat: update alacritty themes --- .config/alacritty/themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/alacritty/themes b/.config/alacritty/themes index 4651f27..18db83a 160000 --- a/.config/alacritty/themes +++ b/.config/alacritty/themes @@ -1 +1 @@ -Subproject commit 4651f270f942d52fda766e47f7dc439addb39051 +Subproject commit 18db83a37d58c453b3ae98aeda54edfa12b834ba From 06dd6c9d5ab4d846c6b8126612b62d9ed669c81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Fri, 19 Jul 2024 16:03:07 -0600 Subject: [PATCH 38/46] feat: update i3 and dotfiles --- .config/alacritty/alacritty.toml | 42 ++------------------- .config/gtk-3.0/settings.ini | 25 ++++++++----- .config/i3/conf.d/applications.i3config | 4 +- .config/i3/conf.d/clients.i3config | 13 +++++++ .config/i3/conf.d/shortcuts.i3config | 4 +- .config/i3/conf.d/system-mode.i3config | 3 +- .config/i3status/config | 6 +-- .config/khotkeysrc | 2 +- .config/nvim/init.lua | 50 ++++++++++++++++++++----- .config/xsettingsd/xsettingsd.conf | 12 +++--- .gitconfig | 2 + .vim/ftplugin/json.vim | 2 +- .zsh_aliases | 1 - .zshrc | 2 +- 14 files changed, 94 insertions(+), 74 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 5d05e07..cb686f5 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,44 +1,10 @@ +import = [ + "~/.config/alacritty/themes/themes/gruvbox_dark.toml" +] + [colors] draw_bold_text_with_bright_colors = true -[colors.bright] -black = "0x928374" -blue = "0x83a598" -cyan = "0x8ec07c" -green = "0xb8bb26" -magenta = "0xd3869b" -red = "0xfb4934" -white = "0xebdbb2" -yellow = "0xfabd2f" - -[colors.cursor] -cursor = "0x878787" -text = "0xeeeeee" - -[colors.dim] -black = "0x31363b" -blue = "0x1b668f" -cyan = "0x186c60" -green = "0x17a262" -magenta = "0x614a73" -red = "0x783228" -white = "0x63686d" -yellow = "0xb65619" - -[colors.normal] -black = "0x282828" -blue = "0x458588" -cyan = "0x689d6a" -green = "0x98971a" -magenta = "0xb16286" -red = "0xcc241d" -white = "0xa89984" -yellow = "0xd79921" - -[colors.primary] -background = "0x282828" -foreground = "0xebdbb2" - [cursor] style = "Underline" diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index e8a69fd..bd6c359 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,15 +1,22 @@ [Settings] -gtk-cursor-theme-name=Breeze_Obsidian -gtk-theme-name=Breeze -gtk-icon-theme-name=Papirus-Dark -gtk-font-name=Montserrat 11 -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 +gtk-application-prefer-dark-theme=false +gtk-button-images=true +gtk-cursor-theme-name=breeze_cursors +gtk-cursor-theme-size=24 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 +gtk-font-name=Montserrat, 10 +gtk-icon-theme-name=breeze +gtk-menu-images=true +gtk-modules=window-decorations-gtk-module:colorreload-gtk-module +gtk-primary-button-warps-slider=true +gtk-sound-theme-name=ocean +gtk-theme-name=Breeze +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=3 gtk-xft-antialias=1 +gtk-xft-dpi=98304 gtk-xft-hinting=1 gtk-xft-hintstyle=hintmedium diff --git a/.config/i3/conf.d/applications.i3config b/.config/i3/conf.d/applications.i3config index 2ca1911..2f56706 100644 --- a/.config/i3/conf.d/applications.i3config +++ b/.config/i3/conf.d/applications.i3config @@ -7,11 +7,9 @@ bindsym $mod+$alt+t exec /usr/bin/telegram-desktop bindsym $mod+$alt+b exec /usr/bin/firefox-developer-edition bindsym $mod+$alt+m exec /usr/bin/thunderbird bindsym $mod+$alt+d exec /bin/discord -bindsym $mod+$alt+4 exec /bin/TogglDesktop bindsym $mod+$alt+p exec pavucontrol bindsym $mod+$alt+c exec $HOME/.bin/vscode -bindsym $mod+$alt+n exec nemo -bindsym $mod+$alt+z exec zoom +bindsym $mod+$alt+n exec dolphin bindsym $mod+$alt+o exec /usr/bin/obsidian exec --no-startup-id kdeconnect-indicator diff --git a/.config/i3/conf.d/clients.i3config b/.config/i3/conf.d/clients.i3config index 55efc49..cfc1891 100644 --- a/.config/i3/conf.d/clients.i3config +++ b/.config/i3/conf.d/clients.i3config @@ -12,3 +12,16 @@ for_window [window_role="task_dialog"] floating enable for_window [class="^zoom$"] floating enable +for_window [title="Desktop — Plasma"] kill, floating enable, border none +for_window [class="plasmashell"] floating enable +for_window [class="Plasma"] floating enable, border none +for_window [title="plasma-desktop"] floating enable, border none +for_window [title="win7"] floating enable, border none +for_window [class="krunner"] floating enable, border none +for_window [class="Kmix"] floating enable, border none +for_window [class="Klipper"] floating enable, border none +for_window [class="Plasmoidviewer"] floating enable, border none +for_window [class="(?i)*nextcloud*"] floating disable +for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px +no_focus [class="plasmashell" window_type="notification"] + diff --git a/.config/i3/conf.d/shortcuts.i3config b/.config/i3/conf.d/shortcuts.i3config index 10b9ca8..76bad60 100644 --- a/.config/i3/conf.d/shortcuts.i3config +++ b/.config/i3/conf.d/shortcuts.i3config @@ -17,8 +17,8 @@ bindsym XF86AudioPlay exec --no-startup-id pgrep pragha && pragha --pause bindsym XF86AudioNext exec --no-startup-id pgrep pragha && pragha --next bindsym XF86AudioPrev exec --no-startup-id pgrep pragha && pragha --prev -bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id light -A 5% -bindsym Shift+XF86AudioLowerVolume exec --no-startup-id light -U 5% +# bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id light -A 5% +# bindsym Shift+XF86AudioLowerVolume exec --no-startup-id light -U 5% bindsym $mod+Shift+b exec --no-startup-id $HOME/.local/bin/alacritty-colorscheme -C $HOME/.config/alacritty/colors toggle bindsym $mod+q kill diff --git a/.config/i3/conf.d/system-mode.i3config b/.config/i3/conf.d/system-mode.i3config index 0d2c44a..c0e98d3 100644 --- a/.config/i3/conf.d/system-mode.i3config +++ b/.config/i3/conf.d/system-mode.i3config @@ -13,5 +13,6 @@ mode "$m_system" { bindsym Escape mode "default" } -bindsym $mod+Control+0 mode "$m_system" +# bindsym $mod+Control+0 mode "$m_system" +bindsym $mod+Control+0 exec --no-startup-id "loginctl lock-session 2" diff --git a/.config/i3status/config b/.config/i3status/config index e578646..4854193 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -16,7 +16,7 @@ general { } # order += "ipv6" -order += "wireless wlan0" +order += "wireless wlo1" order += "ethernet _first_" order += "battery 0" # order += "disk /" @@ -25,7 +25,7 @@ order += "battery 0" order += "volume master" order += "tztime local" -wireless wlan0 { +wireless wlo1 { format_up = " %essid (%quality)" format_down = "" } @@ -64,7 +64,7 @@ tztime local { } volume master { - format = " %volume" + format = " %volume" format_muted = "" device = "default" mixer = "Master" diff --git a/.config/khotkeysrc b/.config/khotkeysrc index 48d550b..bb5aed4 100644 --- a/.config/khotkeysrc +++ b/.config/khotkeysrc @@ -1079,7 +1079,7 @@ Comment=Simple_action TriggersCount=1 [Data_4_2Triggers0] -Key=Meta+. +Key= Type=SHORTCUT Uuid={9a3f02e2-af68-4751-9587-95baeeea0d27} diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index c2c40bf..8c71c7a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -111,7 +111,7 @@ require("lspconfig")["tsserver"].setup({ local util = require("lspconfig.util") local function get_typescript_server_path(root_dir) local global_ts = - util.path.join(home, ".nvm", "versions", "node", "v18.17.1", "lib", "node_modules", "typescript", "lib") + util.path.join(home, ".nvm", "versions", "node", "v18.19.0", "lib", "node_modules", "typescript", "lib") local found_ts = "" local function check_dir(path) found_ts = util.path.join(path, "node_modules", "typescript", "lib") @@ -133,13 +133,11 @@ require("lspconfig")["volar"].setup({ on_new_config = function(new_config, new_root_dir) new_config.init_options.typescript.tsdk = get_typescript_server_path(new_root_dir) end, - settings = { - volar = { - autoCompleteRefs = true, - printWidth = 80, - shiftWidth = 2, - }, - }, + init_options = { + vue = { + hybridMode = false, + } + } }) require("lspconfig")["cssls"].setup({ @@ -154,6 +152,34 @@ require("lspconfig")["astro"].setup({ }) require("lspconfig")["lua_ls"].setup({ + on_init = function(client) + local path = client.workspace_folders[1].name + if not vim.loop.fs_stat(path .. "/.luarc.json") and not vim.loop.fs_stat(path .. "/.luarc.jsonc") then + client.config.settings = vim.tbl_deep_extend("force", client.config.settings, { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using + -- (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + -- "${3rd}/luv/library" + -- "${3rd}/busted/library", + }, + -- or pull in all of 'runtimepath'. NOTE: this is a lot slower + -- library = vim.api.nvim_get_runtime_file("", true) + }, + }, + }) + + client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) + end + return true + end, on_attach = on_attach, capabilities = capabilities, }) @@ -187,7 +213,8 @@ require("lspconfig")["clangd"].setup({ capabilities = capabilities, }) -local project_library_path = "/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" +local project_library_path = + "/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" local cmd = { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } @@ -228,6 +255,11 @@ require("lspconfig")["jdtls"].setup({ }, }) +require("lspconfig")["tailwindcss"].setup({ + on_attach = on_attach, + capabilities = capabilities, +}) + null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index f33cfd7..e8f5ff2 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -1,13 +1,15 @@ +Net/ThemeName "Breeze" +Net/SoundThemeName "ocean" Gdk/UnscaledDPI 98304 Gdk/WindowScalingFactor 1 Gtk/EnableAnimations 1 -Gtk/DecorationLayout "close,minimize,maximize:icon" -Gtk/PrimaryButtonWarpsSlider 0 +Gtk/DecorationLayout "icon:minimize,maximize,close" +Gtk/PrimaryButtonWarpsSlider 1 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 Gtk/ButtonImages 1 Gtk/CursorThemeSize 24 -Gtk/CursorThemeName "Breeze_Obsidian" -Net/IconThemeName "Papirus-Dark" -Gtk/FontName "IBM Plex Sans, 10" +Gtk/CursorThemeName "breeze_cursors" +Net/IconThemeName "breeze" +Gtk/FontName "Montserrat, 10" diff --git a/.gitconfig b/.gitconfig index 28029c4..0a5a63f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -18,3 +18,5 @@ gpgSign = true [push] autoSetupRemote = true +[maintenance] + repo = /home/hali/Documents/JW/outlines diff --git a/.vim/ftplugin/json.vim b/.vim/ftplugin/json.vim index 9df4fe3..86157d3 100644 --- a/.vim/ftplugin/json.vim +++ b/.vim/ftplugin/json.vim @@ -1 +1 @@ -" nn f :Prettier +nn :Prettier diff --git a/.zsh_aliases b/.zsh_aliases index d61ae8a..1a9cacb 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -46,4 +46,3 @@ alias yd="yarn dev" alias phpunit="./vendor/bin/phpunit" -alias cremeriaXilo="ssh u440-2tzuhg2wm3b4@ssh.cremeriaxilo.com -p 18765" diff --git a/.zshrc b/.zshrc index 0433155..85b9f95 100644 --- a/.zshrc +++ b/.zshrc @@ -141,4 +141,4 @@ export PATH="$PNPM_HOME:$PATH" # Load Angular CLI autocompletion. -source <(ng completion script) +# source <(ng completion script) From cae91b6ed5cd2cd8f0ea0383d3c8cdaea68c7e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Fri, 4 Oct 2024 11:11:29 -0600 Subject: [PATCH 39/46] chore: updates --- .config/gtk-3.0/settings.ini | 4 ++-- .config/konsolerc | 3 +-- .config/nvim/init.lua | 2 +- .config/xsettingsd/xsettingsd.conf | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index bd6c359..3013a35 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -3,11 +3,11 @@ gtk-application-prefer-dark-theme=false gtk-button-images=true gtk-cursor-theme-name=breeze_cursors gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close +gtk-decoration-layout=close,minimize,maximize:icon gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 -gtk-font-name=Montserrat, 10 +gtk-font-name=Iosevka Nerd Font, 10 gtk-icon-theme-name=breeze gtk-menu-images=true gtk-modules=window-decorations-gtk-module:colorreload-gtk-module diff --git a/.config/konsolerc b/.config/konsolerc index fdc3ca1..f456904 100644 --- a/.config/konsolerc +++ b/.config/konsolerc @@ -6,7 +6,7 @@ eDP-1 HDMI-1 XPosition 1366x768=0 eDP-1 HDMI-1 YPosition 1366x768=26 [Desktop Entry] -DefaultProfile=Konsole dark.profile +DefaultProfile=Profile 1.profile [Favorite Profiles] Favorites=Yakuake.profile,Gifs.profile,Yakuake-Day.profile @@ -42,7 +42,6 @@ Height 800=711 Height 900=871 MenuBar=Disabled RestorePositionForNextInstance=false -State=AAAA/wAAAAD9AAAAAAAABVYAAALOAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAIAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAAAAAAHABzAGUAcwBzAGkAbwBuAFQAbwBvAGwAYgBhAHIAAAAAAP////8AAAAAAAAAAA== StatusBar=Disabled ToolBarsMovable=Disabled Width 1280=1366 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8c71c7a..eb9d3d7 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -102,7 +102,7 @@ local lsp_flags = { debounce_text_changes = 150, } -require("lspconfig")["tsserver"].setup({ +require("lspconfig")["ts_ls"].setup({ on_attach = on_attach, flags = lsp_flags, capabilities = capabilities, diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index e8f5ff2..a6e0e47 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -3,7 +3,7 @@ Net/SoundThemeName "ocean" Gdk/UnscaledDPI 98304 Gdk/WindowScalingFactor 1 Gtk/EnableAnimations 1 -Gtk/DecorationLayout "icon:minimize,maximize,close" +Gtk/DecorationLayout "close,minimize,maximize:icon" Gtk/PrimaryButtonWarpsSlider 1 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 @@ -11,5 +11,5 @@ Gtk/ButtonImages 1 Gtk/CursorThemeSize 24 Gtk/CursorThemeName "breeze_cursors" Net/IconThemeName "breeze" -Gtk/FontName "Montserrat, 10" +Gtk/FontName "Iosevka Nerd Font, 10" From facb608649585eb238a8fd695d6abf60b107981b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Sat, 7 Dec 2024 18:34:57 -0600 Subject: [PATCH 40/46] chore: update bluejay --- .config/alacritty/alacritty.toml | 8 +++++--- .config/nvim/init.lua | 8 +++++++- .gitconfig | 4 ++++ .vim/plugins.vim | 1 + .zshrc | 1 + 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index cb686f5..3886fc2 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,6 +1,3 @@ -import = [ - "~/.config/alacritty/themes/themes/gruvbox_dark.toml" -] [colors] draw_bold_text_with_bright_colors = true @@ -40,3 +37,8 @@ hide_when_typing = true dynamic_padding = true opacity = 0.93 title = "Terminal" + +[general] +import = [ + "~/.config/alacritty/themes/themes/gruvbox_dark.toml" +] diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index eb9d3d7..92015ae 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -302,7 +302,13 @@ require("prettier").setup({ }, }) -print(vim.fn.stdpath("data")) +require("nvls").setup({ + lilypond = { + options = { + pdf_viewer = 'zathura' + } + } +}) require("mason").setup({ install_root_dir = vim.fn.stdpath("data"), diff --git a/.gitconfig b/.gitconfig index 0a5a63f..fa0f02a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -14,9 +14,13 @@ ff = no [credential] helper = /usr/lib/git-core/git-credential-libsecret + helper = + helper = /usr/bin/git-credential-manager [commit] gpgSign = true [push] autoSetupRemote = true [maintenance] repo = /home/hali/Documents/JW/outlines +[credential "https://dev.azure.com"] + useHttpPath = true diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 77c6fb2..c3b6723 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -16,6 +16,7 @@ Plug 'mboughaba/i3config.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/limelight.vim' Plug 'wuelnerdotexe/vim-astro' +Plug 'martineausimon/nvim-lilypond-suite' " Plug 'rajasegar/vim-astro' if has('nvim') diff --git a/.zshrc b/.zshrc index 85b9f95..da09e79 100644 --- a/.zshrc +++ b/.zshrc @@ -3,6 +3,7 @@ fpath=(~/.zsh $fpath) export XDG_CONFIG_HOME="$HOME/.config" +export GCM_CREDENTIAL_STORE=secretservice export EDITOR="nvim" export TEXMFHOME="/home/hali/.texmf" From 8349666bec32d9b3f82dea4e81f57ad98baa592a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Sun, 8 Dec 2024 17:21:27 -0600 Subject: [PATCH 41/46] feat: raven update --- .config/i3/conf.d/20-workspaces.i3config | 4 ++-- .config/i3status/config | 4 ++-- .xinitrc | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.config/i3/conf.d/20-workspaces.i3config b/.config/i3/conf.d/20-workspaces.i3config index 8316358..05f4d33 100644 --- a/.config/i3/conf.d/20-workspaces.i3config +++ b/.config/i3/conf.d/20-workspaces.i3config @@ -2,8 +2,8 @@ # | Workspaces | # |------------| -set $primary HDMI-1 -set $nonprimary eDP-1 +set $primary eDP-1 +set $nonprimary HDMI-1 # xrandr --prop | ag primary | awk '{ print $1 }' # xrandr --prop | ag connected | awk '{ print $1 }' | xargs diff --git a/.config/i3status/config b/.config/i3status/config index 4854193..84eb743 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -16,7 +16,7 @@ general { } # order += "ipv6" -order += "wireless wlo1" +order += "wireless wlan0" order += "ethernet _first_" order += "battery 0" # order += "disk /" @@ -25,7 +25,7 @@ order += "battery 0" order += "volume master" order += "tztime local" -wireless wlo1 { +wireless wlan0 { format_up = " %essid (%quality)" format_down = "" } diff --git a/.xinitrc b/.xinitrc index fd239cd..8d7c020 100644 --- a/.xinitrc +++ b/.xinitrc @@ -12,5 +12,6 @@ $HOME/.bin/set-last-outputs # eval $(gnome-keyring-daemon --start) # export SSH_AUTH_SOCK +echo "Hola hehehe" > /tmp/saludo export DESKTOP_SESSION='i3' exec i3 > $HOME/.cache/i3out 2> $HOME/.cache/i3err From 57b72a2f5e48a43204a057e94924f75ffbae122e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Sun, 8 Dec 2024 17:59:09 -0600 Subject: [PATCH 42/46] feat: update bluejay --- .cheatsheet-unicode | 1 + .config/alacritty/alacritty.toml | 9 ++-- .config/i3/conf.d/system-mode.i3config | 4 +- .config/i3status/config | 18 +++---- .config/nvim/init.lua | 73 +++++++++----------------- .xinitrc | 2 +- .zshrc | 6 +-- 7 files changed, 45 insertions(+), 68 deletions(-) diff --git a/.cheatsheet-unicode b/.cheatsheet-unicode index 004be58..211f45a 100644 --- a/.cheatsheet-unicode +++ b/.cheatsheet-unicode @@ -1,4 +1,5 @@ # TODO: order by categories +# Font: Ionicons f100  f101  diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 3886fc2..eaba526 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,3 +1,7 @@ +[general] +import = [ + "~/.config/alacritty/themes/themes/gruvbox_light.toml" +] [colors] draw_bold_text_with_bright_colors = true @@ -37,8 +41,3 @@ hide_when_typing = true dynamic_padding = true opacity = 0.93 title = "Terminal" - -[general] -import = [ - "~/.config/alacritty/themes/themes/gruvbox_dark.toml" -] diff --git a/.config/i3/conf.d/system-mode.i3config b/.config/i3/conf.d/system-mode.i3config index c0e98d3..e64a11f 100644 --- a/.config/i3/conf.d/system-mode.i3config +++ b/.config/i3/conf.d/system-mode.i3config @@ -13,6 +13,6 @@ mode "$m_system" { bindsym Escape mode "default" } -# bindsym $mod+Control+0 mode "$m_system" -bindsym $mod+Control+0 exec --no-startup-id "loginctl lock-session 2" +bindsym $mod+Control+0 mode "$m_system" +# bindsym $mod+Control+0 exec --no-startup-id "loginctl lock-session 2" diff --git a/.config/i3status/config b/.config/i3status/config index 84eb743..d85a6c6 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -25,9 +25,9 @@ order += "battery 0" order += "volume master" order += "tztime local" -wireless wlan0 { - format_up = " %essid (%quality)" - format_down = "" +wireless wlo1 { + format_up = " %essid (%quality)" + format_down = " " } ethernet _first_ { @@ -37,10 +37,10 @@ ethernet _first_ { battery 0 { format = "%status %percentage" - status_chr = "" - status_bat = "" - status_full = "" - status_unk = "?" + status_chr = " " + status_bat = " " + status_full = " " + status_unk = " " path = "/sys/class/power_supply/BAT%d/uevent" low_threshold = 21 } @@ -64,8 +64,8 @@ tztime local { } volume master { - format = " %volume" - format_muted = "" + format = " %volume" + format_muted = " " device = "default" mixer = "Master" mixer_idx = 0 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 92015ae..0aad10b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -102,40 +102,37 @@ local lsp_flags = { debounce_text_changes = 150, } +local util = require("lspconfig.util") +local path = util.path +local node_modules_path = path.join(home, ".nvm", "versions", "node", "v20.11.0", "lib", "node_modules") +local vue_plugin_path = path.join(node_modules_path, "@vue", "typescript-plugin") + require("lspconfig")["ts_ls"].setup({ + init_options = { + plugins = { + { + name = "@vue/typescript-plugin", + location = vue_plugin_path, + languages = { "javascript", "typescript", "vue" }, + }, + }, + }, on_attach = on_attach, flags = lsp_flags, capabilities = capabilities, + filetypes = { + "javascript", + "typescript", + "vue", + }, }) -local util = require("lspconfig.util") -local function get_typescript_server_path(root_dir) - local global_ts = - util.path.join(home, ".nvm", "versions", "node", "v18.19.0", "lib", "node_modules", "typescript", "lib") - local found_ts = "" - local function check_dir(path) - found_ts = util.path.join(path, "node_modules", "typescript", "lib") - if util.path.exists(found_ts) then - return path - end - end - if util.search_ancestors(root_dir, check_dir) then - return found_ts - else - return global_ts - end -end - require("lspconfig")["volar"].setup({ on_attach = on_attach, - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, capabilities = capabilities, - on_new_config = function(new_config, new_root_dir) - new_config.init_options.typescript.tsdk = get_typescript_server_path(new_root_dir) - end, - init_options = { + settings = { vue = { - hybridMode = false, + printWidth = 80, } } }) @@ -153,8 +150,8 @@ require("lspconfig")["astro"].setup({ require("lspconfig")["lua_ls"].setup({ on_init = function(client) - local path = client.workspace_folders[1].name - if not vim.loop.fs_stat(path .. "/.luarc.json") and not vim.loop.fs_stat(path .. "/.luarc.jsonc") then + local luaPath = client.workspace_folders[1].name + if not vim.loop.fs_stat(luaPath .. "/.luarc.json") and not vim.loop.fs_stat(luaPath .. "/.luarc.jsonc") then client.config.settings = vim.tbl_deep_extend("force", client.config.settings, { Lua = { runtime = { @@ -214,9 +211,9 @@ require("lspconfig")["clangd"].setup({ }) local project_library_path = - "/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" +"/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" local cmd = - { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } +{ "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } require("lspconfig")["angularls"].setup({ on_attach = on_attach, @@ -260,26 +257,6 @@ require("lspconfig")["tailwindcss"].setup({ capabilities = capabilities, }) -null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.blade_formatter, - }, - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.keymap.set("n", "f", function() - vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) - end, { buffer = bufnr, desc = "[lsp] format" }) - end - - if client.supports_method("textDocument/rangeFormatting") then - vim.keymap.set("x", "f", function() - vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) - end, { buffer = bufnr, desc = "[lsp] format" }) - end - end, -}) - require("prettier").setup({ bin = "prettier", filetypes = { diff --git a/.xinitrc b/.xinitrc index 8d7c020..330ac89 100644 --- a/.xinitrc +++ b/.xinitrc @@ -8,7 +8,7 @@ $HOME/.fehbg & /usr/bin/blueman-applet & $HOME/.bin/set-last-outputs -#eval $(kwalletd5) +# eval $(kwalletd5) # eval $(gnome-keyring-daemon --start) # export SSH_AUTH_SOCK diff --git a/.zshrc b/.zshrc index da09e79..1da54a3 100644 --- a/.zshrc +++ b/.zshrc @@ -15,8 +15,8 @@ export GOPATH="/home/hali/.go" export MNTPATH="/run/media/hali/" export GPG_TTY=$(tty) -export CODEPATH="$HOME/Documents/Code" -export BLOGPATH="$HOME/Documents/Code/halivert.dev" +export CODEPATH="$HOME/Documents/code" +export BLOGPATH="$HOME/Documents/code/halivert.dev" export WORKPATH="$HOME/Documents/Projects" export JWPATH="$HOME/Documents/JW" @@ -52,7 +52,7 @@ _Tp="$(cat /proc/$(echo $$)/stat | cut -d \ -f 4)" _Tn="$(ps -f -p $_Tp | tail -1 | sed 's/^.* //')" _Tx="$(basename '/'$_Tn)" -if command -v i3-msg >/dev/null 2>&1; then +if command i3-msg >/dev/null 2>&1; then _DirNum="$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num' -r)" else _DirNum="dir" From 4e1a8c673b3bd746bfb8e1c798c95bd9153898ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 9 Dec 2024 00:03:18 -0600 Subject: [PATCH 43/46] feat(bluejay): try to update font issues --- .cheatsheet-unicode | 262 ++++++++++++++++++++++++++++++- .config/alacritty/alacritty.toml | 8 +- .config/fontconfig/fonts.conf | 15 ++ .config/gtk-3.0/settings.ini | 11 +- .config/i3status/config | 8 +- .config/nvim/init.lua | 2 - .vimrc | 1 + .zshrc | 2 +- 8 files changed, 291 insertions(+), 18 deletions(-) create mode 100644 .config/fontconfig/fonts.conf diff --git a/.cheatsheet-unicode b/.cheatsheet-unicode index 211f45a..1813abd 100644 --- a/.cheatsheet-unicode +++ b/.cheatsheet-unicode @@ -1,6 +1,12 @@ # TODO: order by categories -# Font: Ionicons +# Font: font awesome +# +# With a macro you can do something like +# 0xf100, then copy and paste under, delete the 0x, then +# go at the end of the line, in command mode write something like +# exe "normal i\u["]" and that's all +f017  f100  f101  f102  @@ -714,5 +720,259 @@ f4c1  f4c5  f4c7  f4cd  +f4ce  +f4cf  +f4d0  +f4d1  +f4d2  +f4d3  +f4d4  +f4d5  +f4d6  +f4d7  +f4d8  +f4d9  +f4da  +f4db  +f4dc  +f4dd  +f4de  +f4df  +f4e0  +f4e1  +f4e2  +f4e3  +f4e4  +f4e5  +f4e6  +f4e7  +f4e8  +f4e9  +f4ea  +f4eb  +f4ec  +f4ed  +f4ee  +f4ef  +f4f0  +f4f1  +f4f2  +f4f3  +f4f4  +f4f5  +f4f6  +f4f7  +f4f8  +f4f9  +f4fa  +f4fb  +f4fc  +f4fd  +f4fe  +f4ff  +f500  +f501  +f502  +f503  +f504  +f505  +f506  +f507  +f508  +f509  +f50a  +f50b  +f50c  +f50d  +f50e  +f50f  +f510  +f511  +f512  +f513  +f514  +f515  +f516  +f517  +f518  +f519  +f51a  +f51b  +f51c  +f51d  +f51e  +f51f  +f520  +f521  +f522  +f523  +f524  +f525  +f526  +f527  +f528  +f529  +f52a  +f52b  +f52c  +f52d  +f52e  +f52f  +f530  +f531  +f532  +f533  +f534  +f535  +f536  +f537  +f538  +f539  +f53a  +f53b  +f53c  +f53d  +f53d  +f53e  +f53f  +f540  +f541  +f542  +f543  +f544  +f545  +f546  +f547  +f548  +f549  +f54a  +f54b  +f54c  +f54d  +f54e  +f54f  +f550  +f551  +f552  +f553  +f554  +f555  +f556  +f557  +f558  +f559  +f55a  +f55b  +f55c  +f55d  +f55e  +f55f  +f560  +f561  +f562  +f563  +f564  +f565  +f566  +f567  +f568  +f569  +f56a  +f56b  +f56c  +f56d  +f56e  +f56f  +f570  +f571  +f572  +f573  +f574  +f575  +f576  +f577  +f578  +f579  +f57a  +f57b  +f57c  +f57d  +f57e  +f57f  +f580  +f581  +f582  +f583  +f584  +f585  +f586  +f587  +f588  +f589  +f58a  +f58b  +f58c  +f58d  +f58e  +f58f  +f590  +f591  +f592  +f593  +f594  +f595  +f596  +f597  +f598  +f599  +f59a  +f59b  +f59c  +f59d  +f59e  +f59f  +f5a0  +f5a1  +f5a2  +f5a3  +f5a4  +f5a5  +f5a6  +f5a7  +f5a8  +f5a9  +f5aa  +f5ab  +f5ac  +f5ad  +f5ae  +f5af  +f5b0  +f5b1  +f5b2  +f5b3  +f5b4  +f5b5  +f5b6  +f5b7  +f5b8  +f5b9  +f5ba  +f5bb  +f5bc  +f5bd  +f5be  +f5bf  +f5c0  +f5c1  +f5c2  +f5c3  +f5c4  +f5c5  +f5c6  +f5c7  +f5c8  +f5c9  +f5ca  #! vim: ft=config diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index eaba526..5d2cc39 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,6 +1,6 @@ [general] import = [ - "~/.config/alacritty/themes/themes/gruvbox_light.toml" + "~/.config/alacritty/themes/themes/gruvbox_dark.toml" ] [colors] @@ -13,15 +13,15 @@ style = "Underline" size = 12 [font.bold] -family = "Iosevka" +family = "Alacritty Font" style = "Bold" [font.italic] -family = "Iosevka" +family = "Alacritty Font" style = "Italic" [font.normal] -family = "Iosevka" +family = "Alacritty Font" style = "Regular" [[keyboard.bindings]] diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf new file mode 100644 index 0000000..754a030 --- /dev/null +++ b/.config/fontconfig/fonts.conf @@ -0,0 +1,15 @@ + + + + + Font Awesome + + + Alacritty Font + + Font Awesome 6 + Iosevka + Noto Color Emoji + + + diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 3013a35..8524687 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-application-prefer-dark-theme=false -gtk-button-images=true +gtk-button-images=1 gtk-cursor-theme-name=breeze_cursors gtk-cursor-theme-size=24 gtk-decoration-layout=close,minimize,maximize:icon @@ -8,15 +8,14 @@ gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 gtk-font-name=Iosevka Nerd Font, 10 -gtk-icon-theme-name=breeze -gtk-menu-images=true -gtk-modules=window-decorations-gtk-module:colorreload-gtk-module +gtk-icon-theme-name=Papirus-Light +gtk-menu-images=1 gtk-primary-button-warps-slider=true gtk-sound-theme-name=ocean gtk-theme-name=Breeze gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-toolbar-style=3 +gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-xft-antialias=1 gtk-xft-dpi=98304 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintmedium +gtk-xft-hintstyle=hintfull diff --git a/.config/i3status/config b/.config/i3status/config index d85a6c6..3a30e72 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -16,7 +16,7 @@ general { } # order += "ipv6" -order += "wireless wlan0" +order += "wireless wlo1" order += "ethernet _first_" order += "battery 0" # order += "disk /" @@ -60,12 +60,12 @@ memory { } tztime local { - format = "%d-%m-%Y  %H:%M" + format = "%d-%m-%Y  %H:%M" } volume master { - format = " %volume" - format_muted = " " + format = " %volume" + format_muted = " " device = "default" mixer = "Master" mixer_idx = 0 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 0aad10b..5048caf 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,8 +13,6 @@ vim.cmd([[ local cmp = require("cmp") local home = os.getenv("HOME") -local null_ls = require("null-ls") - -- luasnip setup local luasnip = require("luasnip") diff --git a/.vimrc b/.vimrc index 55f07cf..e595e5e 100644 --- a/.vimrc +++ b/.vimrc @@ -32,6 +32,7 @@ se inccommand=split se undodir=$HOME/.vim/undodir se spl=es_mx se nuw=3 +se nrformats+=hex " Save position and folds on exit, and load them on enter se viewoptions=folds,cursor diff --git a/.zshrc b/.zshrc index 1da54a3..e06583b 100644 --- a/.zshrc +++ b/.zshrc @@ -52,7 +52,7 @@ _Tp="$(cat /proc/$(echo $$)/stat | cut -d \ -f 4)" _Tn="$(ps -f -p $_Tp | tail -1 | sed 's/^.* //')" _Tx="$(basename '/'$_Tn)" -if command i3-msg >/dev/null 2>&1; then +if pgrep -x "i3" > /dev/null; then _DirNum="$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num' -r)" else _DirNum="dir" From 874718d400c9150ff6c3d2a05a4f6dada6dbe7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 9 Dec 2024 00:10:08 -0600 Subject: [PATCH 44/46] fix(bluejay): fonts --- .config/fontconfig/fonts.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 754a030..976b322 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -7,9 +7,17 @@ Alacritty Font - Font Awesome 6 + Font Awesome 6 Free Iosevka Noto Color Emoji + + + IBM Plex Mono + + + Font Awesome 6 Free + + From 84b685c0869149f022b6d63e937d6efc47a4617f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Mon, 9 Dec 2024 09:02:26 -0600 Subject: [PATCH 45/46] feat(bluejay): update i3 fonts --- .config/alacritty/alacritty.toml | 6 ++--- .config/fontconfig/fonts.conf | 40 +++++++++++++++------------- .config/i3/conf.d/01-base.i3config | 2 +- .config/i3/conf.d/shortcuts.i3config | 6 ++--- .config/i3status/config | 4 +-- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 5d2cc39..322ebea 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -13,15 +13,15 @@ style = "Underline" size = 12 [font.bold] -family = "Alacritty Font" +family = "Iosevka" style = "Bold" [font.italic] -family = "Alacritty Font" +family = "Iosevka" style = "Italic" [font.normal] -family = "Alacritty Font" +family = "Iosevka" style = "Regular" [[keyboard.bindings]] diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 976b322..fb50a49 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -1,23 +1,27 @@ - - + + - - Font Awesome - - - Alacritty Font + + + IBM Plex + + + Font Awesome 6 Free + + + + + Montserrat + + + Font Awesome 6 Free + + + + Iosevka - Font Awesome 6 Free - Iosevka - Noto Color Emoji + Iosevka + Font Awesome 6 Free - - - IBM Plex Mono - - - Font Awesome 6 Free - - diff --git a/.config/i3/conf.d/01-base.i3config b/.config/i3/conf.d/01-base.i3config index ff4c807..4746c1c 100644 --- a/.config/i3/conf.d/01-base.i3config +++ b/.config/i3/conf.d/01-base.i3config @@ -14,7 +14,7 @@ default_border pixel 0 workspace_auto_back_and_forth yes floating_modifier $mod -font pango: Montserrat 12 +font pango: Iosevka 12 exec --no-startup-id $HOME/.fehbg exec --no-startup-id nm-applet diff --git a/.config/i3/conf.d/shortcuts.i3config b/.config/i3/conf.d/shortcuts.i3config index 76bad60..4d11c06 100644 --- a/.config/i3/conf.d/shortcuts.i3config +++ b/.config/i3/conf.d/shortcuts.i3config @@ -9,9 +9,9 @@ bindsym $mod+Return exec --no-startup-id $term bindsym $mod+space exec --no-startup-id rofi -show combi # Use amixer to adjust volume in PulseAudio. -bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 5%+ -bindsym XF86AudioLowerVolume exec --no-startup-id amixer set Master 5%- -bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume alsa_output.pci-0000_03_00.6.analog-stereo +5% +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume alsa_output.pci-0000_03_00.6.analog-stereo -5% +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute alsa_output.pci-0000_03_00.6.analog-stereo toggle bindsym XF86AudioPlay exec --no-startup-id pgrep pragha && pragha --pause bindsym XF86AudioNext exec --no-startup-id pgrep pragha && pragha --next diff --git a/.config/i3status/config b/.config/i3status/config index 3a30e72..b4ed2b3 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -26,7 +26,7 @@ order += "volume master" order += "tztime local" wireless wlo1 { - format_up = " %essid (%quality)" + format_up = " %essid (%quality)" format_down = " " } @@ -64,7 +64,7 @@ tztime local { } volume master { - format = " %volume" + format = " %volume" format_muted = " " device = "default" mixer = "Master" From f76b1541e1513d57e441efa25812e4eea3dd0734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hal=C3=AD=20V=2E?= Date: Fri, 31 Jan 2025 20:40:42 -0600 Subject: [PATCH 46/46] feat: update dotfiles --- .config/alacritty/alacritty.toml | 4 ++-- .config/gtk-3.0/settings.ini | 7 +++--- .config/nvim/init.lua | 41 ++++++++++++++++++++------------ .vim/plugins.vim | 2 +- .xinitrc | 1 + .zshrc | 2 +- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 322ebea..2d29771 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,6 +1,6 @@ [general] import = [ - "~/.config/alacritty/themes/themes/gruvbox_dark.toml" + "~/.config/alacritty/themes/themes/gruvbox_light.toml" ] [colors] @@ -10,7 +10,7 @@ draw_bold_text_with_bright_colors = true style = "Underline" [font] -size = 12 +size = 11 [font.bold] family = "Iosevka" diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 8524687..992a562 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -8,14 +8,15 @@ gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 gtk-font-name=Iosevka Nerd Font, 10 -gtk-icon-theme-name=Papirus-Light +gtk-icon-theme-name=Papirus-Dark gtk-menu-images=1 gtk-primary-button-warps-slider=true gtk-sound-theme-name=ocean -gtk-theme-name=Breeze +gtk-theme-name=Breeze-Dark gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-xft-antialias=1 gtk-xft-dpi=98304 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 5048caf..c49a9fc 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -132,7 +132,12 @@ require("lspconfig")["volar"].setup({ vue = { printWidth = 80, } - } + }, + init_options = { + typescript = { + tsdk = path.join(home, "/.local/share/nvim/packages/astro-language-server/node_modules/typescript/lib/") + }, + }, }) require("lspconfig")["cssls"].setup({ @@ -143,7 +148,13 @@ require("lspconfig")["cssls"].setup({ require("lspconfig")["astro"].setup({ on_attach = on_attach, + flags = lsp_flags, capabilities = capabilities, + init_options = { + typescript = { + tsdk = path.join(home, "/.local/share/nvim/packages/astro-language-server/node_modules/typescript/lib/") + }, + }, }) require("lspconfig")["lua_ls"].setup({ @@ -208,20 +219,20 @@ require("lspconfig")["clangd"].setup({ capabilities = capabilities, }) -local project_library_path = -"/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" -local cmd = -{ "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } - -require("lspconfig")["angularls"].setup({ - on_attach = on_attach, - capabilities = capabilities, - cmd = cmd, - on_new_config = function(new_config, new_root_dir) - new_config.cmd = cmd - end, -}) - +-- local project_library_path = +-- "/home/hali/.local/share/nvim/packages/angular-language-server/node_modules/@angular/language-server" +-- local cmd = +-- { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", project_library_path } +-- +-- require("lspconfig")["angularls"].setup({ +-- on_attach = on_attach, +-- capabilities = capabilities, +-- cmd = cmd, +-- on_new_config = function(new_config, new_root_dir) +-- new_config.cmd = cmd +-- end, +-- }) +-- local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") project_name = project_name:gsub("%W", "_") local workspace_folder = vim.fn.expand("$HOME/.cache/jdtls/data/") .. project_name diff --git a/.vim/plugins.vim b/.vim/plugins.vim index c3b6723..23cd1fa 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -60,7 +60,7 @@ Plug 'junegunn/gv.vim' " Frontend Plug 'mattn/emmet-vim' -Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install --production' } +Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && npx --yes yarn install' } " Jekyll Plug 'parkr/vim-jekyll' diff --git a/.xinitrc b/.xinitrc index 330ac89..0bb8f4a 100644 --- a/.xinitrc +++ b/.xinitrc @@ -12,6 +12,7 @@ $HOME/.bin/set-last-outputs # eval $(gnome-keyring-daemon --start) # export SSH_AUTH_SOCK +/usr/lib/pam_kwallet_init & echo "Hola hehehe" > /tmp/saludo export DESKTOP_SESSION='i3' exec i3 > $HOME/.cache/i3out 2> $HOME/.cache/i3err diff --git a/.zshrc b/.zshrc index e06583b..c11361e 100644 --- a/.zshrc +++ b/.zshrc @@ -22,7 +22,7 @@ export JWPATH="$HOME/Documents/JW" PATH="$PATH:$HOME/.bin" PATH="$PATH:$HOME/.config/composer/vendor/bin" -PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin" +PATH="$PATH:$HOME/.local/share/gem/ruby/3.3.0/bin" PATH="$PATH:$HOME/.yarn/bin" PATH="$PATH:$HOME/.npm/bin" PATH="$PATH:$HOME/.local/bin"