From c2efe265536f3c5c286367309e243893c23bcaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sat, 13 Apr 2019 22:28:22 +0200 Subject: [PATCH] colorscheming; vim: - airline --- configs/editors.nix | 41 ++++++++++++++++++++++++++++++++++++++++- configs/networks.nix | 6 ++++++ configs/packages.nix | 2 -- dot/theme.nix | 36 ++++++++++++++++++++++++++++++++++-- dot/urxvt.nix | 4 ++-- dot/vimrc | 10 +++++++--- 6 files changed, 89 insertions(+), 10 deletions(-) diff --git a/configs/editors.nix b/configs/editors.nix index 5bdc025..66a1c1f 100644 --- a/configs/editors.nix +++ b/configs/editors.nix @@ -29,7 +29,6 @@ in { supertab tabular vim-abolish - vim-airline vim-airline-themes vim-commentary vim-eunuch vim-fugitive @@ -39,6 +38,46 @@ in { vim-sensible vim-startify vim-surround + # (pkgs.vimUtils.buildVimPlugin rec { + # name = "connermcd"; + # src = pkgs.fetchFromGitHub { + # owner = "connermcd"; + # repo = "dotfiles"; + # rev = "3a2788cc94e5e51144adcad4da4f9489ccd3e341"; + # sha256 = "1p0r4nd4syhy62mkz1iji6kwsg2hvcr7q5qzaqv6p52dkm7ffx52"; + # }; + # buildPhase = '' + # mkdir -p $out/share/vim-plugins/${name}/colors + # mv .vim/colors/*.vim $out/share/vim-plugins/${name}/colors/ + # ''; + # }) + # (pkgs.vimUtils.buildVimPluginFrom2Nix { + # name = "apprentice"; + # src = pkgs.fetchFromGitHub { + # owner = "romainl"; + # repo = "Apprentice"; + # rev = "0ca2038758f9d7dfdf51733db8d22665663382f7"; + # sha256 = "1jdfn3wm46ndc24lkzxy3akjbqwglrdy7qqyypbwwsq7vp0s5051"; + # }; + # }) + (pkgs.vimUtils.buildVimPluginFrom2Nix rec { + name = "vim-colors-paramount"; + src = pkgs.fetchFromGitHub { + owner = "owickstrom"; + repo = "vim-colors-paramount"; + rev = "a5601d36fb6932e8d1a6f8b37b179a99b1456798"; + sha256 = "0rjn9vjb0xrxbiqyfclda2ridcbl3nfn4svs32mvmv8als6crncg"; + }; + }) + (pkgs.vimUtils.buildVimPluginFrom2Nix { + name = "vim-256noir"; + src = pkgs.fetchFromGitHub { + owner = "andreasvc"; + repo = "vim-256noir"; + rev = "e8668a18a4a90272c1cae87e655f8bddc5ac3665"; + sha256 = "1kpn379f5dgbsgb73g6d1nlmz9vz0j3ihi500mcdx4yg56fvkr0x"; + }; + }) ]; opt = [ csv diff --git a/configs/networks.nix b/configs/networks.nix index 1d48597..58eb258 100644 --- a/configs/networks.nix +++ b/configs/networks.nix @@ -61,6 +61,11 @@ in { hostname = "v22017123717457389.megasrv.de"; port = 49123; }; + irc = { + user = "kmein"; + hostname = "prism.r"; + extraOptions.RemoteCommand = "tmux a"; + }; "gitlab.peixdev.net".port = 999; }; }; @@ -88,6 +93,7 @@ in { sshKey.homeros sshKey.scardanelli ]; + users.users.kfm.openssh.authorizedKeys.keys = [ sshKey.homeros sshKey.scardanelli diff --git a/configs/packages.nix b/configs/packages.nix index 4b7a42b..0197855 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -16,14 +16,12 @@ in with pkgs; fonts.enableDefaultFonts = true; fonts.fonts = [ - cantarell-fonts corefonts eb-garamond fira libertine lmodern noto-fonts - powerline-fonts roboto xlibs.fontschumachermisc ubuntu_font_family diff --git a/dot/theme.nix b/dot/theme.nix index a636daf..815edd3 100644 --- a/dot/theme.nix +++ b/dot/theme.nix @@ -18,6 +18,38 @@ let background = black.dark; foreground = white.dark; }; + connormcd = rec { + black = { light = "#454545"; dark = "#222222"; }; + red = { light = "#FA8072"; dark = "#B22222"; }; + green = { light = "#779A3E"; dark = "#556B2F"; }; + yellow = { light = "#DAA520"; dark = "#B8860B"; }; + blue = { light = "#6495ED"; dark = "#4682B4"; }; + magenta = { light = "#DA70D6"; dark = "#9932CC"; }; + cyan = { light = "#B0E0E6"; dark = "#87CEEB"; }; + white = { light = "#FFFFFF"; dark = "#C0C0C0"; }; + background = "#000000"; + foreground = "#AAAAAA"; + fadeColor = black.dark; + cursorColor = green.light; + pointerColorForeground = green.light; + pointerColorBackground = white.dark; + }; + apprentice = rec { + black = { light = "#444444"; dark = "#1c1c1c"; }; + red = { light = "#ff8700"; dark = "#af5f5f"; }; + green = { light = "#87af87"; dark = "#5f875f"; }; + yellow = { light = "#ffffaf"; dark = "#87875f"; }; + blue = { light = "#8fafd7"; dark = "#5f87af"; }; + magenta = { light = "#8787af"; dark = "#5f5f87"; }; + cyan = { light = "#5fafaf"; dark = "#5f8787"; }; + white = { light = "#999999"; dark = "#6c6c6c"; }; + background = "#262626"; + foreground = "#bcbcbc"; + fadeColor = black.dark; + cursorColor = "#bcbcbc"; + pointerColorForeground = green.light; + pointerColorBackground = white.dark; + }; macOS = rec { black = { light = "#818383"; dark = "#000000"; }; red = { light = "#fc391f"; dark = "#c23621"; }; @@ -66,8 +98,8 @@ in rec { black = "#000000"; gray = "#888888"; - colorScheme = macOS; - invertedColorScheme = flip macOS; + colorScheme = connormcd; + invertedColorScheme = flip connormcd; colorPalette = [ colorScheme.black.dark colorScheme.red.dark colorScheme.green.dark colorScheme.yellow.dark colorScheme.blue.dark colorScheme.magenta.dark colorScheme.cyan.dark colorScheme.white.dark diff --git a/dot/urxvt.nix b/dot/urxvt.nix index 44c091a..2098e86 100644 --- a/dot/urxvt.nix +++ b/dot/urxvt.nix @@ -10,8 +10,8 @@ with import ; scroll.bar.enable = false; extraConfig = { perl-ext-common = "default,clipboard,url-select,matcher"; - urlLauncher = "chromium"; - fading = 50; + urlLauncher = "/usr/bin/env chromium"; + fading = 20; iso14755 = false; urgentOnBell = true; reverseVideo = false; diff --git a/dot/vimrc b/dot/vimrc index 021c2fc..a101633 100644 --- a/dot/vimrc +++ b/dot/vimrc @@ -6,7 +6,8 @@ vnoremap a- :Tabularize /-> nnoremap :FZF let g:fzf_layout = { 'down': '~15%' } -colorscheme delek +" colorscheme delek hipster +colorscheme 256_noir let mapleader = "," " let maplocalleader="\\" @@ -31,8 +32,11 @@ set title set nocompatible set smartcase set shiftwidth=2 tabstop=2 expandtab +set laststatus=1 set number -set path=$PWD/** +set path+=** +set splitbelow +set splitright set wildmenu set shortmess+=aI set nowritebackup noswapfile @@ -177,7 +181,7 @@ let g:ale_completion_enabled = 1 " endif "if exists("g:loaded_airline") -set noshowmode laststatus=0 noruler +" set noshowmode laststatus=0 noruler let g:airline#extensions#tabline#close_symbol = 'X' let g:airline#extensions#tabline#enabled = 0 "let g:airline#extensions#tabline#left_alt_sep = ''