From 9327637b47ff259fa4850e5b6e0fadc8e1a85686 Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Tue, 13 Jun 2023 10:34:43 +0300 Subject: [PATCH] feat: updates --- .config/alacritty/alacritty.yml | 2 +- .config/nvim/after/plugin/lsp.lua | 6 ++++++ .config/nvim/after/plugin/oil.lua | 17 ++++++++++++++++- .config/nvim/after/plugin/session.lua | 17 +++++++++-------- .config/nvim/after/plugin/treesitter.lua | 4 ++++ .config/nvim/lua/casraf/packer.lua | 7 +++++++ .zshrc | 5 ----- aliases.sh | 2 +- functions.sh | 6 ++---- scripts/randarg.sh | 1 - 10 files changed, 46 insertions(+), 21 deletions(-) delete mode 100755 scripts/randarg.sh diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index d1cb96dc..aecf0cd9 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -26,7 +26,7 @@ hints: - binding: key: U mods: Control|Shift - command: xdg-open + command: open hyperlinks: true mouse: enabled: true diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index c943fa18..613a085a 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -21,6 +21,12 @@ local cmp_mappings = lsp.defaults.cmp_mappings({ [""] = cmp.mapping.complete(), }) +local cmp_autopairs = require('nvim-autopairs.completion.cmp') +cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() +) + cmp_mappings[''] = nil cmp_mappings[''] = nil diff --git a/.config/nvim/after/plugin/oil.lua b/.config/nvim/after/plugin/oil.lua index 5704554d..5fa1f075 100644 --- a/.config/nvim/after/plugin/oil.lua +++ b/.config/nvim/after/plugin/oil.lua @@ -1 +1,16 @@ -require("oil").setup({}) +require("oil").setup({ + columns = { + "icon", + "size" + }, + view_options = { + show_hidden = true, + ---@diagnostic disable-next-line: unused-local + is_always_hidden = function(name, bufnr) + if name == '.git' then + return true + end + return false + end + }, +}) diff --git a/.config/nvim/after/plugin/session.lua b/.config/nvim/after/plugin/session.lua index 25ca3cdf..0c4f7916 100644 --- a/.config/nvim/after/plugin/session.lua +++ b/.config/nvim/after/plugin/session.lua @@ -8,13 +8,17 @@ session_manager.setup({ local config_group = vim.api.nvim_create_augroup('casraf_session', {}) +local function isnt_special(saving) + return vim.bo.filetype ~= 'git' + and vim.bo.filetype ~= 'gitcommit' + and vim.bo.filetype ~= 'gitrebase' + and (not saving or vim.fn.stridx(vim.fn.expand('%'), 'oil://') == -1) +end + vim.api.nvim_create_autocmd({ 'BufWritePost' }, { group = config_group, callback = function() - if vim.bo.filetype ~= 'git' - and vim.bo.filetype ~= 'gitcommit' - and vim.bo.filetype ~= 'gitrebase' - then + if isnt_special(true) then session_manager.autosave_session() end end @@ -23,10 +27,7 @@ vim.api.nvim_create_autocmd({ 'BufWritePost' }, { vim.api.nvim_create_autocmd({ 'VimEnter' }, { group = config_group, callback = function() - if vim.bo.filetype ~= 'git' - and vim.bo.filetype ~= 'gitcommit' - and vim.bo.filetype ~= 'gitrebase' - then + if isnt_special(false) then session_manager.load_current_dir_session() end end diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 651396c6..365e66bc 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -21,5 +21,9 @@ require('nvim-treesitter.configs').setup({ -- Instead of true it can also be a list of languages additional_vim_regex_highlighting = false, }, + + autotag = { + enable = true, + }, }) diff --git a/.config/nvim/lua/casraf/packer.lua b/.config/nvim/lua/casraf/packer.lua index 96ed1291..b10e7ffd 100644 --- a/.config/nvim/lua/casraf/packer.lua +++ b/.config/nvim/lua/casraf/packer.lua @@ -138,4 +138,11 @@ return require('packer').startup(function(use) use({ 'kylechui/nvim-surround', branch = "main" }) require('nvim-surround').setup({}) + + use('windwp/nvim-autopairs') + require('nvim-autopairs').setup({ + enable_check_bracket_line = false + }) + + use('windwp/nvim-ts-autotag') end) diff --git a/.zshrc b/.zshrc index 2e1c1338..2d0412c0 100644 --- a/.zshrc +++ b/.zshrc @@ -37,8 +37,3 @@ source $DOTFILES/scripts/home/home.sh # echo 'Loading '$DOTFILES/zsh_init.sh source $DOTFILES/zsh_init.sh -# source all files in scripts dir -for file in $DOTFILES/scripts/*; do - [[ -f "$file" ]] && source $file -done - diff --git a/aliases.sh b/aliases.sh index 761c6bf5..7c9cdf4f 100755 --- a/aliases.sh +++ b/aliases.sh @@ -106,7 +106,7 @@ alias tn-df="tn-custom -d \$DOTFILES -s dotfiles ." alias tn-tt="tn-custom -d \$HOME/.local/share/nvim/site/pack/packer/start/text-transform.nvim -s text-transform ." alias tn-simple-scaffold="tn-prj simple-scaffold" alias tn-dungeon-paper="tn-prj dungeon_paper" -alias tn-acroasis="tn-custom -d \$HOME/Dev/acroasis -s acroasis front server shared landing" +alias tn-acroasis="tn-custom -d \$HOME/Dev/acroasis -s acroasis . front server shared landing" if is_linux; then alias md5="md5sum" diff --git a/functions.sh b/functions.sh index a0a192d5..a4414165 100755 --- a/functions.sh +++ b/functions.sh @@ -159,9 +159,6 @@ rand() { echo $(($RANDOM % ($max - $min + 1) + $min)) } -# need to source because VS Code raises error on the function -source $DOTFILES/scripts/randarg.sh - # select random element from list randline() { if [[ $# -eq 0 ]]; then @@ -335,13 +332,14 @@ tn-custom () { done tmux has-session -t $winname 2>/dev/null if [[ "$?" == "0" ]]; then + echo_cyan "Attaching to existing session $winname" tmux attach-session -t $winname return 0 fi dirs=("$@") - echo "Creating new session $winname on $parent with dirs: $dirs" + echo_cyan "Creating new session $winname on $parent with dirs: $dirs" tmux -f ~/.config/.tmux.conf new-session -d -s $winname -n general -c $parent for dir in ${dirs[@]}; do diff --git a/scripts/randarg.sh b/scripts/randarg.sh deleted file mode 100755 index 8b137891..00000000 --- a/scripts/randarg.sh +++ /dev/null @@ -1 +0,0 @@ -