From 3c460ef77a2d05848eecb4382b0c6f368785e776 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 25 May 2015 13:46:02 +0200
Subject: better terminal&vim colors
---
modules/lass/urxvt.nix | 29 ++++-------------------------
modules/lass/vim.nix | 24 +++++++++++++++++-------
2 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/modules/lass/urxvt.nix b/modules/lass/urxvt.nix
index 9c9702e..889f768 100644
--- a/modules/lass/urxvt.nix
+++ b/modules/lass/urxvt.nix
@@ -31,31 +31,10 @@ in
URxvt.intensityStyles: false
- !solarized colors
- URxvt*fading: 5
- URxvt*background: #002b36
- URxvt*foreground: #657b83
- URxvt*fadeColor: #002b36
- URxvt*cursorColor: #93a1a1
- URxvt*pointerColorBackground: #586e75
- URxvt*pointerColorForeground: #93a1a1
- URxvt*colorUL: #859900
- URxvt*colorBD: #268bd2
- URxvt*color0: #073642
- URxvt*color8: #002b36
- URxvt*color1: #dc322f
- URxvt*color9: #cb4b16
- URxvt*color2: #859900
- URxvt*color10: #586e75
- URxvt*color3: #b58900
- URxvt*color11: #657b83
+ URxvt*background: #000000
+ URxvt*foreground: #ffffff
+
+ !change unreadable blue
URxvt*color4: #268bd2
- URxvt*color12: #839496
- URxvt*color5: #d33682
- URxvt*color13: #6c71c4
- URxvt*color6: #2aa198
- URxvt*color14: #93a1a1
- URxvt*color7: #eee8d5
- URxvt*color15: #fdf6e3
'';
}
diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix
index e277bd7..56a20c3 100644
--- a/modules/lass/vim.nix
+++ b/modules/lass/vim.nix
@@ -1,6 +1,17 @@
{ config, pkgs, ... }:
-{
+let
+ customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin {
+ name = "Mustang2";
+ src = pkgs.fetchFromGitHub {
+ owner = "croaker";
+ repo = "mustang-vim";
+ rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
+ sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+ };
+ };
+
+in {
environment.systemPackages = with pkgs; [
(vim_configurable.customize {
@@ -12,7 +23,7 @@
syntax on
" TODO autoload colorscheme file
set background=dark
- colorscheme solarized
+ colorscheme mustang
filetype off
filetype plugin indent on
@@ -81,13 +92,12 @@
set undofile
'';
- vimrcConfig.vam.knownPlugins = vimPlugins;
+ vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins;
vimrcConfig.vam.pluginDictionaries = [
- { name = "Gundo"; }
- { name = "commentary"; }
- { name = "vim-addon-nix"; }
- { name = "colors-solarized"; }
+ { names = [ "Gundo" "commentary" "vim-addon-nix" ]; }
+ { name = "mustang2"; }
];
+
})
];
}
--
cgit v1.2.3