From 14d7a53ef20a89763c205191160fe5b9fe948178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Thu, 18 Apr 2019 17:10:20 +0200
Subject: [PATCH] vim, tmux, dunst

---
 configs/editors.nix |  1 -
 dot/dunst.nix       |  2 +-
 dot/tmux.nix        | 19 ++++---------------
 dot/vimrc           |  9 +++++----
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/configs/editors.nix b/configs/editors.nix
index 66a1c1f..de71fb3 100644
--- a/configs/editors.nix
+++ b/configs/editors.nix
@@ -81,7 +81,6 @@ in {
           ];
           opt = [
             csv
-            deoplete-rust
             dhall-vim
             elm-vim
             haskell-vim
diff --git a/dot/dunst.nix b/dot/dunst.nix
index e1bf3c3..6f72ab5 100644
--- a/dot/dunst.nix
+++ b/dot/dunst.nix
@@ -6,7 +6,7 @@ with import <dot/theme.nix>;
   settings = {
     global = {
       transparency = 10;
-      font = "${uiFont.name} ${toString uiFont.size}";
+      font = "${terminalFont.name} ${toString terminalFont.size}";
       geometry = "200x5-30+20";
       frame_color = invertedColorScheme.background;
       follow = "mouse";
diff --git a/dot/tmux.nix b/dot/tmux.nix
index 3d93a2d..9cb4322 100644
--- a/dot/tmux.nix
+++ b/dot/tmux.nix
@@ -3,25 +3,14 @@ set -g status-interval 2
 set -g status-left-length 32
 set -g status-right-length 150
 
-# Appearance
-# set -g status-utf8 on
 set -g status-bg default
-# set -g status-fg white
+
 setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
 setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
-# setw -g window-status-current-bg colour0
-# setw -g window-status-current-fg colour11
-# Status Bar
-set -g status-left ""
-# set -g status-right "#[fg=colour196,bg=colour233] LOAD #[fg=white,bg=colour237] #(awk '{print $1, $2, $3}' < /proc/loadavg) #[default] #[fg=colour196,bg=colour233] CPU #[fg=white,bg=colour237] #(ps -A -o pcpu | tail -n+2 | paste -sd+ | bc) #[default] #[fg=colour196,bg=colour233] MEM #[fg=white,bg=colour237] #(ps -A -o pmem | tail -n+2 | paste -sd+ | bc) #[default] #[fg=white,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour196,bg=colour233] %H:%M "
-set -g status-right "#[fg=colour12,bg=colour233] LOAD #[fg=colour255,bg=colour237] #(cut -d' ' -f 1-3 < /proc/loadavg) #[default] #[fg=colour12,bg=colour233] MEM #[fg=colour255,bg=colour237] #(free -h --si | awk 'NR==2{print $3}') #[default] #[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
-set -g status-justify left
 
-# setw -g window-status-current-fg black
-# setw -g window-status-fg black
-# setw -g window-status-current-bg white
-# setw -g window-status-bg white
-# setw -g window-status-current-attr bold
+set -g status-left ""
+set -g status-right "# [fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
+set -g status-justify left
 
 set -g pane-active-border-fg colour237
 set -g pane-border-fg colour237
diff --git a/dot/vimrc b/dot/vimrc
index 72c9b11..0c9e6d0 100644
--- a/dot/vimrc
+++ b/dot/vimrc
@@ -8,6 +8,7 @@ let g:fzf_layout = { 'down': '~15%' }
 
 " colorscheme delek hipster
 " colorscheme 256_noir
+set background=dark
 colorscheme paramount
 
 let mapleader = ","
@@ -112,7 +113,7 @@ if has("autocmd")
   autocmd bufnewfile,bufread *.fs packadd vim-fsharp | set filetype=fsharp
   autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
   autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix
-  autocmd bufnewfile,bufread *.rust packadd rust-vim | packadd deoplete-rust
+  autocmd bufnewfile,bufread *.rust packadd rust-vim " | packadd deoplete-rust
   autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv
   autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
   autocmd bufnewfile,bufread *.ts packadd vim-typescript
@@ -143,8 +144,8 @@ let g:startify_custom_header = ''
 let g:deoplete#enable_at_startup = 1
 " endif
 "
-let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
-let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
+" let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
+" let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
 
 " if exists("g:loaded_supertab")
 let g:SuperTabDefaultCompletionType = 'context'
@@ -157,7 +158,6 @@ let g:haskell_enable_pattern_synonyms = 1
 
 " if exists("g:loaded_ale")
 let g:ale_linters = {
-      \ 'rust': ['cargo'],
       \ 'css': ['csslint'],
       \ 'haskell': ['ghc', 'cabal-ghc', 'hlint'],
       \ 'html': ['tidy', 'proselint'],
@@ -165,6 +165,7 @@ let g:ale_linters = {
       \ 'pandoc': ['proselint'],
       \ 'ruby': ['rubocop'],
       \ 'json': ['jsonlint'],
+      \ 'rust': ['cargo'],
       \ 'python': ['pyls'],
       \}
 let g:ale_fixers = {