Merge branch 'master' of ssh://git.penguincoder.org:2222/penguincoder/dotfiles

.bash_aliases

@@ -1,8 +1,9 @@
 alias dotfiles='git --git-dir=$HOME/dotfiles.git/ --work-tree=$HOME'
 alias nokeyssh="ssh -o PubkeyAuthentication=no"
-if [ `uname -s` == 'Linux' ] ; then
+UNAME_S=`uname -s`
+if [[ "$UNAME_S" == "Linux" || "$UNAME_S" == "CYGWIN_NT-10.0" ]] ; then
   alias ls="ls --color=auto"
 fi
-if [ `uname -s` == 'BSD' ] ; then
+if [ "$UNAME_S" == "BSD" ] ; then
   alias ls="ls -G"
 fi

.minttyrc

@@ -0,0 +1,37 @@
+# To use common configuration in %APPDATA%\mintty, simply remove this file
+#ThemeFile=base16-eighties-mod.minttyrc
+Transparency=low
+CursorType=block
+Font=IBMPlexMono NF
+FontHeight=14
+BoldAsFont=yes
+BoldAsColour=no
+Locale=en_US
+Charset=UTF-8
+CopyAsHTML=16908288
+MiddleClickAction=extend
+RightClickAction=paste
+Columns=90
+Rows=25
+Term=xterm-256color
+BellType=0
+BellFlash=yes
+ForegroundColour=211,208,200
+BackgroundColour=45,45,45
+CursorColour=253,157,79
+Black=45,45,45
+BoldBlack=116,115,105
+Red=242,119,122
+BoldRed=236,50,53
+Green=153,204,153
+BoldGreen=102,177,102
+Yellow=255,204,102
+BoldYellow=255,177,24
+Blue=102,153,204
+BoldBlue=57,114,173
+Magenta=204,153,204
+BoldMagenta=177,102,177
+Cyan=102,204,204
+BoldCyan=57,173,173
+White=211,208,200
+BoldWhite=242,240,236

bin/install-dotfiles.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #Initialization script sourced from Atlassian: https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/
-git clone --bare git@git.penguincoder.org:2222/penguincoder/dotfiles.git
+git clone --bare ssh://git@git.penguincoder.org:2222/penguincoder/dotfiles.git
 function config {
   /usr/bin/git --git-dir=$HOME/dotfiles.git/ --work-tree=$HOME $@
 }
@@ -17,4 +17,4 @@ config config status.showUntrackedFiles no
 config push --set-upstream origin master
 config submodule init
 config submodule update
-which fc-cache && fc-cache -f -v ~/.fonts || true
+which fc-cache 2>/dev/null && fc-cache -f -v ~/.fonts || true

bin/kerl.setup.bash

@@ -1 +1,2 @@
-test -s "$HOME/.kerl/installs/21.0/activate" && source "$HOME/.kerl/installs/21.0/activate"
+#!/bin/bash
+test -s "$HOME/.kerl/installs/21.0/activate" && . "$HOME/.kerl/installs/21.0/activate"

linux-bionic-playbook.yaml

@@ -31,6 +31,8 @@
         line: "10.4.21.230 git.lxd.consolo.lan"
     - name: add docker-ce pubkey
       shell: curl -sL "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7EA0A9C3F273FCD8" | sudo apt-key add
+      args:
+        warn: False
     - name: add docker-ce repo
       apt_repository:
         repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
@@ -38,6 +40,8 @@
         update_cache: true
     - name: add nextcloud pubkey
       shell: curl -sL "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x60EE47FBAD3DD469" | sudo apt-key add
+      args:
+        warn: False
     - name: add nextcloud repo
       apt_repository:
         repo: "deb http://ppa.launchpad.net/nextcloud-devs/client/ubuntu bionic main"
@@ -75,6 +79,12 @@
       shell: curl -sLo /tmp/helm.tar.gz https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz && mkdir -p /tmp/helm && tar xzf /tmp/helm.tar.gz -C /tmp/helm && install -m 755 /tmp/helm/linux-amd64/helm /usr/local/bin/helm-2.9.1 && rm -rf /tmp/helm* && ln -sf /usr/local/bin/helm-2.9.1 /usr/local/bin/helm
       args:
         creates: /usr/local/bin/helm-2.9.1
+    - name: install tilt
+      shell: curl -sL https://github.com/windmilleng/tilt/releases/download/v0.7.5/tilt.0.7.5.linux.x86_64.tar.gz | tar -xzv tilt && mv tilt /usr/local/bin/tilt-0.7.5 & ln -sf /usr/local/bin/tilt-0.7.5 /usr/local/bin/tilt
+      args:
+        warn: False
+        creates: /usr/local/bin/tilt-0.7.5
+    sudo mv tilt /usr/local/bin/tilt
     - name: install docker-machine
       shell: curl -sLo docker-machine https://github.com/docker/machine/releases/download/v0.14.0/docker-machine-linux-x86_64 && install -m 755 docker-machine /usr/local/bin/docker-machine-0.14.0 && rm -f docker-machine && ln -sf /usr/local/bin/docker-machine-0.14.0 /usr/local/bin/docker-machine
       args:
@@ -126,7 +136,7 @@
         creates: ~/.kiex/elixirs/elixir-1.7.4
     - name: install kitty terminal emulator
       become: no
-      shell: curl -L https://sw.kovidgoyal.net/kitty/installer.sh | sh /dev/stdin launch=n && ln -s ~/.local/kitty.app/bin/kitty ~/bin/ && cp ~/.local/kitty.app/share/applications/kitty.desktop ~/.local/share/applications && sed -i "s/Icon\=kitty/Icon\=\/home\/$USER\/.local\/kitty.app\/share\/icons\/hicolor\/256x256\/apps\/kitty.png/g" ~/.local/share/applications/kitty.desktop
+      shell: curl -L https://sw.kovidgoyal.net/kitty/installer.sh | sh /dev/stdin launch=n && ln -s ~/.local/kitty.app/bin/kitty ~/bin/ && mkdir -p ~/.local/share/applications && cp ~/.local/kitty.app/share/applications/kitty.desktop ~/.local/share/applications && sed -i "s/Icon\=kitty/Icon\=\/home\/$USER\/.local\/kitty.app\/share\/icons\/hicolor\/256x256\/apps\/kitty.png/g" ~/.local/share/applications/kitty.desktop
       args:
         warn: False
         creates: ~/bin/kitty