From 71f32924896444da7865627ca8f386aa7183f2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Wed, 3 Apr 2019 11:51:53 +0200 Subject: [PATCH] Cleaning neomuttrc --- .gitignore | 1 + bash/.bashrc | 41 +++--------------- neomutt/.config/neomutt/neomuttrc | 4 +- neovim/.config/nvim/init.vim | 71 ++++++++++++++++--------------- sway/.config/sway/config | 1 + waybar/.config/waybar/style.css | 11 +++-- 6 files changed, 52 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 81767e4..0696710 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ env cache.db* history* +neomuttrc diff --git a/bash/.bashrc b/bash/.bashrc index e3bcec7..d83506e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -113,31 +113,6 @@ shopt -s expand_aliases # Enable history appending instead of overwriting. #139609 shopt -s histappend -# -# # ex - archive extractor -# # usage: ex -ex () -{ - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; - esac - else - echo "'$1' is not a valid file" - fi -} - #Bash Completion for OC source ~/.oc_completion.sh source ~/.alias_completion.sh @@ -157,9 +132,6 @@ source /usr/share/git/completion/git-prompt.sh eval "$(pipenv --completion)" PS1='\[\e[1;32m\u@\h \e[1;34m\w\]\n\[\e[1;33m\]$(__git_ps1 "(%s) ")\[\e[m\]⇨ ' -#Disable CapsLock -#setxkbmap -option ctrl:nocaps - #Disable some CTRL for VIM commands bind -r '\C-s' stty -ixon @@ -167,26 +139,27 @@ stty -echoctl #Paths export _JAVA_AWT_WM_NONREPARENTING=1 +#export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""' export M2_HOME=/home/jfm/Tools/apache-maven export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/:/home/jfm/Tools/aws/ export GIT_EDITOR=nvim -export EDITOR="nvr -s --remote" -export VISUAL="nvr -s --remote" +export EDITOR="nvim" +export VISUAL="nvim" #Aliases -alias ocdev="oc -n onboarding-dev" -alias octst="oc -n onboarding-test" alias code="cd /home/jfm/Customers/TDC/Code/Onboarding" alias dotfiles="cd /home/jfm/Repositories/dotfiles" alias tdc="cd /home/jfm/Customers/TDC" alias prod="ssh -fN sochi" + alias top="htop" alias ssh="TERM=xterm-256color ssh" -alias rvim="nvr -s --remote" alias vim="nvim" alias vi="nvim" +alias rtv="rtv --enable-media" alias k9s="/home/jfm/Tools/k9s/k9s" alias buildtool="/home/jfm/.buildtool/bin/buildtool" alias vpnup="nmcli con up id \"YouSee VPN\"" alias vpndown="nmcli con down id \"YouSee VPN\"" -alias music="~/.config/i3/scripts/music.sh" + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/neomutt/.config/neomutt/neomuttrc b/neomutt/.config/neomutt/neomuttrc index e4529ba..81ac997 100644 --- a/neomutt/.config/neomutt/neomuttrc +++ b/neomutt/.config/neomutt/neomuttrc @@ -3,13 +3,13 @@ set timeout=15 set sort=threads set imap_user=jfm@doel.dk -set imap_pass=s89YA7vAkTXakps +set imap_pass=JXdQsjCMq76QYZG set folder=imaps://mail.unoeuro.com/ set spoolfile=+INBOX set realname = 'Jesper Fussing Mørk' set from = jfm@doel.dk -set use_from = yes +set use_from = no set smtp_url=smtps://$imap_user:$imap_pass@asmtp.unoeuro.com set ssl_force_tls = yes diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 79a4140..546c152 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -15,29 +15,36 @@ set background=dark set rtp^=/usr/share/vim/vimfiles/ set undodir=~/.local/share/nvim/undodir set undofile +"set wildoptions=pum +"set pumblend=20 "Plugins call plug#begin('~/.local/share/nvim/plugged') +" Pretty Status Lines Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -Plug 'scrooloose/nerdtree' -Plug 'scrooloose/nerdcommenter' +" Completion Plug 'Shougo/deoplete.nvim' Plug 'zchee/deoplete-jedi' -"Plug 'Valloric/YouCompleteMe' -Plug 'vim-syntastic/syntastic' -Plug 'luochen1990/rainbow' -Plug 'numirias/semshi' -Plug 'arcticicestudio/nord-vim' -Plug 'ctrlpvim/ctrlp.vim' Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' +" Colorscheme +Plug 'arcticicestudio/nord-vim' +" Pretty parenthesis +Plug 'luochen1990/rainbow' +" Terminal +Plug 'https://gitlab.com/Lenovsky/nuake.git' +" File handling +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/fzf.vim' +" Python +Plug 'numirias/semshi' +Plug 'w0rp/ale' +Plug 'ambv/black' +" HTML Plug 'jonsmithers/vim-html-template-literals' Plug 'pangloss/vim-javascript' Plug 'alvan/vim-closetag' -Plug 'shime/vim-livedown' -Plug 'w0rp/ale' -Plug 'ambv/black' call plug#end() colorscheme nord @@ -45,17 +52,8 @@ 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='nord' -"YCM -"let mapleader = \"½\" -"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=3 -"let g:ycm_add_preview_to_completeopt = 1 -"map g :YcmCompleter GoToDefinitionElseDeclaration - " Deoplete let g:deoplete#enable_at_startup = 1 @@ -70,27 +68,31 @@ let g:UltiSnipsExpandTrigger="" let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" -" NerdTree -map :NERDTreeToggle -map :NERDTreeFocus -let g:NERDTreeWinSize=40 -let NERDTreeShowBookmarks=1 -let NERDTreeMinimalUI=1 - " HTML let g:closetag_filenames = '*.html,*.js' let g:html_indent_style1 = "inc" -" LiveDown -let g:livedown_browser = '"google-chrome-stable --new-window --app=http://localhost:1337"' -nmap gm :LivedownToggle - " Black autocmd BufWritePre *.py execute ':Black' +" FZF +let $FZF_DEFAULT_COMMAND = 'ag --ignore .git -g ""' +command! -bang -nargs=? -complete=dir HFiles + \ call fzf#vim#files(, {'source': 'ag --hidden --ignore .git -g ""'}, 0) +map :Files +map :HFiles + +" Nuake +let g:nuake_position = 'bottom' +let g:nuake_per_tab = 1 +nnoremap :Nuake +inoremap :Nuake +tnoremap :Nuake + "Mappings :nmap :w :imap :wa +:nmap :bd nnoremap nnoremap nnoremap @@ -98,10 +100,9 @@ nnoremap nnoremap :bp nnoremap :bn nnoremap :%!jq '.' -"noremap -"noremap -"noremap -"noremap +" F2 Sets Working Directory to current. Ctrl+F2 sets it to home directory +nnoremap :lcd %:p:h +nnoremap :lcd ~ "AutoCommands au BufWinEnter * set number diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 5a2fc55..f487ffd 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -181,5 +181,6 @@ mode $exitmenu { bindsym $mod+backspace mode $exitmenu #### Custom Config +exec swayidle timeout 300 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch' exec /home/jfm/.config/sway/scripts/start_layout.sh exec mako diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index 6fe6614..20baaf0 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -41,16 +41,11 @@ window#waybar { border-bottom: 3px solid @nord14; } -#clock, #battery { +#clock, #battery, #cpu, #memory, #pulseaudio, #network { padding: 0 10px; margin: 0 5px; } -#cpu, #memory, #pulseaudio { - padding: 0 5px; - margin: 0 5px; -} - #clock { border-bottom: 3px solid @nord14; color: @nord04; @@ -110,9 +105,13 @@ window#waybar { #custom-spotify { border-bottom: 3px solid @nord14; color: @nord04; + padding: 0 10px; + margin: 0 5px; } #custom-arch { border-bottom: 3px solid @nord11; color: @nord04; + padding: 0 10px; + margin: 0 5px; }