RobH has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405025 )
Change subject: Update my dotfiles
......................................................................
Update my dotfiles
Change-Id: I40e001b48404a16222614a34b0ebc45e6ee1eca9
---
M modules/admin/files/home/demon/.ackrc
M modules/admin/files/home/demon/.bashrc
M modules/admin/files/home/demon/.gitconfig
A modules/admin/files/home/demon/.pylintrc
4 files changed, 77 insertions(+), 42 deletions(-)
Approvals:
jenkins-bot: Verified
RobH: Looks good to me, approved
diff --git a/modules/admin/files/home/demon/.ackrc
b/modules/admin/files/home/demon/.ackrc
index 2671ad3..a976e97 100644
--- a/modules/admin/files/home/demon/.ackrc
+++ b/modules/admin/files/home/demon/.ackrc
@@ -1,3 +1,9 @@
---ignore-case
---ignore-file=ext:ser
--s
+--color-filename=white
+--color-lineno=cyan
+--color-match=magenta underline
+--ignore-dir=.idea
+--ignore-dir=build
+--type-add=css=.styl
+--type-add=js=.coffee
+--type-set=md=.markdown,.md
+-i
diff --git a/modules/admin/files/home/demon/.bashrc
b/modules/admin/files/home/demon/.bashrc
index 51d48d2..49eca44 100644
--- a/modules/admin/files/home/demon/.bashrc
+++ b/modules/admin/files/home/demon/.bashrc
@@ -46,7 +46,7 @@
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval
"$(dircolors -b)"
- alias ls='ls --color=auto'
+ alias ls='ls -GFh'
#alias dir='dir --color=auto'
#alias vdir='vdir --color=auto'
diff --git a/modules/admin/files/home/demon/.gitconfig
b/modules/admin/files/home/demon/.gitconfig
index f5aa148..27f8b16 100644
--- a/modules/admin/files/home/demon/.gitconfig
+++ b/modules/admin/files/home/demon/.gitconfig
@@ -1,40 +1,64 @@
-[user]
- name = Chad Horohoe
- email = ch...@wikimedia.org
[alias]
- push-for-review = push origin HEAD:refs/for/master
- up = pull --ff-only
- log-graph = log --graph --oneline --branches --all
- rollback = reset --hard HEAD~1
- amend = commit -a --amend
- sub-up = submodule update --init --recursive
- push-for-review-g = push gerrit HEAD:refs/for/master
- praise = blame
- set = reset --hard
-[core]
- editor = vim
-[color]
- branch = auto
- diff = auto
- status = auto
-[color "branch"]
- current = yellow reverse
- local = yellow
- remote = green
-[color "diff"]
- meta = yellow bold
- frag = magenta bold
- old = red bold
- new = green bold
-[color "status"]
- added = yellow
- changed = green
- untracked = cyan
-[mergetool]
- keepBackup = false
-[gitreview]
- username = demon
-[url "https://gerrit.wikimedia.org/r/p/";]
- insteadOf = "gerrit:"
+ amend = commit -a --amend
+ fetch-fast = fetch --recurse-submodules --jobs=8 --prune
+ gerrit-setup = !hook="$(git rev-parse --git-dir)/hooks/commit-msg" && curl
"https://gerrit.wikimedia.org/r/tools/hooks/commit-msg"; > $hook && chmod +x
$hook
+ git = !git
+ log-graph = log --graph --oneline --branches --all
+ mergeit = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref
HEAD`}%l=Code-Review+2
+ oneline = log --no-merges --pretty=format:"%h%x09%an%x09%ad%x09%s"
+ praise = blame
+ review = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref
HEAD`}
+ rollback = reset --hard HEAD~1
+ set = reset --hard
+ show-files = show --name-only
+ sub-up = submodule update --init --recursive
+ tyler = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref
HEAD`}%r=thcipriani
+ up = pull --ff-only
[branch]
- autosetuprebase = always
+ autosetuprebase = always
+[core]
+ editor = vim
+ excludesfile = ~/.gitignore_global
+[color]
+ branch = auto
+ diff = auto
+ status = auto
+[color "branch"]
+ current = yellow reverse
+ local = yellow
+ remote = green
+[color "diff"]
+ frag = magenta bold
+ meta = yellow bold
+ new = green bold
+ old = red bold
+[color "status"]
+ added = yellow
+ changed = green
+ untracked = cyan
+[filter "lfs"]
+ clean = git-lfs clean -- %f
+ process = git-lfs filter-process
+ required = true
+ smudge = git-lfs smudge -- %f
+[gitreview]
+ username = demon
+[git-change]
+ gerrit-ssh-host = gerrit.wikimedia.org
+[http]
+ cookiefile = ~/.gitcookies
+[merge]
+ keepBackup = false
+ conflictstyle = diff3
+[push]
+ default = simple
+[url "https://gerrit.wikimedia.org/r/p/";]
+ insteadOf = "gerrit:"
+[url "https://github.com/";]
+ insteadOf = "github:"
+[url "https://phabricator.wikimedia.org/source/";]
+ insteadOf = "phab:"
+[user]
+ email = ch...@wikimedia.org
+ name = Chad Horohoe
+ signingkey = 23107F8A
diff --git a/modules/admin/files/home/demon/.pylintrc
b/modules/admin/files/home/demon/.pylintrc
new file mode 100644
index 0000000..4b1e421
--- /dev/null
+++ b/modules/admin/files/home/demon/.pylintrc
@@ -0,0 +1,5 @@
+[MASTER]
+jobs=4
+
+[REPORTS]
+reports=yes
--
To view, visit https://gerrit.wikimedia.org/r/405025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40e001b48404a16222614a34b0ebc45e6ee1eca9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
