From f26cb3bb43291651bbfb3dedc3f8b55e39e40fb7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 19 May 2019 22:52:26 +0100 Subject: [PATCH 01/11] Enable more plugins --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 3fd2d5a..396b340 100644 --- a/.zshrc +++ b/.zshrc @@ -56,7 +56,7 @@ ZSH_THEME="robbyrussell" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=(common-aliases composer docker git github npm osx z) source $ZSH/oh-my-zsh.sh From f4d839d9f020795b68b6789acdcb4fc7247037ed Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 30 Aug 2019 19:49:19 +0100 Subject: [PATCH 02/11] Add db function --- .functions | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.functions b/.functions index 4f50e84..36e0bf6 100644 --- a/.functions +++ b/.functions @@ -9,3 +9,12 @@ function mkd() { mkdir -p "$@" && cd "$@" } +function db { + if [ "$1" = "refresh" ]; then + mysql -uroot -e "drop database $2; create database $2" + elif [ "$1" = "create" ]; then + mysql -uroot -e "create database $2" + elif [ "$1" = "drop" ]; then + mysql -uroot -e "drop database $2" + fi +} From 59ab3b0bb21cbc5101c455bc823f688c22a3f4c3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 21:51:09 +0100 Subject: [PATCH 03/11] Enable relative line numbers --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index f1488e4..6bc0d15 100644 --- a/.vimrc +++ b/.vimrc @@ -1,2 +1,3 @@ syntax on colo slate +set relativenumber From 6c307423f3510725ba4a7d3e7f4462f49bb304a6 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 21:51:47 +0100 Subject: [PATCH 04/11] Enable relative line numbers --- .ideavimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.ideavimrc b/.ideavimrc index ce13ca0..80a2837 100644 --- a/.ideavimrc +++ b/.ideavimrc @@ -1,2 +1,3 @@ imap jj +set relativenumber From fdfa923c07ce11cd6693baa6844c76aef69fa42c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 22:55:23 +0100 Subject: [PATCH 05/11] Remove dot prefixes --- .aliases => aliases | 0 {.composer => composer}/composer.json | 0 {.composer => composer}/composer.lock | 0 .functions => functions | 0 .gitconfig => gitconfig | 0 .gitignore => gitignore | 0 .gitignore-global => gitignore-global | 0 .hushlogin => hushlogin | 0 .ideavimrc => ideavimrc | 0 .macos => macos | 0 .npmrc => npmrc | 0 .vimrc => vimrc | 0 .zshrc => zshrc | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename .aliases => aliases (100%) rename {.composer => composer}/composer.json (100%) rename {.composer => composer}/composer.lock (100%) rename .functions => functions (100%) rename .gitconfig => gitconfig (100%) rename .gitignore => gitignore (100%) rename .gitignore-global => gitignore-global (100%) rename .hushlogin => hushlogin (100%) rename .ideavimrc => ideavimrc (100%) rename .macos => macos (100%) rename .npmrc => npmrc (100%) rename .vimrc => vimrc (100%) rename .zshrc => zshrc (100%) diff --git a/.aliases b/aliases similarity index 100% rename from .aliases rename to aliases diff --git a/.composer/composer.json b/composer/composer.json similarity index 100% rename from .composer/composer.json rename to composer/composer.json diff --git a/.composer/composer.lock b/composer/composer.lock similarity index 100% rename from .composer/composer.lock rename to composer/composer.lock diff --git a/.functions b/functions similarity index 100% rename from .functions rename to functions diff --git a/.gitconfig b/gitconfig similarity index 100% rename from .gitconfig rename to gitconfig diff --git a/.gitignore b/gitignore similarity index 100% rename from .gitignore rename to gitignore diff --git a/.gitignore-global b/gitignore-global similarity index 100% rename from .gitignore-global rename to gitignore-global diff --git a/.hushlogin b/hushlogin similarity index 100% rename from .hushlogin rename to hushlogin diff --git a/.ideavimrc b/ideavimrc similarity index 100% rename from .ideavimrc rename to ideavimrc diff --git a/.macos b/macos similarity index 100% rename from .macos rename to macos diff --git a/.npmrc b/npmrc similarity index 100% rename from .npmrc rename to npmrc diff --git a/.vimrc b/vimrc similarity index 100% rename from .vimrc rename to vimrc diff --git a/.zshrc b/zshrc similarity index 100% rename from .zshrc rename to zshrc From ad561dca4798b073a0b57fc56ef8e4423e08d3a4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 22:56:24 +0100 Subject: [PATCH 06/11] Tag files --- gitconfig => tag-git/gitconfig | 0 gitignore => tag-git/gitignore | 0 gitignore-global => tag-git/gitignore-global | 0 {composer => tag-php/composer}/composer.json | 0 {composer => tag-php/composer}/composer.lock | 0 ideavimrc => tag-vim/ideavimrc | 0 vimrc => tag-vim/vimrc | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename gitconfig => tag-git/gitconfig (100%) rename gitignore => tag-git/gitignore (100%) rename gitignore-global => tag-git/gitignore-global (100%) rename {composer => tag-php/composer}/composer.json (100%) rename {composer => tag-php/composer}/composer.lock (100%) rename ideavimrc => tag-vim/ideavimrc (100%) rename vimrc => tag-vim/vimrc (100%) diff --git a/gitconfig b/tag-git/gitconfig similarity index 100% rename from gitconfig rename to tag-git/gitconfig diff --git a/gitignore b/tag-git/gitignore similarity index 100% rename from gitignore rename to tag-git/gitignore diff --git a/gitignore-global b/tag-git/gitignore-global similarity index 100% rename from gitignore-global rename to tag-git/gitignore-global diff --git a/composer/composer.json b/tag-php/composer/composer.json similarity index 100% rename from composer/composer.json rename to tag-php/composer/composer.json diff --git a/composer/composer.lock b/tag-php/composer/composer.lock similarity index 100% rename from composer/composer.lock rename to tag-php/composer/composer.lock diff --git a/ideavimrc b/tag-vim/ideavimrc similarity index 100% rename from ideavimrc rename to tag-vim/ideavimrc diff --git a/vimrc b/tag-vim/vimrc similarity index 100% rename from vimrc rename to tag-vim/vimrc From c633d3070995d5839201a638be72deed1636657d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 23:13:12 +0100 Subject: [PATCH 07/11] Add rcrc --- rcrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 rcrc diff --git a/rcrc b/rcrc new file mode 100644 index 0000000..e9c5028 --- /dev/null +++ b/rcrc @@ -0,0 +1 @@ +TAGS="git npm php vim zsh" From 9e28b75318950618658733c5e770b8a4d377aa61 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 23:14:26 +0100 Subject: [PATCH 08/11] Tag zsh files --- aliases => tag-zsh/aliases | 0 functions => tag-zsh/functions | 0 zshrc => tag-zsh/zshrc | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename aliases => tag-zsh/aliases (100%) rename functions => tag-zsh/functions (100%) rename zshrc => tag-zsh/zshrc (100%) diff --git a/aliases b/tag-zsh/aliases similarity index 100% rename from aliases rename to tag-zsh/aliases diff --git a/functions b/tag-zsh/functions similarity index 100% rename from functions rename to tag-zsh/functions diff --git a/zshrc b/tag-zsh/zshrc similarity index 100% rename from zshrc rename to tag-zsh/zshrc From d8e70d99f679b3f50ca8def8a1977a13f954c9c8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 23:14:38 +0100 Subject: [PATCH 09/11] Tag npm files --- npmrc => tag-npm/npmrc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename npmrc => tag-npm/npmrc (100%) diff --git a/npmrc b/tag-npm/npmrc similarity index 100% rename from npmrc rename to tag-npm/npmrc From fadcbec047250045963af481746a2bb459afb1f2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 23:26:33 +0100 Subject: [PATCH 10/11] Load files from zsh_profile.d --- tag-zsh/zsh_profile.d/navigation.zsh | 2 ++ tag-zsh/zshrc | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 tag-zsh/zsh_profile.d/navigation.zsh diff --git a/tag-zsh/zsh_profile.d/navigation.zsh b/tag-zsh/zsh_profile.d/navigation.zsh new file mode 100644 index 0000000..3ae0525 --- /dev/null +++ b/tag-zsh/zsh_profile.d/navigation.zsh @@ -0,0 +1,2 @@ +setopt auto_cd +cdpath=($HOME $HOME/Code $HOME/Code/clients $HOME/Code/os) diff --git a/tag-zsh/zshrc b/tag-zsh/zshrc index 396b340..11e731b 100644 --- a/tag-zsh/zshrc +++ b/tag-zsh/zshrc @@ -97,3 +97,7 @@ source ~/.functions # Stop zsh from eating space before pipe symbol # https://superuser.com/questions/613685/how-stop-zsh-from-eating-space-before-pipe-symbol ZLE_REMOVE_SUFFIX_CHARS="" + +for zsh_source in $HOME/.zsh_profile.d/*.zsh; do + source $zsh_source +done From acb6aadbb12958c8e0030f6be02394ae8139d807 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 4 Sep 2019 23:32:37 +0100 Subject: [PATCH 11/11] Add platformsh.zsh --- tag-zsh/zsh_profile.d/platformsh.zsh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 tag-zsh/zsh_profile.d/platformsh.zsh diff --git a/tag-zsh/zsh_profile.d/platformsh.zsh b/tag-zsh/zsh_profile.d/platformsh.zsh new file mode 100644 index 0000000..8e8c2b6 --- /dev/null +++ b/tag-zsh/zsh_profile.d/platformsh.zsh @@ -0,0 +1,6 @@ +# Platform.sh CLI configuration. +export PATH="$HOME/"'.platformsh/bin':"$PATH" + +if [ -f "$HOME/"'.platformsh/shell-config.rc' ]; then + . "$HOME/"'.platformsh/shell-config.rc'; +fi