diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 613a085a..2934fde7 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -111,6 +111,16 @@ lspconfig.yamlls.setup({ } }) +-- lspconfig.bashls.setup({ +-- filetypes = { "sh", "zsh" } +-- }) + +-- require('filetype').setup({ +-- shebang = { +-- zsh = "sh" +-- } +-- }) + lsp.setup() vim.diagnostic.config({ diff --git a/.config/nvim/ftdetect/extensions.vim b/.config/nvim/ftdetect/extensions.vim index dd101f0e..8944fc8b 100644 --- a/.config/nvim/ftdetect/extensions.vim +++ b/.config/nvim/ftdetect/extensions.vim @@ -1,3 +1,4 @@ au BufRead,BufNewFile *.arb set filetype=json au BufRead,BufNewFile Brewfile set filetype=ruby +au BufRead,BufNewFile *.zsh set filetype=bash diff --git a/.config/nvim/lua/casraf/packer.lua b/.config/nvim/lua/casraf/packer.lua index b10e7ffd..e89f7b81 100644 --- a/.config/nvim/lua/casraf/packer.lua +++ b/.config/nvim/lua/casraf/packer.lua @@ -145,4 +145,6 @@ return require('packer').startup(function(use) }) use('windwp/nvim-ts-autotag') + + -- use('nathom/filetype.nvim') end) diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 00000000..9822e6c4 --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1 @@ +shell=bash diff --git a/aliases.sh b/aliases.sh index 7d4b3d3d..d0034e70 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-prj acroasis . apps/front functions/backend packages/shared apps/landing" if is_linux; then alias md5="md5sum" diff --git a/tmux.sh b/tmux.sh index 1fb9b584..8d96f834 100644 --- a/tmux.sh +++ b/tmux.sh @@ -46,10 +46,11 @@ tn-custom () { } tn-prj() { - prj="$1" + prj="$HOME/Dev/$1" + winname=$(basename $prj) shift - parent="." + parent="$prj" for arg in "$@"; do case "$1" in -d) @@ -109,3 +110,4 @@ tn-prj() { # attach to session tmux attach -t $winname } +