Tue Apr 9 16:11:53 CEST 2019

6 files changed, 67 insertions, 11 deletions

diff --git a/files/rcs/.Xresources b/files/rcs/.Xresources
index a94dd63..5480ba4 100644
--- a/files/rcs/.Xresources
+++ b/files/rcs/.Xresources
@@ -4,14 +4,14 @@
 *.foreground: #f8f8f2
 *.background: #282a36
 *.color0:     #000000
-*.color8:     #4d4d4d
+*.color8:     #282a36
 *.color1:     #ff5555
 *.color9:     #ff6e67
 *.color2:     #50fa7b
 *.color10:    #5af78e
 *.color3:     #f1fa8c
 *.color11:    #f4f99d
-*.color4:     #bd93f9
+*.color4:     #008ecc
 *.color12:    #caa9fa
 *.color5:     #ff79c6
 *.color13:    #ff92d0
diff --git a/files/rcs/.bash_aliases b/files/rcs/.bash_aliases
index 9ab9395..ba02d87 100644
--- a/files/rcs/.bash_aliases
+++ b/files/rcs/.bash_aliases
@@ -6,6 +6,8 @@ alias cdf='cd $(fzfPath.sh)'
 
 # IIS
 alias ipds="ssh halite.ii.pwr.wroc.pl -l 250839"
+alias web="ssh -p 3022 user@localhost"
+alias webvarnish="ssh -p 3022 varnish1@localhost"
 
 # config files
 alias cb="vim ~/.bashrc"
@@ -22,6 +24,7 @@ alias ccmus="vim ~/.config/cmus/autosave"
 alias cg="vim ~/.gitconfig"
 alias cnb="vim ~/.newsboat/config"
 alias cnbu="vim ~/.newsboat/urls"
+alias ctmux="vim ~/.tmux.conf"
 
 # Programs
 alias CryptTool="wine \"~/.wine/drive_c/Program Files (x86)/CrypTool/CrypTool.exe\""
diff --git a/files/rcs/.bashrc b/files/rcs/.bashrc
index bfedffa..8d8d178 100644
--- a/files/rcs/.bashrc
+++ b/files/rcs/.bashrc
@@ -10,7 +10,7 @@ case $- in
       *) return;;
 esac
 
-[[ -z "$TMUX" ]] && exec tmux
+# [[ -z "$TMUX" ]] && exec tmux # Doesn't allow to automatically start X
 
 # Activate vi mode with <Escape>.
 set -o vi
@@ -91,6 +91,7 @@ wd="\[\e[1;35m\]"
 umode=$pur
 
 PS1="${keys}[${pur}${wd}\w${keys}]${umode}\$${def} "
+PS1="${keys}[${pur}\u${keys}@${pur}\h${keys}]${wd}\w${umode}\$${def} "
 
 # EDITOR="nvim"
 # TERM="rxvt-256color"
diff --git a/files/rcs/.profile b/files/rcs/.profile
index 4849a1c..dbda7ae 100644
--- a/files/rcs/.profile
+++ b/files/rcs/.profile
@@ -51,9 +51,10 @@ export XDG_CONFIG_HOME="$HOME/.config"
 sudo loadkeys es
 sudo -n loadkeys "$HOME/.config/ttymaps.kmap"
 [[ $(tty) = "/dev/tty6" ]] && setfont alt-8x8
-echo ""
-neofetch --config ~/.config/neofetch/neofetchLogin.conf
 if [ "$(tty)" = "/dev/tty1" ] && [ ! "$(pgrep -x i3)" ]; then
+	neofetch --config ~/.config/neofetch/neofetchLogin.conf
 	figlet "Starting i3-gaps..." | lolcat -a -d 1 -s 10 -p 1 -F 0.05
 	exec startx >~/.startx.log 2>~/.startxerr.log
+elif [ "$(tty | grep -e "/dev/tty.*")" ]; then
+	tmux new -s "$(tty | cut -d'/' -f3)"
 fi
diff --git a/files/rcs/.tmux.conf b/files/rcs/.tmux.conf
index cbd2221..47603ab 100644
--- a/files/rcs/.tmux.conf
+++ b/files/rcs/.tmux.conf
@@ -2,10 +2,47 @@ unbind C-b
 set -g prefix m-a
 bind m-a send-prefix
 set -g default-terminal "screen-256color"
-set-option -g xterm-keys on
-setw -g monitor-activity on
-set -g visual-activity on
+set -g xterm-keys on
+#setw -g monitor-activity on
+#set -g visual-activity on
 set -g mode-keys vi
+set -g status-keys vi
+
+# Theme
+set-option -g status-attr default
+# status bar
+set-option -g status-fg colour4
+set-option -g status-bg colour8
+# status bar windows
+set-window-option -g window-status-fg colour4
+set-window-option -g window-status-bg colour8
+# status bar selected window
+set -g window-status-current-fg colour13
+set -g window-status-current-bg colour8
+#set-window-option -g window-status-current-attr bold colour8
+# pane borders
+set-option -g pane-border-fg colour0
+set-option -g pane-border-bg colour8
+set-option -g pane-active-border-fg colour6
+set-option -g pane-active-border-bg colour8
+# pane number display
+set-option -g display-panes-colour colour4
+set-option -g display-panes-active-colour colour5
+# messages
+set-option -g message-fg colour2
+set-option -g message-bg colour8
+# clock
+set-window-option -g clock-mode-colour colour4
+# sizes
+set -g status-interval 60
+set -g status-left-length 20
+#set -g status-left '#[fg=green](#S) #(whoami)  '
+set -g status-left '(#S)  '
+
+set -g base-index 0
+set -s escape-time 0
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded"
+bind-key C command-prompt -p "Name of new window: " "new-window -n '%%'"
 
 # moving between panes with vim movement keys
 bind h select-pane -L
@@ -14,11 +51,15 @@ bind k select-pane -U
 bind l select-pane -R
 
 # moving between windows with vim movement keys
-bind -r H select-window -t :-
-bind -r L select-window -t :+
+#bind -r H select-window -t :-
+#bind -r L select-window -t :+
 
 # resize panes with vim movement keys
 bind -r m-h resize-pane -L 1
 bind -r m-j resize-pane -D 1
 bind -r m-k resize-pane -U 1
 bind -r m-l resize-pane -R 1
+bind -r m-H resize-pane -L 10
+bind -r m-J resize-pane -D 10
+bind -r m-K resize-pane -U 10
+bind -r m-L resize-pane -R 10
diff --git a/files/rcs/.vimrc b/files/rcs/.vimrc
index 927835d..79e62c0 100644
--- a/files/rcs/.vimrc
+++ b/files/rcs/.vimrc
@@ -17,6 +17,7 @@ Plug 'vimwiki/vimwiki'
 Plug 'suan/vim-instant-markdown'
 Plug 'airodactyl/neovim-ranger'
 Plug 'vim-airline/vim-airline'
+Plug 'vim-syntastic/syntastic'
 "Plug 'vim-scripts/ReplaceWithRegister'
 call plug#end()
 
@@ -34,6 +35,15 @@ set ignorecase
 set wrapscan
 set incsearch
 
+" For syntastic
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
 " For cursor shape with tmux
 if empty($TMUX)
   let &t_SI = "\<Esc>]50;CursorShape=1\x7" " Vertical bar in insert mode
@@ -188,7 +198,7 @@ inoremap <leader>lb \textbf{}<++><Esc>F}i
 inoremap <leader>li \textit{}<++><Esc>F}i
 inoremap <leader>lemph \emph{}<++><Esc>F}i
 inoremap <leader>llabel \label{}<++><Esc>F}i
-inoremap <leader>lref \ref{}<++><Esc>F}i
+inoremap <leader>lref ~\ref{}<++><Esc>F}i
 inoremap <leader>lenumerate \begin{enumerate}<Esc>o<Enter><Enter><Enter>\end{enumerate}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
 inoremap <leader>litemize \begin{itemize}<Esc>o<Enter><Enter><Enter>\end{itemize}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space>
 inoremap <leader>litem \item<Enter><++><Esc>k$a<Space>