Improved vi support accross shells

hanoii · Apr 12, 2024 · b50c576 · b50c576
1 parent be05aec
commit b50c576
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
@@ -1,7 +1,7 @@
 name: pimp-my-shell
 repository: .
 version: ""
-install_date: "2024-04-12T13:27:44-03:00"
+install_date: "2024-04-12T19:42:34-03:00"
 project_files:
     - web-build/Dockerfile.pimp-my-shell
     - homeadditions/.bashrc.d/pimp-my-shell.sh

diff --git a/.ddev/config.pimp-my-shell.yaml b/.ddev/config.pimp-my-shell.yaml
@@ -11,5 +11,6 @@ webimage_extra_packages:
   - libarchive-tools
   - lua5.4
   - pv
+  - vim-nox
 web_environment:
   - COLORTERM=${COLORTERM}
diff --git a/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh b/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -9,9 +9,6 @@ esac
 # This is so that child processes have appropriate access to this var
 export SHELL
 
-# Default $EDITOR to vim
-export EDITOR=${DDEV_PIMP_MY_SHELL_EDITOR-/usr/bin/vim}
-
 # ahoy
 COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
 

diff --git a/.ddev/web-build/Dockerfile.pimp-my-shell b/.ddev/web-build/Dockerfile.pimp-my-shell
@@ -27,3 +27,6 @@ USER $uid:$gid
 RUN fish -c "curl -sL 'https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish' | source && fisher install jorgebucaran/[email protected]"
 RUN fish -c "fisher install IlanCosman/[email protected]"
 USER root:root
+
+# vim
+RUN update-alternatives --set editor /usr/bin/vim.nox
diff --git a/config.pimp-my-shell.yaml b/config.pimp-my-shell.yaml
@@ -11,5 +11,6 @@ webimage_extra_packages:
   - libarchive-tools
   - lua5.4
   - pv
+  - vim-nox
 web_environment:
   - COLORTERM=${COLORTERM}
diff --git a/homeadditions/.bashrc.d/pimp-my-shell.sh b/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -9,9 +9,6 @@ esac
 # This is so that child processes have appropriate access to this var
 export SHELL
 
-# Default $EDITOR to vim
-export EDITOR=${DDEV_PIMP_MY_SHELL_EDITOR-/usr/bin/vim}
-
 # ahoy
 COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
 

diff --git a/web-build/Dockerfile.pimp-my-shell b/web-build/Dockerfile.pimp-my-shell
@@ -27,3 +27,6 @@ USER $uid:$gid
 RUN fish -c "curl -sL 'https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish' | source && fisher install jorgebucaran/[email protected]"
 RUN fish -c "fisher install IlanCosman/[email protected]"
 USER root:root
+
+# vim
+RUN update-alternatives --set editor /usr/bin/vim.nox