From e575bec46e9a22d962f5c57f7e56e9246e243a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Tue, 8 Jan 2019 13:57:59 +0100 Subject: [PATCH] Started moving to Nord colorscheme --- bash/.bashrc | 3 +- i3/.config/i3/scripts/music.sh | 2 +- i3/.config/i3/workspaces/ws00.sh | 2 +- i3/.config/i3/workspaces/ws09.sh | 4 +-- neovim/.config/nvim/init.vim | 18 +++++++--- newsboat/.newsboat/urls | 17 ---------- termite/.config/termite/config | 57 +++++++++++++++++--------------- 7 files changed, 51 insertions(+), 52 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 123686f..41eff72 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -171,7 +171,7 @@ stty -echoctl #Paths export M2_HOME=/home/jfm/Tools/apache-maven export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/ -export GIT_EDITOR=vim +export GIT_EDITOR=nvim export EDITOR="nvr -s --remote" export VISUAL="nvr -s --remote" #Aliases @@ -185,6 +185,7 @@ alias prod="ssh -fN sochi" alias top="htop" alias ssh="TERM=xterm-256color ssh" alias vim="nvr -s --remote" +alias vi="nvim" alias buildtool="/home/jfm/Customers/TDC/Code/Onboarding/build-tool/buildtool.sh" alias vpnup="nmcli con up id \"YouSee VPN\"" alias vpndown="nmcli con down id \"YouSee VPN\"" diff --git a/i3/.config/i3/scripts/music.sh b/i3/.config/i3/scripts/music.sh index d85a572..a2f1cb1 100755 --- a/i3/.config/i3/scripts/music.sh +++ b/i3/.config/i3/scripts/music.sh @@ -1,3 +1,3 @@ #!/bin/bash -nohup mopidy >/dev/null 2>&1 & \ No newline at end of file +nohup mopidy --config ~/.config/mopidy/mopidy.conf >/dev/null 2>&1 & diff --git a/i3/.config/i3/workspaces/ws00.sh b/i3/.config/i3/workspaces/ws00.sh index 07bd535..9758cfa 100755 --- a/i3/.config/i3/workspaces/ws00.sh +++ b/i3/.config/i3/workspaces/ws00.sh @@ -2,5 +2,5 @@ . ~/.config/i3/env i3-msg "workspace 0:; append_layout ~/.config/i3/layouts/workspace0-timewaste.json" i3-msg "workspace 0:; exec termite -t weechat -e weechat" -i3-msg "workspace 0:; exec termite -t music -e ncmpcpp" +#i3-msg "workspace 0:; exec termite -t music -e ncmpcpp" i3-msg "workspace 0:; move workspace to output $SECONDARY" diff --git a/i3/.config/i3/workspaces/ws09.sh b/i3/.config/i3/workspaces/ws09.sh index 9ff1152..e539122 100755 --- a/i3/.config/i3/workspaces/ws09.sh +++ b/i3/.config/i3/workspaces/ws09.sh @@ -6,13 +6,13 @@ then i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/ws-news-wide.json" i3-msg "workspace 9:; exec termite -t newsboat -e newsboat --hold" i3-msg "workspace 9:; exec termite -t bark -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py' --hold" - i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark' --hold" + i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme default' --hold" i3-msg "workspace 9:; exec gpmdp" i3-msg "workspace 9:; move workspace to output $PRIMARY" else i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/workspace9-news.json" i3-msg "workspace 9:; exec termite -t newsboat -e newsboat --hold" i3-msg "workspace 9:; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py' --hold" - i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark' --hold" + i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme default' --hold" i3-msg "workspace 9:; move workspace to output $SECONDARY" fi diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 23ea67b..79176fb 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -13,7 +13,6 @@ set autoread set hidden set background=dark set rtp^=/usr/share/vim/vimfiles/ -colorscheme solarized "Plugins call plug#begin('~/.local/share/nvim/plugged') @@ -22,17 +21,21 @@ Plug 'vim-airline/vim-airline-themes' Plug 'Valloric/YouCompleteMe' Plug 'nvie/vim-flake8' Plug 'vim-syntastic/syntastic' +Plug 'luochen1990/rainbow' +Plug 'numirias/semshi' +Plug 'arcticicestudio/nord-vim' call plug#end() +colorscheme nord + "Airline let g:airline#extensions#tabline#enabled = 1 let g:Powerline_symbols='unicode' let g:airline_powerline_fonts = 1 -let g:airline_theme='solarized' -let g:airline_solarized_bg='dark' +let g:airline_theme='nord' "YCM -let g:ycm_server_python_interpreter = 'python2' +let g:ycm_server_python_interpreter = 'python3' let g:ycm_autoclose_preview_window_after_completion=1 let g:ycm_min_num_of_chars_for_completion=5 let g:ycm_add_preview_to_completeopt = 1 @@ -44,6 +47,9 @@ let g:syntastic_python_checkers = ['python'] autocmd FileType python map :call Flake8() let g:flake8_show_in_gutter=1 +"Rainbow Parentheses +let g:rainbow_active = 1 + "Mappings :nmap :w :imap :wa @@ -59,3 +65,7 @@ nnoremap :%!jq '.' au BufWinEnter * set number au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null autocmd FileType python setlocal completeopt-=preview + +" add yaml stuffs +au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=indent +autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab diff --git a/newsboat/.newsboat/urls b/newsboat/.newsboat/urls index 6c26413..965e7cf 100644 --- a/newsboat/.newsboat/urls +++ b/newsboat/.newsboat/urls @@ -3,43 +3,26 @@ http://www.space.com/syn/space.xml "Space" http://www.nasa.gov/rss/breaking_news.rss "Space" http://blog.danlew.net/rss/ "Android Development" http://www.version2.dk/modules/fsArticle/rss.php?source=1 "news-it" -http://feeds.gawker.com/lifehacker/vip "news-it" http://feeds.arstechnica.com/arstechnica/index/ "news-it" -http://www.computerworld.dk/rss/all "news-it" -http://www.pheedo.com/f/toms_hardware "news-it" http://feeds2.feedburner.com/NikonRumors "Photography" http://photographylife.com/feed "Photography" http://feeds.feedburner.com/PetaPixel "Photography" -http://www.followmeaway.com/feed/ "Photography" https://visualwilderness.com/feed "Photography" http://shuttermuse.com/feed/ "Photography" http://www.wheelingit.us/feed/ "Photography" -http://feeds.gawker.com/jalopnik/vip "Cars" http://feeds2.feedburner.com/PatrickRothfuss "Authors" http://phandroid.com/feed/ "Android News" http://feeds.feedburner.com/AndroidPolice "Android News" http://www.gamerswithjobs.com/node/feed "Gaming" http://www.dr.dk/Nyheder/Service/feeds/Allenyheder.htm "news" -http://www.myextralife.com/feed/ "Comics" -http://cube-drone.com/rss.xml "Comics" -http://www.lunarbaboon.com/comics/rss.xml "Comics" -http://feeds.feedburner.com/oatmealfeed "Comics" -http://www.fowllanguagecomics.com/feed/ "Comics" -http://www.joyoftech.com/joyoftech/jotblog/index.xml "Comics" -http://xkcd.com/rss.xml "Comics" -http://feeds.feedburner.com/PoorlyDrawnLines "Comics" -http://feeds.feedburner.com/Explosm "Comics" -http://www.loadingartist.com/feed/ "Comics" http://www.garshol.priv.no/blog/index.xml "Beer" http://feeds.feedburner.com/Techcrunch "Tech" http://officialandroid.blogspot.com/feeds/posts/default "Tech" http://www.engadget.com/rss-full.xml "Tech" http://www.dcrainmaker.com/feed "Tech" http://googleblog.blogspot.com/atom.xml "Tech" -http://www.readwriteweb.com/rss.xml "Tech" http://chrome.blogspot.com/atom.xml "Tech" http://www.popsci.com/rss.xml "Science" -https://blogs.oracle.com/developers/rss http://chromeunboxed.com/feed/ http://gulklud.dk/feed/ http://feeds.feedburner.com/Phoronix diff --git a/termite/.config/termite/config b/termite/.config/termite/config index b5ced12..40d0393 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -1,33 +1,38 @@ +# Copyright (c) 2016-present Arctic Ice Studio +# Copyright (c) 2016-present Sven Greb + +# Project: Nord Termite +# Repository: https://github.com/arcticicestudio/nord-termite +# License: MIT + [options] -font = Source Code Pro for Powerline 11 +font = Source Code Pro for Powerline 10 scrollback_lines = 10000 size_hints = true -# Solarized dark color scheme [colors] -foreground = #839496 -foreground_bold = #eee8d5 -foreground_dim = #002b36 -background = #002b36 -cursor = #93a1a1 +cursor = #d8dee9 +cursor_foreground = #2e3440 -# if unset, will reverse foreground and background -#highlight = #839496 +foreground = #d8dee9 +foreground_bold = #d8dee9 +background = #2e3440 -# colors from color0 to color254 can be set -color0 = #073642 -color1 = #dc322f -color2 = #859900 -color3 = #b58900 -color4 = #268bd2 -color5 = #d33682 -color6 = #2aa198 -color7 = #eee8d5 -color8 = #002b36 -color9 = #cb4b16 -color10 = #586e75 -color11 = #657b83 -color12 = #839496 -color13 = #6c71c4 -color14 = #93a1a1 -color15 = #fdf6e3 +highlight = #4c566a + +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