zsh

.bash_aliases

@@ -0,0 +1,4 @@
+
+alias "gs=git status -uno"
+alias "gpr=git pull --rebase"
+

.emacs

@@ -1,7 +1,147 @@
+;;; mh.emacs --- Summary 
+
+
+(require 'package)
+(setq package-enable-at-startup nil)
+(setq package-archives '(("gnu"       . "https://elpa.gnu.org/packages/")
+                         ("marmalade" . "https://marmalade-repo.org/packages/")
+                         ("melpa"     . "https://melpa.org/packages/")
+                         ("org"       . "http://orgmode.org/elpa/")))
+(package-initialize)
+
+;; Bootstrap `use-package'
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+
+(setq make-backup-files nil) ;; stop creating those backup~ files
+(setq auto-save-default nil) ;; stop creating those #autosave# files
+
+;; keine "yes-or-no"-Fragen - "y-or-n" reicht aus
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+;; Zusammengehoerende Klammern hervorheben
+(show-paren-mode 1)
+;; Text zwischen den Klammern nicht hervorheben
+(setq show-paren-style 'parenthesis)
+
+(use-package which-key
+  :ensure t
+  :config
+  (which-key-mode))
+
+; Buffer Menu
+(global-set-key (kbd "C-x C-b") 'buffer-menu)
+
+(use-package flycheck
+  :ensure t
+  :init
+  (global-flycheck-mode t))
 
 (require 'xcscope)
+  (setq ido-enable-flex-matching t)
+  (setq ido-everywhere t)
+  (ido-mode 1)
+(cscope-setup)
+;(setq cscope-command-args -R )
+;(add-hook 'vhdl-mode-hook (function cscope-minor-mode))
 
 (require 'ecb)
+  (setq ido-enable-flex-matching t)
+  (setq ido-everywhere t)
+  (ido-mode 1)
+
+(require 'cedet)
+(global-ede-mode t)
+
+; Make umlauts work
+(set-language-environment 'german)
+(set-terminal-coding-system 'iso-latin-1)
+
+(setq c-default-style "linux"
+          c-basic-offset 2)
+
+(setq-default c-basic-offset 2
+                  tab-width 2
+                  indent-tabs-mode t)
+
+(org-babel-do-load-languages
+      'org-babel-load-languages
+      '((emacs-lisp . t)
+        (R . t) (perl . t) (C . t)  ))
+
+;; Frame title bar formatting to show full path of file
+(setq-default
+ frame-title-format
+ (list '((buffer-file-name " %f" (dired-directory
+                                  dired-directory
+                                  (revert-buffer-function " %b"
+                                  ("%b - Dir:  " default-directory)))))))
+
+(setq-default
+ icon-title-format
+ (list '((buffer-file-name " %f" (dired-directory
+                                  dired-directory
+                                  (revert-buffer-function " %b"
+                                  ("%b - Dir:  " default-directory)))))))
 
 
+(setq-default indent-tabs-mode t)
+(setq tab-width 4)
+
+(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+
+;; --------- Smart-tabs -------------
+
+(setq-default c-basic-offset 4
+              tab-width 4
+              indent-tabs-mode t)
+
+(smart-tabs-add-language-support c++ c++-mode-hook
+  ((c-indent-line . c-basic-offset)
+   (c-indent-region . c-basic-offset)))
+(smart-tabs-advice vhdl-indent-line vhdl-basic-offset)
+
+(smart-tabs-insinuate 'c 'c++ 'javascript)
+
+
+;; ------ Flycheck ------------------
+
+(add-hook 'after-init-hook #'global-flycheck-mode)
+
+(use-package flycheck
+  :ensure t
+  :init (global-flycheck-mode))
+
+(flycheck-define-checker vhdl-nvc
+ "A VHDL syntax checker using nvc."
+ :command ("nvc" "--message=compact" "-a" source)
+ :error-patterns ((error line-start (file-name) ":" line ":" column ": error: " (message) line-end))
+ :modes vhdl-mode)
+
+;; ---------------------------------------------------
+
+'(package-selected-packages
+	 (quote
+		(which-key use-package s flymake-cppcheck flycheck-elixir flycheck-cython eval-in-repl ecb cppcheck)))
+'(show-trailing-whitespace t)
+
+(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+
+;; ----------------------------------
+
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(show-trailing-whitespace t)
+ '(vhdl-indent-tabs-mode t))
 

.gitconfig

@@ -1,8 +1,24 @@
 [mergetool "meld2way"]
-	cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
+	cmd = meld \"$LOCAL\" \"$REMOTE\"
 [mergetool "meld3way"]
-	cmd = meld --output \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
+	cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
+#	cmd = meld --output \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
 [merge]
+	tool = meld3way
+[diff]
 	tool = meld2way
 [include]
         path = ~/.gituser
+[color]
+	ui = auto
+[push]
+	default = simple
+[user]
+	email = mhop@posteo.de
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[oh-my-zsh]
+	hide-dirty = 1

.tmux.conf

@@ -133,3 +133,21 @@ setw -g clock-mode-style 24
 # " windowlist -b
 unbind '"'
 bind '"' choose-window
+
+set-option -g history-limit 100000
+
+#set-option -g allow-rename off
+
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+
+# Other examples:
+# set -g @plugin 'github_username/plugin_name'
+# set -g @plugin 'git@github.com/user/plugin'
+# set -g @plugin 'git@bitbucket.com/user/plugin'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
+

.zshrc

@@ -0,0 +1,90 @@
+# Path to your oh-my-zsh installation.
+  export ZSH=/home/marc/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+#ZSH_THEME="robbyrussell"
+#ZSH_THEME="agnoster"
+ZSH_THEME="jreese"
+#ZSH_THEME=alanpeabody
+#ZSH_THEME="miloshadzic"
+
+DEFAULT_USER=`whoami`
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+
+# User configuration
+
+# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+# export MANPATH="/usr/local/man:$MANPATH"
+
+source $ZSH/oh-my-zsh.sh
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"