From 311d6a678ba6c5290bc31086773bd57c3e2504eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Tue, 16 Nov 2021 18:21:23 +0100
Subject: [PATCH] Various tweaks

---
 fish/config.fish                             |  7 +++++--
 install.sh                                   | 20 +++++++++++++++-----
 test/{Dockerfile => Dockerfile.devcontainer} |  0
 test/run_test                                |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)
 rename test/{Dockerfile => Dockerfile.devcontainer} (100%)

diff --git a/fish/config.fish b/fish/config.fish
index d5312f5..24f6806 100644
--- a/fish/config.fish
+++ b/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
\ No newline at end of file
+# pyenv virtualenv-init - | source
+
+alias dc="docker-compose"
+alias drh="docker run -it --rm -v (pwd):/usr/(pwd) -w /usr/(pwd)"
diff --git a/install.sh b/install.sh
index cdad126..900a2b3 100755
--- a/install.sh
+++ b/install.sh
@@ -21,19 +21,29 @@ function setup_git() {
   excludesfile = ${HOME}/dotfiles/git/gitignore_global
 EOF
 
-mkdir -p ~/.ssh
-cat << EOF >> ~/.ssh/config
+  setup_ssh
+  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)
diff --git a/test/Dockerfile b/test/Dockerfile.devcontainer
similarity index 100%
rename from test/Dockerfile
rename to test/Dockerfile.devcontainer
diff --git a/test/run_test b/test/run_test
index f80e5eb..166e46e 100755
--- a/test/run_test
+++ b/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
\ No newline at end of file
+docker rmi dotfiles