From 9fd4e85b6365a33e9146b562e0aace0f2786d88d Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Fri, 17 Jul 2015 11:04:54 +0200 Subject: [PATCH] More stuffs --- files/dircolors | 309 +++++++++++++++++++++++++++++++++++++++++ files/gitconfig | 7 + files/gitignore_global | 31 +++++ files/nanorc | 68 +++++++++ files/zshrc | 48 +++++++ install | 14 ++ install.conf.yaml | 13 ++ zsh/alias.zsh | 18 +-- zsh/antigen.zsh | 35 ----- 9 files changed, 499 insertions(+), 44 deletions(-) create mode 100644 files/dircolors create mode 100644 files/gitconfig create mode 100644 files/gitignore_global create mode 100644 files/nanorc create mode 100644 files/zshrc create mode 100755 install create mode 100644 install.conf.yaml delete mode 100644 zsh/antigen.zsh diff --git a/files/dircolors b/files/dircolors new file mode 100644 index 0000000..bec0c25 --- /dev/null +++ b/files/dircolors @@ -0,0 +1,309 @@ +# Configuration file for dircolors, a utility to help you set the +# LS_COLORS environment variable used by GNU ls with the --color option. + +# Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted provided the copyright notice and this notice are preserved. +# +# You can copy this file to .dir_colors in your $HOME directory to override +# the system defaults. + +# Below, there should be one TERM entry for each termtype that is colorizable +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM console +TERM cygwin +TERM dtterm +TERM gnome +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM rxvt +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM screen +TERM screen-256color +TERM screen-bce +TERM screen-w +TERM screen.linux +TERM vt100 +TERM xterm +TERM xterm-256color +TERM xterm-color +TERM xterm-debian + +# Special files + +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +NORMAL 00;37 # global default, although everything should be something. +FILE 01;34 # normal file +RESET 00;37 # reset to "normal" color +DIR 00;34 # directory +LINK 00;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00;37 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 00;35 # socket +DOOR 00;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 00;05;37;41 # orphaned syminks +MISSING 00;05;37;41 # ... and the files they point to +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 04;34 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable +EXEC 00;32 # This is for files with execute permission: + +# If you use DOS-style suffixes, you may want to uncomment the following: +.cmd 00;33 # executables (bright green) +.exe 00;33 +.com 00;33 +.btm 00;33 +.bat 00;33 + +## Archives or compressed (red) +.tar 01;31 +.tgz 01;31 +.arj 01;31 +.taz 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lz 01;31 +.xz 01;31 +.bz 01;31 +.bz2 01;31 +.bzip2 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.rar 01;31 # rar +.ace 01;31 # unace +.zoo 01;31 # zoo +.cpio 01;31 # cpio +.7z 01;31 # p7zip +.rz 01;31 # rzip +.apk 01;31 # rzip +.gem 01;31 # rzip + +## image formats (magenta) +.jpg 00;35 +.JPG 00;35 +.jpeg 00;35 +.gif 00;35 +.bmp 00;35 +.pbm 00;35 +.pgm 00;35 +.ppm 00;35 +.tga 00;35 +.xbm 00;35 +.xpm 00;35 +.tif 00;35 +.tiff 00;35 +.png 00;35 +.svg 00;35 +.svgz 00;35 +.mng 00;35 +.pcx 00;35 +.dl 00;35 +.xcf 00;35 +.xwd 00;35 +.yuv 00;35 +.cgm 00;35 +.emf 00;35 +.eps 00;35 +.CR2 00;35 +.ico 00;35 + +## Document files (green) +.pdf 00;32 +.ps 00;32 +.txt 00;32 +.html 00;32 +.rst 00;32 +.md 00;32 +.patch 00;32 +.diff 00;32 +.tex 00;32 +.doc 00;32 +.xml 00;32 +.xls 00;32 +.xlsx 00;32 +.doc 00;32 +.docx 00;32 +.ppt 00;32 +.pptx 00;32 +.key 00;32 # Keynote presentation + +## Template files (bright green) +.pt 01;32 # Zope page template +.tmpl 01;32 +.in 01;32 + +## Audio formats (bright red) +.aac 01;36 +.au 01;36 +.flac 01;36 +.mid 01;36 +.midi 01;36 +.mka 01;36 +.mp3 01;36 +.mpc 01;36 +.ogg 01;36 +.ra 01;36 +.wav 01;36 +.m4a 01;36 +.axa 01;36 +.oga 01;36 +.spx 01;36 +.xspf 01;36 + +## Video formats (as audio + bold) +.mov 01;36 +.mpg 01;36 +.mpeg 01;36 +.m2v 01;36 +.mkv 01;36 +.ogm 01;36 +.mp4 01;36 +.m4v 01;36 +.mp4v 01;36 +.vob 01;36 +.qt 01;36 +.nuv 01;36 +.wmv 01;36 +.asf 01;36 +.rm 01;36 +.rmvb 01;36 +.flc 01;36 +.avi 01;36 +.fli 01;36 +.flv 01;36 +.gl 01;36 +.m2ts 01;36 +.divx 01;36 +.webm 01;36 +.axv 01;36 +.anx 01;36 +.ogv 01;36 +.ogx 01;36 + +## Config files (cyan) +.conf 00;36 +.cnf 00;36 +.cfg 00;36 +.ini 00;36 +.properties 00;36 +.yaml 00;36 +.vcl 00;36 # Varnish + +## Source code files (yellow) +.c 00;33 +.cpp 00;33 +.py 00;33 +.coffesscript 00;33 +.js 00;33 +.rb 00;33 +.sh 00;33 +.zsh 00;33 +.env 00;33 +.bash 00;33 +.php 00;33 +.java 00;33 +.zcml 00;33 # Zope configuration language + +## Data / database (green) +.db 00;32 +.sql 00;32 +.json 00;32 +.plist 00;32 # OSX properties +.fs 00;32 # ZODB Data.fs + +## Files of special interest (base1 + bold) +.tex 01;37 +.rdf 01;37 +.owl 01;37 +.n3 01;37 +.ttl 01;37 +.nt 01;37 +.torrent 01;37 +.xml 01;37 +*Makefile 01;37 +*Rakefile 01;37 +*build.xml 01;37 +*rc 01;37 +.nfo 01;37 +*README 01;37 +*README.txt 01;37 +*readme.txt 01;37 +*README.markdown 01;37 +*README.md 01;37 +.ini 01;37 +.yml 01;37 +.cfg 01;37 +.conf 01;37 +.c 01;37 +.cpp 01;37 +.cc 01;37 + +## Machine generated files / non-important (bright black) +.log 01;30 +.bak 01;30 +.aux 01;30 +.lof 01;30 +.lol 01;30 +.lot 01;30 +.out 01;30 +.toc 01;30 +.bbl 01;30 +.blg 01;30 +*~ 01;30 +*# 01;30 +.part 01;30 +.incomplete 01;30 +.swp 01;30 +.tmp 01;30 +.temp 01;30 +.o 01;30 +.obj 01;30 +.pyc 01;30 +.pyo 01;30 +.class 01;30 +.cache 01;30 +.egg-info 01;30 diff --git a/files/gitconfig b/files/gitconfig new file mode 100644 index 0000000..a7a7bb0 --- /dev/null +++ b/files/gitconfig @@ -0,0 +1,7 @@ +[user] + email = nikolasweger@googlemail.com + name = Nikolas Weger +[push] + default = simple +[core] + excludesfile = ~/.gitignore_global diff --git a/files/gitignore_global b/files/gitignore_global new file mode 100644 index 0000000..b9c0cc3 --- /dev/null +++ b/files/gitignore_global @@ -0,0 +1,31 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so +*.pyc + +# Editing tools and IDEs # +########################## +*.swp +*~ + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db diff --git a/files/nanorc b/files/nanorc new file mode 100644 index 0000000..bff566a --- /dev/null +++ b/files/nanorc @@ -0,0 +1,68 @@ +include ~/dotfiles/lib/nano/syntax/apacheconf.nanorc +include ~/dotfiles/lib/nano/syntax/asciidoc.nanorc +include ~/dotfiles/lib/nano/syntax/asm.nanorc +include ~/dotfiles/lib/nano/syntax/awk.nanorc +include ~/dotfiles/lib/nano/syntax/c.nanorc +include ~/dotfiles/lib/nano/syntax/cmake.nanorc +include ~/dotfiles/lib/nano/syntax/coffeescript.nanorc +include ~/dotfiles/lib/nano/syntax/colortest.nanorc +include ~/dotfiles/lib/nano/syntax/conf.nanorc +include ~/dotfiles/lib/nano/syntax/csharp.nanorc +include ~/dotfiles/lib/nano/syntax/css.nanorc +include ~/dotfiles/lib/nano/syntax/cython.nanorc +include ~/dotfiles/lib/nano/syntax/dot.nanorc +include ~/dotfiles/lib/nano/syntax/email.nanorc +include ~/dotfiles/lib/nano/syntax/fish.nanorc +include ~/dotfiles/lib/nano/syntax/fortran.nanorc +include ~/dotfiles/lib/nano/syntax/gentoo.nanorc +include ~/dotfiles/lib/nano/syntax/git.nanorc +include ~/dotfiles/lib/nano/syntax/glsl.nanorc +include ~/dotfiles/lib/nano/syntax/go.nanorc +include ~/dotfiles/lib/nano/syntax/groff.nanorc +include ~/dotfiles/lib/nano/syntax/haml.nanorc +include ~/dotfiles/lib/nano/syntax/html.nanorc +include ~/dotfiles/lib/nano/syntax/ini.nanorc +include ~/dotfiles/lib/nano/syntax/inputrc.nanorc +include ~/dotfiles/lib/nano/syntax/java.nanorc +include ~/dotfiles/lib/nano/syntax/javascript.nanorc +include ~/dotfiles/lib/nano/syntax/js.nanorc +include ~/dotfiles/lib/nano/syntax/json.nanorc +include ~/dotfiles/lib/nano/syntax/keymap.nanorc +include ~/dotfiles/lib/nano/syntax/kickstart.nanorc +include ~/dotfiles/lib/nano/syntax/ledger.nanorc +include ~/dotfiles/lib/nano/syntax/lisp.nanorc +include ~/dotfiles/lib/nano/syntax/lua.nanorc +include ~/dotfiles/lib/nano/syntax/makefile.nanorc +include ~/dotfiles/lib/nano/syntax/man.nanorc +include ~/dotfiles/lib/nano/syntax/markdown.nanorc +include ~/dotfiles/lib/nano/syntax/mpdconf.nanorc +include ~/dotfiles/lib/nano/syntax/mutt.nanorc +include ~/dotfiles/lib/nano/syntax/nanorc.nanorc +include ~/dotfiles/lib/nano/syntax/nginx.nanorc +include ~/dotfiles/lib/nano/syntax/patch.nanorc +include ~/dotfiles/lib/nano/syntax/peg.nanorc +include ~/dotfiles/lib/nano/syntax/perl.nanorc +include ~/dotfiles/lib/nano/syntax/php.nanorc +include ~/dotfiles/lib/nano/syntax/pkg-config.nanorc +include ~/dotfiles/lib/nano/syntax/pkgbuild.nanorc +include ~/dotfiles/lib/nano/syntax/po.nanorc +include ~/dotfiles/lib/nano/syntax/pov.nanorc +include ~/dotfiles/lib/nano/syntax/privoxy.nanorc +include ~/dotfiles/lib/nano/syntax/python.nanorc +include ~/dotfiles/lib/nano/syntax/reST.nanorc +include ~/dotfiles/lib/nano/syntax/rpmspec.nanorc +include ~/dotfiles/lib/nano/syntax/ruby.nanorc +include ~/dotfiles/lib/nano/syntax/scala.nanorc +include ~/dotfiles/lib/nano/syntax/sed.nanorc +include ~/dotfiles/lib/nano/syntax/sh.nanorc +include ~/dotfiles/lib/nano/syntax/sql.nanorc +include ~/dotfiles/lib/nano/syntax/systemd.nanorc +include ~/dotfiles/lib/nano/syntax/tcl.nanorc +include ~/dotfiles/lib/nano/syntax/tex.nanorc +include ~/dotfiles/lib/nano/syntax/vala.nanorc +include ~/dotfiles/lib/nano/syntax/vi.nanorc +include ~/dotfiles/lib/nano/syntax/xml.nanorc +include ~/dotfiles/lib/nano/syntax/xresources.nanorc +include ~/dotfiles/lib/nano/syntax/yaml.nanorc +include ~/dotfiles/lib/nano/syntax/yum.nanorc +include ~/dotfiles/lib/nano/syntax/zsh.nanorc diff --git a/files/zshrc b/files/zshrc new file mode 100644 index 0000000..0d06db4 --- /dev/null +++ b/files/zshrc @@ -0,0 +1,48 @@ +# ohmyzsh Path +export ZSH=$HOME/dotfiles/lib/ohmyzsh + +# ohmyzsh Theme +ZSH_THEME="pygmalion" + +# Path +export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$PATH" + +# plugins +plugins=(gem bundler composer git pip vagrant docker python extract) +plugins+=(npm archlinux systemd systemadmin frontend-search gitignore) +plugins+=(command-not-found colored-man) + +# Color TERM +export TERM=xterm-256color + +# Preferred editor for local and remote sessions +export EDITOR='nano' + +# Load Oh My ZSH +source $ZSH/oh-my-zsh.sh + +# Shell Syntax Highlighter +source ~/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh +source ~/dotfiles/lib/highlighting/main/main-highlighter.zsh +source ~/dotfiles/lib/highlighting/brackets/brackets-highlighter.zsh +ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets) + +# CD without typing cd +setopt autocd + +# History +setopt histsavenodups +setopt histverify +setopt histignorealldups +setopt extendedhistory +setopt histreduceblanks +export HISTSIZE=1000000 SAVEHIST=1000000 HISTFILE=$HOME/.zhistory + +# Dircolors +eval `dircolors ~/dotfiles/files/dircolors` + +# Source Aliases +source ~/dotfiles/zsh/alias.zsh + +# Completions Path +fpath=(~/dotfiles/lib/completions/src $fpath) diff --git a/install b/install new file mode 100755 index 0000000..b1baa33 --- /dev/null +++ b/install @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +CONFIG="install.conf.yaml" +DOTBOT_DIR="dotbot" + +DOTBOT_BIN="bin/dotbot" +BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +cd "${BASEDIR}" +git submodule update --init --recursive "${DOTBOT_DIR}" + +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" diff --git a/install.conf.yaml b/install.conf.yaml new file mode 100644 index 0000000..9772f5d --- /dev/null +++ b/install.conf.yaml @@ -0,0 +1,13 @@ +- clean: ['~', '~/.config'] + +- link: + ~/.dotfiles: '' + ~/.nanorc: files/nanorc + ~/.dircolors: files/dircolors + ~/.gitconfig: files/gitconfig + ~/.gitignore_global: files/gitignore_global + ~/.zsh: zsh/ + ~/.zshrc: files/zshrc + +- shell: + - git update-submodules # after linking ~/.gitconfig diff --git a/zsh/alias.zsh b/zsh/alias.zsh index 0511f1b..7b1fd5a 100644 --- a/zsh/alias.zsh +++ b/zsh/alias.zsh @@ -1,26 +1,26 @@ # Listing -source ~/dotfiles/zsh/aliases.d/list.zsh +source ~/.zsh/aliases.d/list.zsh # Grep -source ~/dotfiles/zsh/aliases.d/grep.zsh +source ~/.zsh/aliases.d/grep.zsh # Tail -source ~/dotfiles/zsh/aliases.d/tail.zsh +source ~/.zsh/aliases.d/tail.zsh # CD -source ~/dotfiles/zsh/aliases.d/cd.zsh +source ~/.zsh/aliases.d/cd.zsh # Du/Find -source ~/dotfiles/zsh/aliases.d/find.zsh +source ~/.zsh/aliases.d/find.zsh # Stuff -source ~/dotfiles/zsh/aliases.d/stuff.zsh +source ~/.zsh/aliases.d/stuff.zsh # Interactive -source ~/dotfiles/zsh/aliases.d/interactive.zsh +source ~/.zsh/aliases.d/interactive.zsh # Own -source ~/dotfiles/zsh/aliases.d/own.zsh +source ~/.zsh/aliases.d/own.zsh # Transfer -source ~/dotfiles/zsh/aliases.d/transfer.zsh +source ~/.zsh/aliases.d/transfer.zsh diff --git a/zsh/antigen.zsh b/zsh/antigen.zsh deleted file mode 100644 index e4476ee..0000000 --- a/zsh/antigen.zsh +++ /dev/null @@ -1,35 +0,0 @@ -# Load Antigen -source ~/.antigen/antigen.zsh - -# Oh-My-ZSH Library -antigen use oh-my-zsh - -# Theme -antigen theme pygmalion - -# Load Plugins -antigen bundles <