Improve cmdline and designs

home/desktop/default.nix

@@ -47,15 +47,33 @@ in {
       options = [ "altwin:swap_lalt_lwin" ];
     };
   };
-  programs.urxvt = {
+  programs.urxvt = let mkFont = size: name: "xft:${name}:pixelsize=${size}";
+  in {
     enable = true;
     package = desktop-pkgs.urxvt;
-    fonts = [ "6x13" ];
-    keybindings = {
-      "C-1" = "command:\\033]710;6x13\\007";
-      "C-2" = "command:\\033]710;10x20\\007";
-      "C-3" = "command:\\033]710;xft:Roboto Mono Nerd Font:size=16\\007";
-      "C-4" = "command:\\033]710;xft:Roboto Mono Nerd Font:size=24\\007";
+    fonts = map (mkFont "18") [
+      "Inconsolata"
+      "Droid Sans Mono"
+      "DejaVu Sans Mono"
+      "Droid Sans Fallback"
+      "FreeSans"
+    ];
+    keybindings = let
+      switchFont = size:
+        "command:\\033]710;${
+          lib.concatStringsSep "," (map (mkFont size) [
+            "Inconsolata"
+            "Droid Sans Mono"
+            "DejaVu Sans Mono"
+            "Droid Sans Fallback"
+            "FreeSans"
+          ])
+        }\\007";
+    in {
+      "C-1" = switchFont "12";
+      "C-2" = switchFont "16";
+      "C-3" = switchFont "18";
+      "C-4" = switchFont "24";
       "C-f" = "matcher:select";
       "C-g" = "matcher:last";
     };

home/desktop/i3.nix

@@ -104,7 +104,7 @@ in {
           followMouse = false;
           forceWrapping = true;
         };
-        fonts = [ "Monofur Nerd Font 10.5" ];
+        fonts = [ "Inconsolata Nerd Font pixelsize=16" ];
         colors = {
           focused = {
             background = colors.blue;

home/zsh/default.nix

@@ -10,9 +10,15 @@
         size = 100000;
       };
       initExtra = builtins.readFile ./zshrc;
-      oh-my-zsh = {
+      oh-my-zsh = let my-pkgs = import ../../pkgs;
+      in {
         enable = true;
-        plugins = [ "colored-man-pages" "git-prompt" ];
+        plugins = [ "colored-man-pages" ];
+        theme = "powerlevel10k";
+        custom = "${pkgs.runCommand "oh-my-zsh-custom" { } ''
+          mkdir -p $out/themes
+          ln -s ${my-pkgs.zsh-powerlevel10k}/powerlevel10k/powerlevel10k.zsh-theme $out/themes/.
+        ''}";
       };
     };
   };

pkgs/nvim/vimrc

@@ -1,4 +1,6 @@
 set spell spelllang=de,en
+let g:airline_powerline_fonts = 1
+let g:airline#extensions#tabline#enabled = 1
 set background=dark
 set autoindent
 set nosmartindent

pkgs/powerlevel10k/gitstatus.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub, makeWrapper, libgit2 }:
+
+stdenv.mkDerivation {
+  name = "gitstatus";
+  version = "2019-05-04";
+
+  src = fetchFromGitHub {
+    owner = "romkatv";
+    repo = "gitstatus";
+    rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424";
+    sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6";
+  };
+
+  buildInputs = [ libgit2 ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp gitstatusd $out/bin/
+  '';
+}

pkgs/powerlevel10k/zsh-powerlevel10k.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "powerlevel10k";
+  src = fetchFromGitHub {
+    owner = "romkatv";
+    repo = "powerlevel10k";
+    rev = "b451b7a75821afedba6e9fa3c422e8eca9f8dedc";
+    sha256 = "0gb27ml1ypi3j5xilvv38b73agqcf2y6ll532zkcv4lwha3ldhmy";
+  };
+
+  installPhase = ''
+    mkdir -p $out/powerlevel10k
+    mv * $out/powerlevel10k
+  '';
+}