Various changes

.config/awesome/autorun.sh

@@ -7,15 +7,12 @@ function run {
   fi
 }
 
-run ~/.config/compton/launch.sh
+run ~/.config/picom/launch.sh
 #run ~/.config/awesome/autohidewibox.py ~/.config/awesome/autohidewibox.conf
 run ~/setbg.sh 
 run dunst
 run pulseeffects --gapplication-service
-<<<<<<< HEAD
 xsetwacom set "Wacom HID 50DB Finger touch" Gesture off
 run touchegg
 run nm-applet
 #run music_wake.sh
-=======
->>>>>>> 0d908b167965b06afc60f528d598a6abea56a879

.config/awesome/rc.lua

@@ -16,7 +16,7 @@ local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup")
 local vicious = require("vicious")
 local timer = require("gears.timer")
-local config = require("config_desktop")
+local config = require("config_laptop")
 local quake = require("quake")
 
 -- Enable hotkeys help widget for VIM and other apps
@@ -530,7 +530,7 @@ switcher_layout = awful.layout.suit.fair
 switcher_mode = false
 switcher_timer = timer({ timeout = 1 })
 switcher_timer:connect_signal("timeout", function () end_switcher() end)
-bar_timer = timer({ timeout = 1 })
+bar_timer = timer({ timeout = 0.2 })
 bar_timer:connect_signal("timeout", function () disable_bars() end)
 bar_mode = false
 layout_table = {}

.config/mpd/state

@@ -1,8 +1,8 @@
-sw_volume: 34
+sw_volume: 35
 audio_device_state:1:pulse audio
 state: pause
 current: 0
-time: 764.679000
+time: 262.542000
 random: 0
 repeat: 0
 single: 0
@@ -11,5 +11,5 @@ crossfade: 0
 mixrampdb: 0.000000
 mixrampdelay: -1.000000
 playlist_begin
-0:Music/Vicetone - 2014 Yeamix - Final + long No Way Out + Vocal Drop.mp3
+0:SharedMusic/Paramore - RIOT!/14 - Emergency (Live Version).flac
 playlist_end

.config/termite/config

@@ -38,29 +38,43 @@ scrollback_lines = 10000
 # "off", "left" or "right"
 scrollbar = off
 
+
 [colors]
-cursor = #d8dee9
-cursor_foreground = #2e3440
 
-foreground = #d8dee9
-foreground_bold = #d8dee9
-background = rgba(46,52,64, 0.9)
+# special
+foreground      = #abb2bf
+foreground_bold = #abb2bf
+cursor          =
+background      = rgba(40, 44, 52, 0.7)
 
-highlight = #4c566a
+# black
+color0  = #282c34
+color8  = #5c6370
 
-color0  = #3b4252
-color1  = #bf616a
-color2  = #a3be8c
-color3  = #ebcb8b
-color4  = #81a1c1
-color5  = #b48ead
-color6  = #88c0d0
-color7  = #e5e9f0
-color8  = #4c566a
-color9  = #bf616a
-color10 = #a3be8c
-color11 = #ebcb8b
-color12 = #81a1c1
-color13 = #b48ead
-color14 = #8fbcbb
-color15 = #eceff4
+# red
+color1  = #e06c75
+color9  = #be5046
+
+# green
+color2  = #98c379
+color10 = #7a9f60
+
+# yellow
+color3  = #e5c07b
+color11 = #d19a66
+
+# blue
+color4  = #61afef
+color12 = #3b84c0
+
+# magenta
+color5  = #c678dd
+color13 = #9a52af
+
+# cyan
+color6  = #56b6c2
+color14 = #3c909b
+
+# white
+color7  = #abb2bf
+color15 = #828997

.vim/plugged/lightline.vim

@@ -1 +0,0 @@
-Subproject commit 80c242c3c5394fd5143b5d7e2741989ba04ae46a

.vimrc

@@ -1,170 +0,0 @@
-
-set nocompatible              " be iMproved, required
-filetype off                  " required
-
-
-call plug#begin()
-    Plug 'itchyny/lightline.vim'
-    Plug 'vim-scripts/c.vim'
-    Plug 'arcticicestudio/nord-vim'
-	Plug 'scrooloose/nerdtree'
-	Plug 'jistr/vim-nerdtree-tabs'
-	Plug 'rhysd/vim-clang-format'
-	Plug 'kana/vim-operator-user'
-    Plug 'rust-lang/rust.vim'
-    Plug 'Shougo/deoplete.nvim'
-    Plug 'zchee/deoplete-clang'
-    Plug 'Shougo/neoinclude.vim'
-    Plug 'roxma/nvim-yarp'
-    Plug 'roxma/vim-hug-neovim-rpc'
-    "Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' }
-    Plug 'sebastianmarkow/deoplete-rust'
-    Plug 'jpalardy/vim-slime'
-    Plug 'autozimu/LanguageClient-neovim', {
-    \ 'branch': 'next',
-    \ 'do': 'bash install.sh',
-    \ }
-    Plug 'calviken/vim-gdscript3'
-call plug#end()            " required
-
-filetype plugin indent on    " required
-
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#sources#clang#libclang_path = "/usr/lib/libclang.so"
-let g:deoplete#sources#clang#clang_header = "/usr/lib/clang"
-let g:deoplete#sources#rust#racer_binary='/usr/bin/racer'
-let g:deoplete#sources#rust#rust_source_path='/usr/src/rust/src'
-
-let g:LanguageClient_serverCommands = {
-	\ 'lua': ['lua-lsp'],
-	\ }
-let g:LanguageClient_autoStart = 1
- 
-set tags+=./.tags
-
-" Session management
-
-set switchbuf=useopen,usetab
-
-let g:session = 0
-
-fu! AutoSaveSess()
-    if g:session == 1
-        call SaveSess()
-    endif
-endfunction
-
-fu! SaveSess()
-    execute 'NERDTreeTabsClose'
-    execute 'mksession! ' . getcwd() . '/.session.vim'
-    let g:session = 1
-endfunction
-
-fu! RemoveSess()
-    shell "rm " . getcwd() . "/.session.vim"
-endfunction
-
-fu! RestoreSess()
-if filereadable(getcwd() . '/.session.vim')
-    let initial_args = argv()
-    execute 'so ' . getcwd() . '/.session.vim'
-    for file in initial_args
-        if bufloaded(file) != 1
-            execute 'tabnew ' . getcwd() . '/' . file 
-        else
-            execute 'sb ' . file
-        endif
-    endfor
-    let g:session = 1
-endif
-endfunction
-
-:command Savesess call SaveSess()
-:command Restoresess call RestoreSess()
-:command Removesess call RemoveSess()
-
-" Save session on quitting Vim
-autocmd VimLeave * call AutoSaveSess()
-
-" Restore session on starting Vim
-"autocmd VimEnter * nested call RestoreSess()
-
-"----------------------
- 
-" move between tabs
-nnoremap <A-Left>  :tabprevious<CR>
-nnoremap <A-Right> :tabnext<CR>
-
-
- map <C-n> :NERDTreeMirrorToggle<CR>
- 
-" prevent mouse vanishing
-set nomousehide
- 
-" toggles menu in graphical mode
-function! ToggleGUICruft()
-	if &guioptions=='ir'
- 		exec('set guioptions=imrLn')
-	else
-		exec('set guioptions=ir')
-	endif
-endfunction
- 
-map <F12> <Esc>:call ToggleGUICruft()<cr>
- 
-set number
-set linebreak
-set nobackup
-set noswapfile
-"set shortmess+=I
-set backspace=indent,eol,start
-set visualbell t_vb=
-set showmode
-"set smartcase
- 
-nnoremap <F1> <nop>
-nnoremap Q <nop>
-nnoremap K <nop>
- 
-runtime! ftplugin/man.vim
-nnoremap K :Man <cword>
- 
-set mouse=a
-set nu
- 
-let g:clang_format#code_style="llvm"
- 
-set clipboard=unnamed 
-set backspace=indent,eol,start " allow backspacing over everything in insert mode
- 
-cmap w!! w !sudo tee > /dev/null %
- 
-set laststatus=2
-let g:nord_uniform_diff_background = 1
-let g:nord_cursor_line_number_background = 1
-let g:lightline = {
-      \ 'colorscheme': 'nord',
-      \ }
-
-colorscheme nord
-
-filetype plugin indent on
-set smartindent
-set tabstop=4
-set shiftwidth=4
-set expandtab
-
-:command WQ wq
-:command Wq wq
-:command W w
-:command Q q
-
-let g:C_Mapfeader = ','
-nnoremap <cr> :noh<CR><CR>:<backspace>
-
-let g:deoplete#enable_smart_case = 1
-imap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
-imap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<S-TAB>"
-imap <expr><CR> pumvisible() ? deoplete#close_popup() : "\<CR>"
-set completeopt=menu,noinsert
-

.zshrc

@@ -83,8 +83,8 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
 
 export MANPATH="/usr/local/man:$MANPATH"
 export LANG=en_US.UTF-8
-export BROWSER=/usr/bin/chromium
-export EDITOR=/usr/bin/vim
+export BROWSER=/usr/bin/firefox
+export EDITOR=/usr/bin/nvim
 export TERM="xterm-256color"
 export LC_ALL=en_GB.utf8
 export QT_QPA_PLATFORMTHEME="qt5ct"
@@ -198,6 +198,7 @@ alias i3c="$EDITOR ~/.config/i3/config"
 alias termitec="$EDITOR ~/.config/termite/config"
 alias rofic="$EDITOR ~/.config/rofi/config.rasi"
 
+alias vim="nvim"
 alias vi="vim"
 alias v="vi"
 
@@ -227,4 +228,4 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 eval $(thefuck --alias)
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
-source /home/daan/.local/bin/tp
+#source /home/daan/.local/bin/tp