Various tweaks

fish/config.fish

@@ -10,11 +10,14 @@ end
 
 set -x LANG sv_SE.UTF-8
 set -x LC_ALL sv_SE.UTF-8
-set -x EDITOR nvim
 
+set -x EDITOR nvim
 alias v nvim
 
 if type -q pyenv
     pyenv init --path | source
 end
-# pyenv virtualenv-init - | source
+# pyenv virtualenv-init - | source
+
+alias dc="docker-compose"
+alias drh="docker run -it --rm -v (pwd):/usr/(pwd) -w /usr/(pwd)"

install.sh

@@ -21,19 +21,29 @@ function setup_git() {
   excludesfile = ${HOME}/dotfiles/git/gitignore_global
 EOF
 
-mkdir -p ~/.ssh
+  setup_ssh
-cat << EOF >> ~/.ssh/config
+  cat << EOF >> ~/.ssh/config
+Host *
+  AddKeysToAgent yes
+  IdentityFile ~/.ssh/thomas_rsa
+  VisualHostKey yes
 Host github.com
-    User git
+  User git
 Host gitea
-  HostName git.torpet.thomasloven.com
+  HostName git.thomasloven.com
   User git
 EOF
-chmod 644 ~/.ssh/config
+
 }
 
 USER=`whoami`
 
+if [[ ${REMOTE_CONTAINERS} || ${DEVCONTAINER} ]]; then
+
+  echo "INSTALLING IN DEVCONTAINER"
+
+fi
+
 install_dependencies
 
 sudo -n chsh $USER -s $(which fish)

test/run_test

@@ -2,8 +2,8 @@
 set -e
 cd "$(dirname "$0")/.."
 
-docker build . -t dotfiles -f test/Dockerfile --force-rm
+docker build . -t dotfiles -f test/Dockerfile.devcontainer --force-rm
 
 docker run --rm -it -v $(pwd):/workspaces/test dotfiles zsh
 
-docker rmi dotfiles
+docker rmi dotfiles