From d17e72af17ca71b17f727361433b1b2bcd2ce6db Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Sat, 19 Jan 2019 09:24:22 -0500 Subject: [PATCH 1/7] suppress warning and precreate ~/.local/share/applications --- linux-bionic-playbook.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/linux-bionic-playbook.yaml b/linux-bionic-playbook.yaml index 2b125ed..7ad9ba1 100644 --- a/linux-bionic-playbook.yaml +++ b/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" @@ -126,7 +130,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 From 67a1853771c271f6d4832c2c3d24dbd889f4fbae Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Sat, 19 Jan 2019 09:25:06 -0500 Subject: [PATCH 2/7] use bash, not sh --- bin/kerl.setup.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/kerl.setup.bash b/bin/kerl.setup.bash index 417feca..752182d 100644 --- a/bin/kerl.setup.bash +++ b/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" From e9e2d51b9d6870752b57cd14cf518cec28f985d2 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Tue, 22 Jan 2019 09:12:25 -0500 Subject: [PATCH 3/7] cleanup install script and hide bad which output --- bin/install-dotfiles.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 bin/install-dotfiles.sh diff --git a/bin/install-dotfiles.sh b/bin/install-dotfiles.sh old mode 100755 new mode 100644 index c02c7f5..6f28182 --- a/bin/install-dotfiles.sh +++ b/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 From a3b8e3db52864c8da52634f7acac8217ad22b018 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Tue, 22 Jan 2019 09:14:26 -0500 Subject: [PATCH 4/7] fixup aliases --- .bash_aliases | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 6a0bc2e..efe8d9d 100644 --- a/.bash_aliases +++ b/.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 From a349a98a25671ec4afd1397d50ac1c8c9063eb45 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Wed, 13 Feb 2019 10:18:32 -0500 Subject: [PATCH 5/7] add cygwin mintty configuration --- .minttyrc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .minttyrc diff --git a/.minttyrc b/.minttyrc new file mode 100644 index 0000000..1100660 --- /dev/null +++ b/.minttyrc @@ -0,0 +1,17 @@ +ThemeFile=base16-eighties-mod.minttyrc +Transparency=low +CursorType=block +Font=IBMPlexMono NF +FontHeight=16 +BoldAsFont=yes +BoldAsColour=no +Locale=en_US +Charset=UTF-8 +CopyAsHTML=16908288 +MiddleClickAction=extend +RightClickAction=paste +Columns=110 +Rows=35 +Term=xterm-256color +BellType=0 +BellFlash=yes From d790c1da389a1ed4508e66660594d05d3c313e84 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Fri, 22 Feb 2019 10:31:11 -0500 Subject: [PATCH 6/7] include theme in file --- .minttyrc | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/.minttyrc b/.minttyrc index 1100660..98ca38d 100644 --- a/.minttyrc +++ b/.minttyrc @@ -1,8 +1,9 @@ -ThemeFile=base16-eighties-mod.minttyrc +# To use common configuration in %APPDATA%\mintty, simply remove this file +#ThemeFile=base16-eighties-mod.minttyrc Transparency=low CursorType=block Font=IBMPlexMono NF -FontHeight=16 +FontHeight=14 BoldAsFont=yes BoldAsColour=no Locale=en_US @@ -10,8 +11,27 @@ Charset=UTF-8 CopyAsHTML=16908288 MiddleClickAction=extend RightClickAction=paste -Columns=110 -Rows=35 +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 \ No newline at end of file From e268aaf9360c6bb19b26b4354d975d757e3d9bb7 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Tue, 26 Feb 2019 11:15:25 -0500 Subject: [PATCH 7/7] add tilt --- linux-bionic-playbook.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-bionic-playbook.yaml b/linux-bionic-playbook.yaml index 7ad9ba1..8aa3074 100644 --- a/linux-bionic-playbook.yaml +++ b/linux-bionic-playbook.yaml @@ -79,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: