Compare commits

..

No commits in common. '9217b2351b4b04d211a4f32d0a34105bebf8ebd7' and '8207fe6d62d8c5ed95e1f8a89cab266abbdeacfc' have entirely different histories.

  1. 28
      .bashrc
  2. 4
      .dialogrc
  3. 17
      .ssh/config
  4. 6
      .ssh/config.d/maschinendeck
  5. 9
      .ssh/config.d/propeller
  6. 43
      .tmux.conf
  7. 2
      .vimrc

@ -36,10 +36,8 @@ shopt -sq dirspell # Tab comp can fix dir name typos
# PATH
export PATH="/usr/local/opt/ncurses/bin:$PATH"
export PATH="/usr/local/bin:/Users/mochmann/.cargo/bin:$PATH"
#export PATH="/usr/local/Cellar:$PATH"
export PATH="/usr/local/sbin:$PATH"
export PATH="/usr/texbin:$PATH"
export PATH="/usr/local/bin/:/Users/mochmann/.cargo/bin:$PATH"
export PATH="/usr/local/Cellar:$PATH"
export PATH="$PATH:/Users/mochmann/.dotnet/tools"
export PATH="/usr/local/opt/mysql@5.7/bin:$PATH"
export PATH="/usr/local/opt/libpq/bin:$PATH"
@ -108,8 +106,8 @@ __prompt_command() {
else
PS1+="${BGre}\u${Mag}"
fi
PS1+="${Red}@\h "
local PSCol="$BPur"
PS1+="${Pur}@\h "
local PSCol="$BBlu"
PS1+="${PSCol}\w${RCol}" # Current working dir
if [ $EXIT != 0 ]
@ -147,7 +145,7 @@ __prompt_command() {
local branch=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
if [ "$branch" != "" ]
then
branch="${Whi}${Blu} $branch"
branch="${Whi}${Cya} $branch"
fi
PS1+=" ${branch}${Yel}${RCol}"
}
@ -250,21 +248,6 @@ whichport() {
sudo lsof -i -P | grep LISTEN | grep ":$1"
}
panpdf() {
folder=$(dirname $1)
file=$(basename $1)
if [ ! -f "$folder/$file" ]
then
echo "no such file or directory : '$folder/$file'"
return
fi
name=$(echo $file | cut -d '.' -f 1)
pandoc -w pdf -o "$folder/$name.pdf" "$folder/$file"
}
# ENVIRONMENT
NPM_PACKAGES="${HOME}/.npm-packages"
@ -317,4 +300,3 @@ if [ -z "$TMUX" ] && command -v tmux &> /dev/null && [ -n "$SSH_TTY" ] && [ -z "
tmux attach-session -t $USER || tmux new-session -s $USER
exit
fi
. "$HOME/.cargo/env"

@ -8,7 +8,7 @@ screen_color = (WHITE,DEFAULT,OFF)
shadow_color = (WHITE,WHITE,OFF)
dialog_color = (WHITE,BLACK,OFF)
title_color = (GREEN,BLACK,OFF)
border_color = (GREEN,BLACK,OFF)
border_color = (WHITE,BLACK,OFF)
button_active_color = (BLACK,YELLOW,OFF)
button_inactive_color = (WHITE,BLACK,OFF)
button_key_active_color = (BLACK,GREEN,OFF)
@ -36,4 +36,4 @@ darrow_color = (GREEN,BLACK,OFF)
itemhelp_color = (BLACK,WHITE,OFF)
form_active_text_color = (BLACK,BLUE,OFF)
form_text_color = (WHITE,BLACK,OFF)
form_item_readonly_color = (BLACK,RED,OFF)
form_item_readonly_color = (BLACK,WHITE,OFF)

@ -30,13 +30,6 @@ Host mikob
ServerAliveInterval 30
ServerAliveCountMax 3
Host jacko
User pbikes
HostName gacrux.uberspace.de
IdentityFile ~/.ssh/massivedynamic_rsa
ServerAliveInterval 30
ServerAliveCountMax 3
Host miko
User mikob
HostName giacobini.uberspace.de
@ -47,13 +40,3 @@ Host gitlab.com
User git
HostName gitlab.com
IdentityFile ~/.ssh/massivedynamic_rsa
Host github.com
User git
HostName github.com
IdentityFile ~/.ssh/massivedynamic_rsa
Host gitlab.fsi.hochschule-trier.de
User git
HostName gitlab.fsi.hochschule-trier.de
IdentityFile ~/.ssh/uni_rsa

@ -10,13 +10,12 @@
# Version 1,0,0 #
# #
###############################################################################
host asgard tuer bridge mdeck.uber.space mediapi
host mdeck.new asgard tuer bridge mdeck.uber.space
IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
User miko
host mdeck.new
HostName tritton.uberspace.de
IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
User maschine
host mdeck.uber.space
@ -32,9 +31,6 @@ host asgard
Hostname tuer.maschinendeck.org
ForwardAgent yes
host mediapi
Hostname mediapi.local
host bridge
Hostname bridge.local
ProxyJump asgard

@ -25,7 +25,7 @@ Host gitlab.propeller.de
IdentityFile /Users/mochmann/.ssh/propeller_rsa
ForwardAgent yes
Host anubis atum hapi min aton thot geb ptah bastet propeller.technology crommelin ra selket blackbird
Host anubis atum hapi min aton thot geb ptah bastet propeller.technology crommelin ra selket
User mochmann
IdentityFile /Users/mochmann/.ssh/propeller_rsa
ForwardAgent yes
@ -52,8 +52,6 @@ Host ra
HostName ra.propeller.de
Host selket
HostName selket.propeller.de
Host blackbird
HostName blackbird.propeller.de
# OLD HOSTS
Host ark ichigo manticore zerotwo nexus mars
@ -72,8 +70,3 @@ Host nexus
HostName nexus.propeller.de
Host mars
HostName mars.propeller.de
Host pbx
HostName propellerpbx.propeller.local
User root
IdentityFile /Users/mochmann/.ssh/propeller_rsa

@ -1,43 +0,0 @@
# remap prefix from 'C-b' to 'C-a'
unbind C-b
set-option -g prefix C-a
bind-key C-a send-prefix
# split panes using | and -
bind | split-window -h
bind - split-window -v
unbind '"'
unbind %
# switch panes using Alt-arrow without prefix
bind -n M-Left select-pane -L
bind -n M-Right select-pane -R
bind -n M-Up select-pane -U
bind -n M-Down select-pane -D
# Enable mouse control (clickable windows, panes, resizable panes)
#set -g mouse-select-window on
#set -g mouse-select-pane on
#set -g mouse-resize-pane on
# Enable mouse mode (tmux 2.1 and above)
set -g mouse on
######################
### DESIGN CHANGES ###
######################
# loud or quiet?
set -g visual-activity off
set -g visual-bell off
set -g visual-silence off
setw -g monitor-activity off
set -g bell-action none
# messages
set -g message-style 'fg=colour232 bg=colour16 bold'
# SHELL
set -g default-command /usr/local/bin/bash

@ -32,7 +32,7 @@ Plugin 'junegunn/limelight.vim'
Plugin 'godlygeek/tabular'
Plugin 'plasticboy/vim-markdown'
Plugin 'mg979/vim-visual-multi'
Plugin 'itchyny/calendar.vim'
call vundle#end() " required
filetype plugin indent on " required

Loading…
Cancel
Save