Skip to content

Commit

Permalink
Merge branch 'master' of github.com:edbizarro/dotfiles into vaporwave
Browse files Browse the repository at this point in the history
  • Loading branch information
edbizarro committed Sep 16, 2018
2 parents b4eb765 + 5797b29 commit db96137
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ A collection of my personal dotfiles. Here's a little preview of what it can loo

![ncmpcpp + cava + lyvi](https://i.imgur.com/NMQfpGx.jpg?1)

#### Previous themes

Previous themes can be found on [reddit](https://www.reddit.com/r/unixporn/search?q=author:edbizarro&sort=new&restrict_sr=on&t=all) and [releases](https://github.com/edbizarro/dotfiles/releases) page
### Requirements

* [zsh](http://www.zsh.org)
Expand Down
2 changes: 2 additions & 0 deletions git/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@
# Usage: $ git wipe
#
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
clippy = !sh -c 'git $1 | cowsay -n -f ~/.config/cows/clippit.cow' -
clippit = !sh -c 'git $1 | cowsay -n -f ~/.config/cows/clippit.cow' -
[credential]
helper = cache
[init]
Expand Down
3 changes: 1 addition & 2 deletions tmux/plugins.tmux
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @plugin 'tmux-plugins/tmux-online-status'

set -g @continuum-restore 'on'
set -g @resurrect-capture-pane-contents 'on'

set -g @online_icon ""
set -g @offline_icon ""
3 changes: 3 additions & 0 deletions zsh/aliases/docker.zsh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
alias dkc=docker-compose


A_BASE=$HOME/.cache/gitlab-ci-pipeline-php

# define specific cache directories
Expand Down
10 changes: 7 additions & 3 deletions zsh/aliases/general.zsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# ALIAS
alias ls='ls -Glah --color=always'
alias ll='ls -lah'
alias ls="ls -lah --color=auto --group-directories-first"
alias ll="ls -lah --color=auto --group-directories-first"
alias l='ls -CF'

alias show-fonts="fc-list | cut -d ' ' -f2 | sort -u"
alias vim="nvim"

alias reboot='sudo systemctl reboot'
alias shutdown='sudo systemctl poweroff'

alias monitor_disk='sudo iotop -Pao'
2 changes: 1 addition & 1 deletion zsh/aliases/yaourt.zsh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
alias update-shit='yaourt -Syyua --noconfirm'
alias update-shit='pacman -Syu && yaourt -Syyua --noconfirm'

0 comments on commit db96137

Please sign in to comment.