diff options
author | David Runge <david.runge@native-instruments.de> | 2018-11-24 14:19:45 +0100 |
---|---|---|
committer | David Runge <david.runge@native-instruments.de> | 2018-11-24 14:19:45 +0100 |
commit | f4fec3ab8e56e82bf7904c3c19876e2f4e13667d (patch) | |
tree | 23a4dd266333fc6cfeb5ee05c6000ced30724098 /.zsh.after | |
parent | 31895b1b525ab673becdb10c7a421f71510f6354 (diff) | |
parent | de1f86528b58faa0844f24b9edb63e5837dd7444 (diff) | |
download | dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.gz dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.bz2 dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.tar.xz dotfiles-f4fec3ab8e56e82bf7904c3c19876e2f4e13667d.zip |
Merge branch 'master' of git.sleepmap.de:config/dotfiles
* 'master' of git.sleepmap.de:config/dotfiles: (36 commits)
.config/packages-community.txt: Adding pd-lua.
.config/systemd/user/mpd@.service: Adding local override for mpd@ user service. Raising LimitRTPrio to 75, as some threads in mpd apparently require it.
.config/jack/*: Changing all configurations for jack@ user service (as its layout has changed).
.gitignore: Removing ignore of .config/systemd (time to add some local overrides).
.config/packages-aur.txt: Removing ssr (now in [community]).
.config/systemd/user/jack@.service: Adding a local jack@ user service, so no package is required.
.config/packages-community.txt: Adding dragonfly-reverb, libmusicxml, ssr and wolf-shaper.
.ncmpcpp/config: Switching to local visualizer fifo. Using visualizer_type ellipse.
.zsh.after/aliases.zsh: Removing useless pacsearch overloading.
bin/setup_screens: Fixing and simplifying various things with the help of shellcheck. Using a separate get_display function to retrieve DISPLAY.
bin/xorg_autolock: Properly quoting variables. Abstracting lock_cmd.
bin/xorg_lock: Properly quote variables. Rename variables for better readibility.
.xprofile: Repaired with the help of shellcheck.
.config/packages-community.txt: Adding marsyas.
.config/packages-aur.txt: Removing gmsynth.lv2 (now in community). Adding librenms and patroneo-git.
.config/packages-community.txt: Adding ams-lv2, beatslash-lv2, gmsynth.lv2, lib32-fluidsynth, lsp-plugins, lvtk, stk and removing ssmtp.
bin/cs: Fixing script according to shellcheck.
.config/packages-community.txt: Adding nextcloud-app-spreed.
.vim/addons-settings.vim: Adding supercollider settings for split in tmux.
.config/linuxsampler.org/Qsampler.conf: Remove, because it makes no sense in repo.
...
Diffstat (limited to '.zsh.after')
-rw-r--r-- | .zsh.after/aliases.zsh | 1 | ||||
-rw-r--r-- | .zsh.after/export.zsh | 3 | ||||
-rw-r--r-- | .zsh.after/functions.zsh | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh index 8a86938..413dd3b 100644 --- a/.zsh.after/aliases.zsh +++ b/.zsh.after/aliases.zsh @@ -162,7 +162,6 @@ alias pac='sudo pacman -S' #Install specific package(s) from the repositories alias pacu='sudo pacman -U' #Install specific package not from the repositories but from a file alias pacre='sudo pacman -R' #Remove the specified package(s), retaining its configuration(s) and required dependencies alias pacrem='sudo pacman -Rns' #Remove specified package(s), its configuration(s) and unneeded depends -alias pacsearch="pacman -Sl | cut -d' ' -f2 | grep " #Search through all available packages in repo alias pacname="sudo pacman -Qi|grep Name|grep " #Search through names of packages by string alias pacri='pacman -Si' #Display information about a given package in the repositories alias pacrs='pacman -Ss' #Search for package(s) in the repositories diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh index 45dbe9b..89ba7dc 100644 --- a/.zsh.after/export.zsh +++ b/.zsh.after/export.zsh @@ -1,5 +1,4 @@ -# use xterm-color anywhere. Sane default for color and termite -if [[ -n $TMUX ]] && [[ $VENDOR != "apple" ]];then +if [[ -n $TMUX ]] && [[ $VENDOR != "apple" ]] && [[ ! -e /etc/debian_version ]]; then export TERM="tmux-256color" elif [[ -n $STY ]];then export TERM="screen-256color" diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh index b089ff6..e2af147 100644 --- a/.zsh.after/functions.zsh +++ b/.zsh.after/functions.zsh @@ -203,13 +203,13 @@ ex2() { ## RSYNC backupinfo() { - log_cyan "INFO" rsync\ -r\ -n\ -t\ -p\ -o\ + -h\ -g\ -v\ --progress\ @@ -232,6 +232,7 @@ backupfolder() { -t\ -p\ -o\ + -h\ -g\ -v\ --progress\ |