From 8330cfac006ef799e71e716025a52c49495c32c8 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 26 Jan 2018 12:45:56 +0100
Subject: [PATCH] laptop: systemwide zsh config; minor cleanup

---
 nixos-configuration/steveej-laptop/system.nix | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/nixos-configuration/steveej-laptop/system.nix b/nixos-configuration/steveej-laptop/system.nix
index 66caf68..53251ed 100644
--- a/nixos-configuration/steveej-laptop/system.nix
+++ b/nixos-configuration/steveej-laptop/system.nix
@@ -1,7 +1,9 @@
 { config, lib, pkgs, ... }:
 
-{
-  nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
+rec {
+  nix.binaryCachePublicKeys = [
+    "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+  ];
   nix.binaryCaches = [
     "https://cache.nixos.org"
     "https://hydra.nixos.org"
@@ -39,7 +41,22 @@
     enable = true;
     enableAutosuggestions = true;
     enableCompletion = true;
-    syntax-highlighting.enable = true;
+    syntaxHighlighting.enable = true;
+    syntaxHighlighting.patterns = {};
+    ohMyZsh = {
+      enable = true;
+      theme = "tjkirch";
+    };
+    promptInit = ''
+      autoload -U promptinit
+      promptinit
+      ZSH_THEME_GIT_PROMPT_PREFIX='@ '
+      PROMPT='%F{%(!.red.green)}%n%f@%m %(?.%F{green}✓%f.%F{red}✗ ($?%))%f %F{blue}%~%f %F{magenta}$(git_prompt_info)%f
+%_%F{%(!.red.green)}$(prompt_char)%f '
+      RPROMPT=""
+    '';
+    interactiveShellInit = ''
+    '';
   };
 
   programs.bash = {
@@ -79,7 +96,6 @@
 
    # Package configuration
    environment.systemPackages = with pkgs; [
-     xorg.xmodmap
    ];
 
   environment.sessionVariables = {
@@ -113,7 +129,7 @@
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "yes";
 
-  services.teamviewer.enable = true;
+  services.teamviewer.enable = false;
 
   services.printing = {
     enable = true;