Added lots of new stuff

7 files changed, 108 insertions, 19 deletions

diff --git a/.config/terminator/config b/.config/terminator/config
index 1db5617..ceb7b46 100644
--- a/.config/terminator/config
+++ b/.config/terminator/config
@@ -19,7 +19,7 @@
     background_darkness = 0.93
     background_type = transparent
     cursor_color = "#ffffff"
-    font = Ubuntu Mono derivative Powerline 13
+    font = Ubuntu Mono 13
     foreground_color = "#ffffff"
     palette = "#050505:#b81109:#1cb228:#baa407:#2c5fad:#e35682:#16a085:#ffffff:#1c1b19:#e8160c:#24e534:#fcdf09:#408afc:#e02c6d:#1abc9c:#ebe3e3"
     scrollback_infinite = True
diff --git a/.dotFileSetup.sh b/.dotFileSetup.sh
index 420ea29..5643102 100644
--- a/.dotFileSetup.sh
+++ b/.dotFileSetup.sh
@@ -13,6 +13,9 @@ mkdir /home/julian/.oh-my-zsh/custom/themes
 
 wget https://raw.githubusercontent.com/caiogondim/bullet-train-oh-my-zsh-theme/master/bullet-train.zsh-theme -O /home/julian/.oh-my-zsh/custom/themes/bullet-train.zsh-theme
 
+cd ~/.oh-my-zsh/custom/plugins
+git clone git://github.com/zsh-users/zsh-syntax-highlighting.git
+
 alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 echo ".cfg" >> .gitignore
 git clone --bare 'https://github.com/jbjjbjjbj/newDotFiles' $HOME/.cfg
@@ -20,3 +23,4 @@ config config --local status.showUntrackedFiles no
 config checkout -f
 
 git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+
diff --git a/.dwmSession.sh b/.dwmSession.sh
new file mode 100755
index 0000000..5e9b4e3
--- /dev/null
+++ b/.dwmSession.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+PIDFILE=/home/julian/.dwmSession.pid
+
+kill `cat $PIDFILE`
+
+if [ "$1" = "-e" ]; then
+	exit
+fi
+
+echo $$ > $PIDFILE
+
+while true; do
+
+	BATT=$( acpi -b | sed 's/.*[charging|unknown], \([0-9]*\)%.*/\1/gi' )
+	TIME=$(/bin/date +"%H:%M")
+
+	xsetroot -name "$TIME $BATT%"
+	sleep 10
+done
diff --git a/.vimrc b/.vimrc
index 87529dc..b5e8388 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,7 +13,7 @@ Plugin 'VundleVim/Vundle.vim'
 
 Plugin 'mileszs/ack.vim'
 
-Plugin 'autozimu/LanguageClient-neovim'
+"Plugin 'autozimu/LanguageClient-neovim'
 
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-repeat'
@@ -25,12 +25,25 @@ Plugin 'zchee/deoplete-jedi'
 Plugin 'sirtaj/vim-openscad'
 Plugin 'tmhedberg/matchit'
 Plugin 'kien/ctrlp.vim'
-Plugin 'Shougo/deoplete.nvim'
+
+if has("nvim")
+	Plugin 'Shougo/deoplete.nvim'
+else
+	Plugin 'Shougo/deoplete.nvim'
+	Plugin 'roxma/nvim-yarp'
+	Plugin 'roxma/vim-hug-neovim-rpc'
+endif
 
 Plugin 'agude/vim-eldar'
 
 Plugin 'scrooloose/nerdtree'
 
+" Track the engine.
+Plugin 'SirVer/ultisnips'
+
+" Snippets are separated from the engine. Add this if you want them:
+Plugin 'honza/vim-snippets'
+
 call vundle#end()            " required
 filetype plugin indent on    " required
 
@@ -88,8 +101,25 @@ let g:LanguageClient_serverCommands = {
     \ 'rust': ['rustup', 'run', 'stable', 'rls'],
     \ }
 
-nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
-nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
-nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
-nnoremap <F5> :call LanguageClient_contextMenu()<CR>
+"nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
+"nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
+"nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
+"nnoremap <F5> :call LanguageClient_contextMenu()<CR>
+
+
+" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
+let g:UltiSnipsExpandTrigger="<c-b>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
+
+
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
 
+" Run  binding
+nnoremap <F5> :!terminator -e '"%:p" ;read -n 1'<CR>
+set completeopt-=preview
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..6f988ee
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,29 @@
+setxkbmap -layout us -variant altgr-intl
+xcape -e "Control_L=Escape"
+feh --bg-fill /home/julian/Pictures/wallpaper.jpg
+setxkbmap dk
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets)
+export SSH_AUTH_SOCK
+
+xmodmap .Xmodmap
+
+nextcloud &
+nm-applet &
+xscreensaver &
+xss-lock -- xscreensaver-command --lock &
+
+if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+    ssh-agent > ~/.ssh-agent-thing
+fi
+if [[ "$SSH_AGENT_PID" == "" ]]; then
+    eval "$(<~/.ssh-agent-thing)"
+fi
+
+while true; do 
+	dwm
+done &
+
+
+exec sh /home/julian/.dwmSession.sh
diff --git a/.xprofile b/.xprofile
deleted file mode 100644
index 5a11352..0000000
--- a/.xprofile
+++ /dev/null
@@ -1,8 +0,0 @@
-xcape -e "Control_L=Escape"
-
-if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-    ssh-agent > ~/.ssh-agent-thing
-fi
-if [[ "$SSH_AGENT_PID" == "" ]]; then
-    eval "$(<~/.ssh-agent-thing)"
-fi
diff --git a/.zshrc b/.zshrc
index 3fd5f05..8b8d647 100644
--- a/.zshrc
+++ b/.zshrc
@@ -4,7 +4,7 @@ export TERM="xterm-256color"
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-  export ZSH=/home/julian/.oh-my-zsh
+export ZSH=/home/julian/.oh-my-zsh
 
 echo "Setting theme"
 # Set name of the theme to load. Optionally, if you set this to "random"
@@ -55,7 +55,7 @@ echo "Loading 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 sudo)
+plugins=(git sudo vi-mode zsh-syntax-highlighting)
 
 echo "Loading zsh"
 source $ZSH/oh-my-zsh.sh
@@ -98,12 +98,11 @@ BULLETTRAIN_PROMPT_ORDER=(
 )
 
 
-PATH=/home/julian/Scripts:$PATH
 alias rex="xrdb ~/.Xresources"
 alias lemon="~/.config/openbox/lemonbar | lemonbar -g 1355x20+5+5 -f terminus-9"
 
 
-PATH=/home/julian/.gem/ruby/2.5.0/bin:$PATH
+#PATH=/usr/local/MATLAB/R2018b/bin:$PATH
 #fortune -n 100 | cowsay 
 
 echo "Loading powerline"
@@ -132,3 +131,19 @@ clear
 # Sæt sudo editor
 export SUDO_EDITOR=nvim
 SUDO_EDITOR=nvim
+
+alias vimvimvim="vim"
+
+export KEYTIMEOUT=1
+
+
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
+ZSH_HIGHLIGHT_PATTERNS=('rm -rf *' 'fg=white,bold,bg=red')
+ZSH_HIGHLIGHT_PATTERNS+=('-*$' 'fg=yellow,bold') 
+ZSH_HIGHLIGHT_PATTERNS+=('-* ' 'fg=yellow,bold') 
+ZSH_HIGHLIGHT_PATTERNS+=('"*"' 'fg=green,bold')
+
+ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=blue,underline,bold
+ZSH_HIGHLIGHT_STYLES[precommand]=fg=blue,underline,bold
+ZSH_HIGHLIGHT_STYLES[arg0]=fg=white
+