From 66b29608eecbeb42c9ea09c554c1f239f45c5a0f Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 17 Jan 2021 21:19:18 +0100
Subject: [PATCH] Tweaks

---
 .Xresources        |  5 +++++
 doom.d/config.el   |  2 +-
 doom.d/packages.el |  1 +
 vimrc              | 23 +++++++++++++----------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.Xresources b/.Xresources
index 3f5f8e5..1b1c86c 100644
--- a/.Xresources
+++ b/.Xresources
@@ -8,6 +8,11 @@ URxvt*highlightTextColor: #bfbfbf
 URxvt*lineSpace:                1
 URxvt.letterSpace:              -1
 
+URxvt.keysym.Control-Up:     \033[1;5A
+URxvt.keysym.Control-Down:   \033[1;5B
+URxvt.keysym.Control-Left:   \033[1;5D
+URxvt.keysym.Control-Right:  \033[1;5C
+
 ! Aesthetics
 URxvt*fading: 20
 URxvt*fadeColor: #111015
diff --git a/doom.d/config.el b/doom.d/config.el
index 45ece42..24489ba 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -26,7 +26,7 @@
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
 ; (setq doom-theme 'doom-tomorrow-day)
-(setq doom-theme 'doom-tomorrow-night)
+(setq doom-theme 'xresources-theme)
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
diff --git a/doom.d/packages.el b/doom.d/packages.el
index e3ecd2e..2b288fc 100644
--- a/doom.d/packages.el
+++ b/doom.d/packages.el
@@ -52,3 +52,4 @@
 ;(package! discord-emacs :recipe (:host github :repo "nitros12/discord-emacs.el"))
 (package! nasm-mode :recipe (:host github :repo "skeeto/nasm-mode"))
 (package! elcord :recipe (:host github :repo "Mstrodl/elcord"))
+(package! xresources-theme :recipe (:host github :repo "cqql/xresources-theme"))
diff --git a/vimrc b/vimrc
index c132c15..d67bc06 100644
--- a/vimrc
+++ b/vimrc
@@ -22,9 +22,9 @@ set wrap
 set noet
 
 set autoindent
-set noexpandtab " If this doesn't work for a lang change the $LANG.vim and append this here
-set tabstop=4
-set shiftwidth=4
+set noexpandtab 
+set tabstop=8
+set shiftwidth=8
 
 vmap <Tab> >gv
 vmap <S-Tab> <gv
@@ -40,20 +40,21 @@ call plug#begin('~/.vim/plugged')
 	Plug 'preservim/nerdtree' " Tree navigation
 	Plug 'rafi/awesome-vim-colorschemes' " Theme collection
 	Plug 'chriskempson/base16-vim' " Theme
+	Plug 'vim-airline/vim-airline' " Airline
+	Plug 'vim-airline/vim-airline-themes' " Airline themes
+	Plug 'ajh17/vimcompletesme' " YCM but Vim
+	Plug 'sonph/onehalf', { 'rtp': 'vim' } " theme
 call plug#end()
 
 
 " Mapping
-" CTRL + D to open navtree 
 nmap <silent> <C-D> :NERDTreeToggle<CR> 
-" CTRL + F to enter goyo mode
-nmap <silent> <C-F> :Goyo x100%<CR>
-" Replace
 vnoremap <C-r> "hy:%s/<C-r>h//gc<left><left><left>
 
 " Theme
 set t_Co=256
 colors default
+let g:airline_theme='minimalist'
 let &showbreak = '↳ '
 
 hi Normal guibg=NONE ctermbg=NONE
@@ -61,15 +62,17 @@ hi Normal guibg=NONE ctermbg=NONE
 highlight clear LineNr
 highlight LineNr ctermfg=grey ctermbg=NONE
 
-" Syntax highlightning
-let asmsyntax = 'nasm'
-
 " YCM
 set completeopt-=preview
 let g:ycm_show_diagnostics_ui = 0
+highlight Pmenu ctermfg=15 ctermbg=0 guifg=#ffffff guibg=#000000
 
 " Tabs
 nnoremap <silent> <C-Left> :tabprevious<CR>
 nnoremap <silent> <C-Right> :tabnext<CR>
 nnoremap <silent> <C-j> :tabprevious<CR>
 nnoremap <silent> <C-k> :tabnext<CR>
+
+" Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1