Tue Apr 9 16:11:53 CEST 2019

10 files changed, 101 insertions, 42 deletions

diff --git a/files/i3/config b/files/i3/config
index 6eb1314..5eb5c3b 100644
--- a/files/i3/config
+++ b/files/i3/config
@@ -107,6 +107,10 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
+# navigate workspaces
+bindsym $mod+Control+$left workspace prev
+bindsym $mod+Control+$right workspace next
+
 # split in horizontal orientation
 bindsym $mod+b split h
 
@@ -117,7 +121,8 @@ bindsym $mod+v split v
 bindsym $mod+f fullscreen toggle
 
 # toggle bar
-bindsym $mod+Shift+b bar mode toggle
+bindsym $mod+Control+b bar mode invisible
+bindsym $mod+Shift+b bar mode dock
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+Shift+w layout stacking
 bindsym $mod+w layout tabbed
@@ -155,7 +160,7 @@ bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $ws9
 bindsym $mod+0 workspace $ws10
-bindsym $mod+t workspace $wst
+bindsym $mod+Control+t workspace $wst
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace $ws1
@@ -168,30 +173,21 @@ bindsym $mod+Shift+7 move container to workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws10
-bindsym $mod+Shift+t move container to workspace $wst
+bindsym $mod+Shift+Control+t move container to workspace $wst
 
 ## Custom ##
 
 # colors
-
-# class					border		bg		text	indicator	child_border
-# client.focused			#3F00FF	#000000 #FFFFFF	#9F9FFF		#0000FF
-# client.focused_inactive	#007FFF	#797979	#00FF00	#9F9FFF		#00FF00
-# client.unfocused		#7F7F7F	#000000 #BFBFBF	#FF00FF		#7F7F7F
-
-#client.focused			$blue		$black	$white2	$blue2		$blue
-client.focused			$black2		$black2	$white2	$magenta2	$blue
-client.focused_inactive	$black2		$black	$white	$white		$white
-client.unfocused		$black2		$black	$blue2	$black2		$black
+#class					#border		#bg		#text	#indicator	#child_border
+client.focused			$black2		$black2	$white2	$blue		$blue
+client.focused_inactive	$black2		$black	$white	$black2		$black2
+client.unfocused		$black2		$black	$blue2	$black		$black
 client.urgent			$red		$black	$white	$red		$red
 
-#client.focused			$magenta	$black	$magenta	$magenta		$magenta
-#client.focused_inactive	$cyan	$black	$cyan	$cyan		$cyan
-#client.focused_inactive	$blue2	$black	$blue2	$blue2		$blue2
-#client.unfocused		$blue	$black	$blue	$blue		$blue
-
 # for window config
 for_window [class="^.*"] border pixel 1
+
+# gaps config
 gaps inner 14
 gaps outer 0
 
@@ -215,10 +211,8 @@ hide_edge_borders both
 bindsym $mod+Control+s exec ~/scripts/systemControl.sh
 # reboot
 bindsym $mod+Control+Shift+r exec ~/scripts/prompt.sh "Reboot?" "$reboot"
-# lock
-bindsym $mod+Control+l exec i3lock.sh
 # touchpad
-bindsym $mod+Control+t exec touchpad.sh
+bindsym $mod+t exec touchpad.sh
 
 # scratchpad
 bindsym $mod+minus move scratchpad
@@ -327,25 +321,26 @@ bindsym $mod+Shift+r mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-	position bottom
+	position top
 	font pango:inconsolata 8
 	separator_symbol "·"
 	colors {
-		background			$black
+		background			$black2
 		statusline			$white2
 		separator			$white2
-		focused_workspace	$blue	$blue		$black
-		inactive_workspace	$black	$black		$blue
-		urgent_workspace	$black	$magenta	$white2
+		focused_workspace	$blue	$blue		$black2
+		inactive_workspace	$black2	$black2		$blue
+		urgent_workspace	$black2	$magenta	$white2
 	}
         #status_command i3status
         status_command i3blocks
 }
 
 ### Init
+exec i3-msg "gaps inner current set 0; gaps outer current set 0"
 # bg
 #exec_always bash ~/scripts/pkmBgSelector.sh
-exec xrdb ~/.Xresources
+exec xrdb ~/.Xresources && urxvt -e tmux new -s main
 exec feh --bg-max ~/images/wallpapers/bg*
 exec dunst
 exec setxkbmap -layout es -option caps:swapescape
diff --git a/files/qutebrowser/config.py b/files/qutebrowser/config.py
index 2e738f7..788e316 100644
--- a/files/qutebrowser/config.py
+++ b/files/qutebrowser/config.py
@@ -1565,22 +1565,28 @@ config.bind('U', 'undo')
 # open url with mpv
 config.bind(',v', 'spawn i3-msg exec mpv {url}')
 config.bind(',fv', 'hint links spawn i3-msg exec mpv {hint-url}')
+config.bind(',Fv', 'hint all spawn i3-msg exec mpv {hint-url}')
 config.bind(',V', 'spawn i3-msg exec bash /home/taamas/scripts/floats/mpvFloat.sh {url}')
 config.bind(',fV', 'hint links spawn i3-msg exec bash /home/taamas/scripts/floats/mpvFloat.sh {hint-url}')
+config.bind(',FV', 'hint all spawn i3-msg exec bash /home/taamas/scripts/floats/mpvFloat.sh {hint-url}')
 #download url's video in ~/videos/qutebrowser
 config.bind(',d', 'spawn youtube-dl --all-subs --embed-subs -o ~/downloads/videos/%(title)s.%(ext)s {url}')
 # same as previous, but showing urxvt
 config.bind(',D', 'spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloat.sh {url}')
 # two same commands, using hints instead than current url
 config.bind(',fd', 'hint links spawn youtube-dl --all-subs --embed-subs -o ~/downloads/videos/%(title)s.%(ext)s {hint-url}')
+config.bind(',Fd', 'hint all spawn youtube-dl --all-subs --embed-subs -o ~/downloads/videos/%(title)s.%(ext)s {hint-url}')
 config.bind(',fD', 'hint links spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloat.sh {hint-url}')
+config.bind(',FD', 'hint all spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloat.sh {hint-url}')
 # download url's audio in mp3 in ~/music/qutebrowser
 config.bind(',a', 'spawn youtube-dl -o ~/music/qutebrowser/%(title)s.%(ext)s -x --audio-format mp3 --embed-thumbnail {url}')
 # same as previous, but showing urxvt
 config.bind(',A', 'spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloatAudio.sh {url}')
 # two same commands, using hints instead than current url
 config.bind(',fa', 'hint links spawn youtube-dl -o ~/music/qutebrowser/%(title)s.%(ext)s -x --audio-format mp3 --embed-thumbnail {hint-url}')
+config.bind(',Fa', 'hint all spawn youtube-dl -o ~/music/qutebrowser/%(title)s.%(ext)s -x --audio-format mp3 --embed-thumbnail {hint-url}')
 config.bind(',fA', 'hint links spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloatAudio.sh {hint-url}')
+config.bind(',FA', 'hint all spawn i3-msg exec bash /home/taamas/scripts/floats/youtube-dlFloatAudio.sh {hint-url}')
 # open images with corresponding script
 config.bind(',i', 'spawn showURLimage.sh {url}')
 config.bind(',fi', 'hint images spawn showURLimage.sh {hint-url}')
diff --git a/files/ranger/rifle.conf b/files/ranger/rifle.conf
index d08f6f1..9ff08b4 100644
--- a/files/ranger/rifle.conf
+++ b/files/ranger/rifle.conf
@@ -84,8 +84,10 @@ ext x?html?, has w3m,             terminal = w3m "$@"
 #-------------------------------------------
 # Define the "editor" for text files as first action
 mime ^text,  label editor = $EDITOR -- "$@"
+mime ^text,  label editor = tmux new-window -a -t 1 -n nvim "nvim $@"
 mime ^text,  label pager  = "$PAGER" -- "$@"
 !mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = $EDITOR -- "$@"
+!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = tmux new-window -a -t 1 -n nvim "nvim $@"
 !mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
 
 ext 1                         = man "$1"
diff --git a/files/ranger/scope.sh b/files/ranger/scope.sh
index da7168e..fdb6e91 100755
--- a/files/ranger/scope.sh
+++ b/files/ranger/scope.sh
@@ -80,7 +80,7 @@ case "$extension" in
     # PDF documents:
     pdf)
         try pdftotext -l 10 -nopgbrk -q "$path" - && \
-            { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
+            { dump | trim | fmt -s -w "$width;" exit 0; } || exit 1;;
     # BitTorrent Files
     torrent)
         try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;;
@@ -89,9 +89,9 @@ case "$extension" in
         try odt2txt "$path" && { dump | trim; exit 5; } || exit 1;;
     # HTML Pages:
     htm|html|xhtml)
-        try w3m    -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
-        try lynx   -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
-        try elinks -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
+        try w3m    -dump "$path" && { dump | trim | fmt -s -w "$width;" exit 4; }
+        try lynx   -dump "$path" && { dump | trim | fmt -s -w "$width;" exit 4; }
+        try elinks -dump "$path" && { dump | trim | fmt -s -w "$width;" exit 4; }
         ;; # fall back to highlight/cat if the text browsers fail
 esac
 
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>