opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
302 commits 1 branch 0 tags 4.7 MiB
Commit graph

302 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oliver Davies 1dc9b4c7f5 Add Sublime Text preferences 2020-06-10 21:08:00 +01:00
Oliver Davies d51de5bb17 Revert "zsh: Use $_ANTIGEN_INSTALL_DIR for macOS" 
This reverts commit 29171bba91.
 2020-06-10 11:42:19 +01:00
Oliver Davies cb22f5ae67 Un-dot the bin directory 2020-06-10 02:20:19 +01:00
Oliver Davies 62e2db48ec zsh: Add comment for $TERM_PROGRAM 2020-06-09 22:35:43 +01:00
Oliver Davies 29171bba91 zsh: Use $_ANTIGEN_INSTALL_DIR for macOS 2020-06-09 22:23:19 +01:00
Oliver Davies 2f74e7443a zsh: Override antigen.zsh Linux path again 2020-06-09 22:20:32 +01:00
Oliver Davies 108d4fd9fd Add README 
Fixes #10
 2020-06-09 21:56:37 +01:00
Oliver Davies 10ac710d7c zsh: Switch path to antigen.zsh based on OS 
Switch the path to the antigen.zsh file (for loading ZSH plugins) based
on the OS (i.e. macOS and Linux) using the functions added in
91d7ca5005.

This should quicker than using the `find` command and locating the file
within the `/usr` directory.

References #9
 2020-06-09 21:41:59 +01:00
Oliver Davies 211ea05c0e Don't connect to tmux in PhpStorm terminal 2020-06-09 21:29:04 +01:00
Oliver Davies 91d7ca5005 Add functions for checking OS 2020-06-09 21:29:04 +01:00
Oliver Davies 14317a1230 Add Symfony and PHPUnit aliases 2020-06-09 19:09:25 +01:00
Oliver Davies 66e1869c72 git: Ensure that everything is clean 2020-06-01 19:54:57 +01:00
Oliver Davies 964472bbf5 git: Add option to force merge and skip CI check 2020-05-30 03:46:54 +01:00
Oliver Davies d258d9db8b zsh: Move call to ensure_tmux_is_running 2020-05-27 19:17:24 +01:00
Oliver Davies 171f251d89 git: Add methods for writing messages 
Refactor CI status output.
 2020-05-27 18:44:13 +01:00
Oliver Davies e8ff1fcc82 git: Don't push if the merge failed 
Add support for two different run types:

- Command: executes the command silently and returns whether or not
  there was an error. This is used to check if the merge was
  successful.
- Query: executes the command and returns the output. This is used for
  retrieving the tip commits of the branch.
 2020-05-27 17:56:15 +01:00
Oliver Davies e82e134e51 git: Refactor, use getopt() for parsing args 2020-05-27 16:11:38 +01:00
Oliver Davies 01a30f5168 git: Specify target branch using -t or --target 
Rather than using an environment variable, use -t or --target to specify
the target branch to merge into (e.g. master, develop, next).
 2020-05-27 11:26:18 +01:00
Oliver Davies 54b762b734 git: Ensure branches are in sync with upstream 2020-05-27 10:55:46 +01:00
Oliver Davies 35834bef8f git: Ensure methods have visibility set 2020-05-27 10:54:00 +01:00
Oliver Davies a1c3231a48 git: Allow for setting the target branch 2020-05-27 10:53:33 +01:00
Oliver Davies 979aa4a1fc git: Re-order methods, move invoke to near the top 2020-05-27 09:48:14 +01:00
Oliver Davies af429a74a4 git: Add check for CI error 2020-05-23 00:12:21 +01:00
Oliver Davies 87d5b689b2 git: Refactor to a lookup table 2020-05-23 00:05:24 +01:00
Oliver Davies 89ef98a15b git: Update abort message, remove break 2020-05-23 00:02:05 +01:00
Oliver Davies f98ebdba1e git: Check for CI status before closing the PR 2020-05-22 23:11:37 +01:00
Oliver Davies 16dd74bfe7 git: Add close-pull-request script 2020-05-22 22:52:12 +01:00
Oliver Davies d27af16512 Fix separators in path 2020-05-21 14:14:22 +01:00
Oliver Davies 3b8724c30f git: Change the default push to "upstream" 2020-05-20 10:47:17 +01:00
Oliver Davies 3ea811046d zsh: Rename navigation to path, move PATH 2020-05-13 01:08:05 +01:00
Oliver Davies bdcc85c50e
zsh: Alias c to clear 2020-05-11 20:20:50 +01:00
Oliver Davies 3674617172 Updated path to antigen 
Had to install antigen manually as per
https://github.com/zsh-users/antigen/issues/659, and have updated the
path to antigen.zsh to match.
 2020-05-06 17:33:20 +01:00
Oliver Davies 2caaa1ed57 Include .local/bin in PATH 2020-05-06 17:28:59 +01:00
Oliver Davies f864c6dc1e Fix path to rcrc 2020-05-06 17:27:41 +01:00
Oliver Davies c1af6463a7 git: Set vim as the editor for commits 2020-04-29 15:47:39 +01:00
Oliver Davies 7838681ef7 git: Reject non-ff merges 2020-04-29 13:50:53 +01:00
Oliver Davies d134275ecf vim: Add configuration for git commits 2020-04-29 13:49:41 +01:00
Oliver Davies 884b13bdf6 git: Add aliases for updating local branches 2020-04-29 13:48:19 +01:00
Oliver Davies 4a8fd3b6a0 Add git-abort and git-continue 2020-04-29 12:15:38 +01:00
Oliver Davies a8d75fc417 git: Simplify git-publish command 2020-04-29 12:12:27 +01:00
Oliver Davies 018ba7ae55 Ignore .zwc files 2020-04-23 15:33:54 +01:00
Oliver Davies a68b9fd0f3 Increase history size 2020-04-23 15:32:41 +01:00
Oliver Davies f46937d2de Fix case-insensitive autocompletion 2020-03-03 12:26:07 +00:00
Oliver Davies de5746401c Add completion script for g function 2020-03-03 00:51:30 +00:00
Oliver Davies efa6bcf778 Remove duplicate completion.zsh file 2020-03-03 00:44:30 +00:00
Oliver Davies 0865136067 Rename functions/g to configs/git.zsh 2020-03-02 23:40:17 +00:00
Oliver Davies e4fa6d1a5b Fix autocompletion for g function 
Fixes #4
 2020-02-25 21:53:36 +00:00
Oliver Davies 640e0f2a51 Allow for grouping pre and post configs 2020-02-25 21:52:57 +00:00
Oliver Davies 95a5bebec4 Create history.zsh 2020-02-06 09:20:34 +00:00
Oliver Davies ec68828f3d Add v as an alias for vagrant 2020-01-28 23:52:12 +00:00