Merge branch 'master' into 'ThinkCentre-M83'

# Conflicts:
#   .i3/config
Marvin Johanning 2020-05-29 17:37:55 +00:00
commit d183b3a512
3 changed files with 18 additions and 11 deletions

View File

@ -56,10 +56,10 @@ bindsym $mod+Ctrl+m exec pavucontrol
# Start Applications
bindsym $mod+Ctrl+b exec st -e 'bmenu'
bindsym $mod+F2 exec qutebrowser
bindsym $mod+F2 exec brave
bindsym $mod+F3 exec st -e vifmrun
bindsym $mod+Shift+F3 exec gksu pcmanfm
bindsym $mod+F5 exec st -e 'mocp'
bindsym $mod+F5 exec artha
bindsym $mod+t exec --no-startup-id pkill compton
bindsym $mod+Ctrl+t exec --no-startup-id compton -b
bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'"
@ -315,7 +315,6 @@ exec --no-startup-id pamac-tray
exec --no-startup-id clipit
# exec --no-startup-id blueman
# exec_always --no-startup-id sbxkb
exec --no-startup-id start_conky_maia
# exec --no-startup-id start_conky_green
#exec --no-startup-id xautolock -time 120 -locker blurlock
exec_always --no-startup-id ff-theme-util
@ -490,4 +489,4 @@ mode "$mode_gaps_outer" {
bindsym Escape mode "default"
exec "setxkbmap -option caps:escape"
exec "setxkbmap -option caps:escape"

View File

@ -1,7 +1,8 @@
".vimrc Marvin Johanning @
set nocompatible
filetype off
set swapfile
set dir=~/tmp
" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
@ -22,8 +23,9 @@ Plugin 'christoomey/vim-system-copy'
Plugin 'terryma/vim-smooth-scroll' "Smooth scrolling
Plugin 'mhartington/oceanic-next' "Theme OceanicNext
Plugin 'jacoborus/tender.vim' "Theme Tender
Plugin 'thoughtbot/vim-rspec' "RSpec Plugin
" Plugin 'thoughtbot/vim-rspec' "RSpec Plugin
Plugin 'MikeCoder/markdown-preview.vim' "Markdown preview
Plugin 'lervag/vimtex' " LaTeX
" All of your Plugins must be added before the following line
call vundle#end()
@ -54,7 +56,7 @@ nnoremap <C-z> <ESC>u
"leader plus ( will create () and put user inside
nnoremap <leader>" viw<ESC>a"<ESC>bi"<ESC>lel
nnoremap <leader>' viw<ESC>a'<ESC>bi'<ESC>ll
nnoremap <Space><Space> <kDivide><+++><CR>ciw
nnoremap <Space><Space> <kDivide><+++><CR>ca<
"- will delete the line and paste it on the line below
nnoremap - 0y$Do<ESC>p$i<ESC>
"Open .vimrc (ev) and source it (sv)
@ -66,10 +68,14 @@ noremap <silent> <c-d> :call smooth_scroll#down(&scroll, 0, 2)<CR>
noremap <silent> <c-b> :call smooth_scroll#up(&scroll*2, 0, 4)<CR>
noremap <silent> <c-f> :call smooth_scroll#down(&scroll*2, 0, 4)<CR>
"RSpec mappings
map <Leader>t :call RunCurrentSpecFile()<CR>
map <Leader>s :call RunNearestSpec()<CR>
map <Leader>l :call RunLastSpec()<CR>
map <Leader>a :call RunAllSpecs()<CR>
"map <Leader>t :call RunCurrentSpecFile()<CR>
"map <Leader>s :call RunNearestSpec()<CR>
"map <Leader>l :call RunLastSpec()<CR>
"map <Leader>a :call RunAllSpecs()<CR>
"For creating German-style quotation for LaTeX's babel package
nnoremap <leader>q i"`<+++>"'<ESC>
let g:vimtex_view_general_viewer = 'zathura' " Setting Zathura as the default viewer for LaTeX
"Colour stuff
syntax on

View File

@ -27,6 +27,7 @@ alias vifm="vifmrun"
alias l="ls -sh"
alias la="ls -ash"
alias vifm="vifmrun"
#Variable exports
export RTV_BROWSER=w3m
@ -62,6 +63,7 @@ source ~/.cache/wal/
#Path changes
PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
#Searching through history with dmenu
alias history='cat $HISTFILE | sed -e "s/^:[ \t]*[0-9]*:[0-9]*;//g" | dmenu "$@" -l 7 -p "Command:" | ${SHELL:-"/bin/zsh"}'