diff options
| author | David Runge <david.runge@frqrec.com> | 2014-11-28 15:52:21 +0100 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-11-28 15:52:21 +0100 |
| commit | 95e4d20a21054bcc3240e733662a5f2aaa331292 (patch) | |
| tree | 8fd54e6e262f1c3a2800ce86c7d2571e9228a7b1 /.gitignore | |
| parent | e39c0420a829c4507989f88c446461b05af9b7aa (diff) | |
| parent | 80fdb114410b477170a56061d60f5c6316043acc (diff) | |
| download | dotfiles-95e4d20a21054bcc3240e733662a5f2aaa331292.tar.gz dotfiles-95e4d20a21054bcc3240e733662a5f2aaa331292.tar.bz2 dotfiles-95e4d20a21054bcc3240e733662a5f2aaa331292.tar.xz dotfiles-95e4d20a21054bcc3240e733662a5f2aaa331292.zip | |
Merge branch 'master' of https://git.frqrec.com/git/dot
* 'master' of https://git.frqrec.com/git/dot: (22 commits)
.gitignore: Adding further programs and their configs to the list, removing double entries
mc panels.ini: Adding panels.ini.
Qsampler.conf: Adding first config.
.nvimrc: Adding config for NeoVim (symlink to Vim config).
.linphonerc: Adding first linphone config file
patchagerc: Adding first config file (still very messy with JACK session)
mc ini: Adding first ini
start_jack: Removing unneeded comments, adding TODO for external config file.
checkip: Adding two more possible versions for checking global IP behind NAT. Version using dig now default.
adjust_dpms: Merging script based programs into the same Array as the others. Adding -x to pidof check.
khard.conf: Adding first khard config for several address books
prompt_dvzrv_setup: Adding custom prompt based on steeef_simplified with additional ssh check and exit code printout.
prompt.zsh: Switching to custom prompt 'dvzrv'
functions.zsh: Making rsync functions more readable by splitting lines.
export.zsh: Lowering REPORTTIME to 5 (seconds)
aliases.zsh: Adding more systemd aliases.
.zpreztorc: Adding highlighting modes.
termite: Removing all non-valid settings. Adding transparency setting and colors again.
redshift.conf: Choosing xrandr as backend. Setting transition time to 0. Using on screen 0 only.
dpms: Adding script based programs to the list of programs.
...
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -185,6 +185,7 @@ svn/ .fontconfig/ .fonts/ .forward +.fst/ .gconf/ .gem/ .gemrc @@ -213,12 +214,14 @@ svn/ .jackdrc .java/ .jdownloader/ +.jsampler/ .kde4/ .keychain/ .khal/ .kicad .lesshst .lfm_history +.linphone-history* .lives .lives-dir/ .log @@ -241,6 +244,7 @@ svn/ .local/share/gvfs-metadata/ .local/share/icc/ .local/share/icons/ +.local/share/mc/ .local/share/mime/ .local/share/recently-used.xbel .local/share/shotwell @@ -272,6 +276,7 @@ svn/ .neocon/ .nicotine/ .nvidia-settings-rc +.nviminfo .octave_hist .openra .p7zip @@ -333,7 +338,6 @@ svn/ .vim/vim-addons/ .vim/.* .vim/yankring* -.viminfo .vimperator/ .vimpressrc .viminfo |