diff --git a/.config/awesome/autorun.sh b/.config/awesome/autorun.sh index 0d0bc56..0b5693a 100755 --- a/.config/awesome/autorun.sh +++ b/.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 diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 45de82c..9741101 100644 --- a/.config/awesome/rc.lua +++ b/.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 = {} diff --git a/.config/mpd/database b/.config/mpd/database index b294dc0..6bb60b0 100644 Binary files a/.config/mpd/database and b/.config/mpd/database differ diff --git a/.config/mpd/state b/.config/mpd/state index b54d9db..969aa3b 100644 --- a/.config/mpd/state +++ b/.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 diff --git a/.config/termite/config b/.config/termite/config index db514ee..df5b946 100644 --- a/.config/termite/config +++ b/.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 diff --git a/.vim/plugged/lightline.vim b/.vim/plugged/lightline.vim deleted file mode 160000 index 80c242c..0000000 --- a/.vim/plugged/lightline.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80c242c3c5394fd5143b5d7e2741989ba04ae46a diff --git a/.vimrc b/.vimrc deleted file mode 100644 index f585d18..0000000 --- a/.vimrc +++ /dev/null @@ -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 :tabprevious -nnoremap :tabnext - - - map :NERDTreeMirrorToggle - -" 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 :call ToggleGUICruft() - -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 -nnoremap Q -nnoremap K - -runtime! ftplugin/man.vim -nnoremap K :Man - -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 :noh: - -let g:deoplete#enable_smart_case = 1 -imap pumvisible() ? "\" : "\" -imap pumvisible() ? "\" : "\" -imap pumvisible() ? deoplete#close_popup() : "\" -set completeopt=menu,noinsert - diff --git a/.zshrc b/.zshrc index db73e1a..f9da4f4 100644 --- a/.zshrc +++ b/.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 diff --git a/Pictures/wallpapers/1EFJE7e.jpg b/Pictures/wallpapers/1EFJE7e.jpg deleted file mode 100644 index 25e7d95..0000000 Binary files a/Pictures/wallpapers/1EFJE7e.jpg and /dev/null differ diff --git a/Pictures/wallpapers/2BMHi8L.jpg b/Pictures/wallpapers/2BMHi8L.jpg deleted file mode 100644 index 70a4cc1..0000000 Binary files a/Pictures/wallpapers/2BMHi8L.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377444.jpg b/Pictures/wallpapers/377444.jpg deleted file mode 100644 index 53e7480..0000000 Binary files a/Pictures/wallpapers/377444.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377629.jpg b/Pictures/wallpapers/377629.jpg deleted file mode 100644 index 7526487..0000000 Binary files a/Pictures/wallpapers/377629.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377675.jpg b/Pictures/wallpapers/377675.jpg deleted file mode 100644 index ee25357..0000000 Binary files a/Pictures/wallpapers/377675.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377697.jpg b/Pictures/wallpapers/377697.jpg deleted file mode 100644 index bd30bb7..0000000 Binary files a/Pictures/wallpapers/377697.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377712.jpg b/Pictures/wallpapers/377712.jpg deleted file mode 100644 index 8fced85..0000000 Binary files a/Pictures/wallpapers/377712.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377869.jpg b/Pictures/wallpapers/377869.jpg deleted file mode 100644 index b883756..0000000 Binary files a/Pictures/wallpapers/377869.jpg and /dev/null differ diff --git a/Pictures/wallpapers/377970.jpg b/Pictures/wallpapers/377970.jpg deleted file mode 100644 index eb23a8d..0000000 Binary files a/Pictures/wallpapers/377970.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378019.jpg b/Pictures/wallpapers/378019.jpg deleted file mode 100644 index a0081ee..0000000 Binary files a/Pictures/wallpapers/378019.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378117.jpg b/Pictures/wallpapers/378117.jpg deleted file mode 100644 index 063040e..0000000 Binary files a/Pictures/wallpapers/378117.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378228.jpg b/Pictures/wallpapers/378228.jpg deleted file mode 100644 index 43e93f5..0000000 Binary files a/Pictures/wallpapers/378228.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378549.jpg b/Pictures/wallpapers/378549.jpg deleted file mode 100644 index 81c6d69..0000000 Binary files a/Pictures/wallpapers/378549.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378700.jpg b/Pictures/wallpapers/378700.jpg deleted file mode 100644 index 7eca996..0000000 Binary files a/Pictures/wallpapers/378700.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378715.jpg b/Pictures/wallpapers/378715.jpg deleted file mode 100644 index 4b68a90..0000000 Binary files a/Pictures/wallpapers/378715.jpg and /dev/null differ diff --git a/Pictures/wallpapers/378967.jpg b/Pictures/wallpapers/378967.jpg deleted file mode 100644 index 5503a18..0000000 Binary files a/Pictures/wallpapers/378967.jpg and /dev/null differ diff --git a/Pictures/wallpapers/379108.jpg b/Pictures/wallpapers/379108.jpg deleted file mode 100644 index 0a80be1..0000000 Binary files a/Pictures/wallpapers/379108.jpg and /dev/null differ diff --git a/Pictures/wallpapers/3EWRjpc.jpg b/Pictures/wallpapers/3EWRjpc.jpg deleted file mode 100644 index 1f8ed75..0000000 Binary files a/Pictures/wallpapers/3EWRjpc.jpg and /dev/null differ diff --git a/Pictures/wallpapers/5iWpm39.jpg b/Pictures/wallpapers/5iWpm39.jpg deleted file mode 100644 index 8526a46..0000000 Binary files a/Pictures/wallpapers/5iWpm39.jpg and /dev/null differ diff --git a/Pictures/wallpapers/6z3ATF7.jpg b/Pictures/wallpapers/6z3ATF7.jpg deleted file mode 100644 index 924bd10..0000000 Binary files a/Pictures/wallpapers/6z3ATF7.jpg and /dev/null differ diff --git a/Pictures/wallpapers/7AtL7jE.jpg b/Pictures/wallpapers/7AtL7jE.jpg deleted file mode 100644 index 6fa5278..0000000 Binary files a/Pictures/wallpapers/7AtL7jE.jpg and /dev/null differ diff --git a/Pictures/wallpapers/7GAUsN6.jpg b/Pictures/wallpapers/7GAUsN6.jpg deleted file mode 100644 index 4e843a3..0000000 Binary files a/Pictures/wallpapers/7GAUsN6.jpg and /dev/null differ diff --git a/Pictures/wallpapers/ArUgj5j.jpg b/Pictures/wallpapers/ArUgj5j.jpg deleted file mode 100644 index 66b9f07..0000000 Binary files a/Pictures/wallpapers/ArUgj5j.jpg and /dev/null differ diff --git a/Pictures/wallpapers/BhJbWva.jpg b/Pictures/wallpapers/BhJbWva.jpg deleted file mode 100644 index 7214b7e..0000000 Binary files a/Pictures/wallpapers/BhJbWva.jpg and /dev/null differ diff --git a/Pictures/wallpapers/DASJnV0.jpg b/Pictures/wallpapers/DASJnV0.jpg deleted file mode 100644 index f15c030..0000000 Binary files a/Pictures/wallpapers/DASJnV0.jpg and /dev/null differ diff --git a/Pictures/wallpapers/KDmAH0y.jpg b/Pictures/wallpapers/KDmAH0y.jpg deleted file mode 100644 index bc2c8d5..0000000 Binary files a/Pictures/wallpapers/KDmAH0y.jpg and /dev/null differ diff --git a/Pictures/wallpapers/cragzNp.jpg b/Pictures/wallpapers/cragzNp.jpg deleted file mode 100644 index acf0ae4..0000000 Binary files a/Pictures/wallpapers/cragzNp.jpg and /dev/null differ diff --git a/Pictures/wallpapers/cvXeIhS.jpg b/Pictures/wallpapers/cvXeIhS.jpg deleted file mode 100644 index 19da78f..0000000 Binary files a/Pictures/wallpapers/cvXeIhS.jpg and /dev/null differ diff --git a/Pictures/wallpapers/d0OUD2v.jpg b/Pictures/wallpapers/d0OUD2v.jpg deleted file mode 100644 index 29d047d..0000000 Binary files a/Pictures/wallpapers/d0OUD2v.jpg and /dev/null differ diff --git a/Pictures/wallpapers/games-desktop-wallpapers-portal-hd-wallpapers-portal-wallpaper.png b/Pictures/wallpapers/games-desktop-wallpapers-portal-hd-wallpapers-portal-wallpaper.png deleted file mode 100644 index 98eeb95..0000000 Binary files a/Pictures/wallpapers/games-desktop-wallpapers-portal-hd-wallpapers-portal-wallpaper.png and /dev/null differ diff --git a/Pictures/wallpapers/hhtIaVt.jpg b/Pictures/wallpapers/hhtIaVt.jpg deleted file mode 100644 index 3447501..0000000 Binary files a/Pictures/wallpapers/hhtIaVt.jpg and /dev/null differ diff --git a/Pictures/wallpapers/kffbFW6.jpg b/Pictures/wallpapers/kffbFW6.jpg deleted file mode 100644 index f2e1993..0000000 Binary files a/Pictures/wallpapers/kffbFW6.jpg and /dev/null differ diff --git a/Pictures/wallpapers/na6gq7M.jpg b/Pictures/wallpapers/na6gq7M.jpg deleted file mode 100644 index 8210e63..0000000 Binary files a/Pictures/wallpapers/na6gq7M.jpg and /dev/null differ diff --git a/Pictures/wallpapers/qpupsup.jpg b/Pictures/wallpapers/qpupsup.jpg deleted file mode 100644 index 5aaeb55..0000000 Binary files a/Pictures/wallpapers/qpupsup.jpg and /dev/null differ diff --git a/Pictures/wallpapers/space-wallpaper-1.jpg b/Pictures/wallpapers/space-wallpaper-1.jpg deleted file mode 100644 index 47ccb5f..0000000 Binary files a/Pictures/wallpapers/space-wallpaper-1.jpg and /dev/null differ diff --git a/Pictures/wallpapers/space-wallpaper-2.jpg b/Pictures/wallpapers/space-wallpaper-2.jpg deleted file mode 100644 index b897526..0000000 Binary files a/Pictures/wallpapers/space-wallpaper-2.jpg and /dev/null differ