From 0a92bdc4a6b09d9e0ae8d098cce0240928fdd9c9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 6 Apr 2022 22:45:07 +0700
Subject: [PATCH] shells/fish: add some aliases

Also:
- playbooks/packages: add helmfile
- ssh: don't add keys automatically (mainly for Vagrant)
---
 Dockerfile                        | 3 +--
 dotfiles.yml                      | 4 ++--
 playbooks/packages.yml            | 5 +++++
 roles/shells/templates/aliases.j2 | 6 ++++++
 roles/ssh/tasks/main.yml          | 2 --
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6557c17..d65afc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
 FROM alpine:edge
 
 # Install dependencies
-RUN apk --no-cache update \
-    && apk --no-cache add \
+RUN apk --no-cache add \
     ansible git fish build-base rsync \
     cargo py3-virtualenv py3-setuptools \
     python3-dev libffi-dev emacs-nox
diff --git a/dotfiles.yml b/dotfiles.yml
index d6c32be..6606409 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -62,7 +62,7 @@
     - role: qtcreator
       tags: [ never, qtcreator ]
     - role: qutebrowser
-      tags: qutebrowser
+      tags: [ never, qutebrowser ]
     - role: ripgrep
       tags: ripgrep
     - role: river
@@ -74,7 +74,7 @@
     - role: terminal
       tags: terminal
     - role: translate-shell
-      tags: [ never, trans ]
+      tags: trans
     - role: vifm
       tags: vifm
     - role: waybar
diff --git a/playbooks/packages.yml b/playbooks/packages.yml
index 8b96b96..d937146 100644
--- a/playbooks/packages.yml
+++ b/playbooks/packages.yml
@@ -49,6 +49,11 @@
           command:
             cmd: go install github.com/quay/clair/v4/cmd/clairctl@latest
 
+        - name: Install helmfile
+          tags: helmfile
+          command:
+            cmd: go install github.com/roboll/helmfile@latest
+
         - name: Clean go modcache
           command:
             cmd: go clean -modcache
diff --git a/roles/shells/templates/aliases.j2 b/roles/shells/templates/aliases.j2
index 4d1baa0..f8278f3 100644
--- a/roles/shells/templates/aliases.j2
+++ b/roles/shells/templates/aliases.j2
@@ -1,5 +1,11 @@
 # remap
+abbr ap ansible-playbook
+abbr ad ansible-doc
+abbr av ansible-vault
+abbr hf helmfile
+abbr h helm
 abbr k kubectl
+abbr t terraform
 abbr x extract
 alias cp='cp -vir'
 alias mv='mv -vi'
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index 5dcd9d3..57c85ff 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -18,8 +18,6 @@
   blockinfile:
     path: ~/.ssh/config
     block: |
-      AddKeysToAgent yes
-
       StrictHostKeyChecking accept-new
     insertbefore: BOF
     marker: '# {mark} CUSTOM SSH CONFIG'