diff --git a/.gitmodules b/.gitmodules index fb7cccf..c0eb127 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,11 @@ path = config/nvim url = git@github.com:AstroNvim/AstroNvim.git ignore = dirty + branch = v3 + update = checkout [submodule "config/astronvim/lua/user"] path = config/astronvim/lua/user url = git@github.com:ivuorinen/astronvim_config.git - ignore = dirty + update = rebase + branch = main + diff --git a/config/astronvim/lua/user b/config/astronvim/lua/user index 6f24674..e3fa677 160000 --- a/config/astronvim/lua/user +++ b/config/astronvim/lua/user @@ -1 +1 @@ -Subproject commit 6f246744d47b9c77ee94998cf123dbcded1c8aaf +Subproject commit e3fa6772f0aba46b6ed8075c75df12eac20e0e08 diff --git a/ecrc b/ecrc index 58b3718..9ad087d 100644 --- a/ecrc +++ b/ecrc @@ -17,3 +17,4 @@ "MaxLineLength": false } } + diff --git a/scripts/install-npm-packages.sh b/scripts/install-npm-packages.sh index d636324..0e16b06 100755 --- a/scripts/install-npm-packages.sh +++ b/scripts/install-npm-packages.sh @@ -18,6 +18,9 @@ packages=( "prettier" "@bchatard/alfred-jetbrains" "@johnnymorganz/stylua-bin" + "js-debug" + "stylelint-lsp" + "blade-formatter" ) for pkg in "${packages[@]}"; do @@ -27,7 +30,7 @@ for pkg in "${packages[@]}"; do if [[ ${pkg:0:1} == "#" ]]; then continue; fi msg_run "Installing npm package:" "$pkg" - npm install -g --no-fund --no-progress --no-timing "$pkg" + npm install -g --force --no-fund --no-progress --no-timing "$pkg" echo "" done