Merge remote-tracking branch 'origin/staging/jeschli'

4 files changed, 32 insertions, 50 deletions

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 5a6ad7652..e200cbcd4 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -25,21 +25,11 @@
     preLVM = true;
     allowDiscards = true;
   } ];
-#  networking.hostName = "brauerei";
-  # Define your hostname.
-#  networking.wireless.enable = true;
   networking.networkmanager.enable = true;
-  # Enables wireless support via wpa_supplicant.
-  # Select internationalisation properties.
-  # i18n = {
-  #   consoleFont = "Lat2-Terminus16";
-  #   consoleKeyMap = "us";
-  #   defaultLocale = "en_US.UTF-8";
-  # };
-  # Set your time zone.  #
   time.timeZone = "Europe/Amsterdam";
+
   nixpkgs.config.allowUnfree = true;
-  # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget
+
   environment.shellAliases = {
     n = "nix-shell";
     stocki = pkgs.writeDash "deploy" ''
@@ -47,6 +37,7 @@
       exec nix-shell -I stockholm="$PWD" --run 'deploy  --system="brauerei"'
     '';
   };
+
   environment.systemPackages = with pkgs; [
   # system helper
     ag
@@ -103,6 +94,7 @@
     zathura
   # xorg
     xorg.xbacklight
+    taskwarrior
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -126,7 +118,7 @@
     display = 11;
     tty = 11;
 
-    dpi = 96;
+    dpi = 144;
 
 #    videoDrivers = [ "nvidia" ];
     synaptics = {
@@ -138,7 +130,7 @@
 
   users.extraUsers.jeschli = { # TODO: define as krebs.users
     isNormalUser = true;
-    extraGroups = ["docker" "vboxusers"];
+    extraGroups = ["docker" "vboxusers" "audio"];
     uid = 1000;
   };
   users.extraUsers.jamie = {
diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix
index 75fdb89fd..2cb3e6661 100644
--- a/jeschli/1systems/brauerei/hardware-configuration.nix
+++ b/jeschli/1systems/brauerei/hardware-configuration.nix
@@ -29,5 +29,6 @@
 
   swapDevices = [ ];
 
+  hardware.pulseaudio.enable = true;
   nix.maxJobs = lib.mkDefault 4;
 }
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 2089d4254..3bd2dbfc4 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -57,6 +57,7 @@ let
     (global-set-key "\C-x\ \C-r" 'recentf-open-files)
   '';
   dotEmacs = pkgs.writeText "dot-emacs" ''
+    ${evilMode}
     ${packageRepos}
     ${orgMode}
     ${recentFiles}
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 5ae24b40b..6311e88ab 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -8,6 +8,21 @@
 
 with import <stockholm/lib>;
 let
+  defaultBool = o: mkOption {
+          type = types.bool;
+          default = option;
+  };
+
+  defaultUint = o: mkOption {
+          type = types.uint;
+          default = o;
+  };
+
+  defaultAbsolutpath = o: mkOption {
+          type = types.absolute-pathname;
+          default = o;
+  };
+
   cfg = config.krebs.git;
 
   out = {
@@ -121,42 +136,15 @@ let
     cgit-settings = types.submodule {
       # A setting's value of `null` means cgit's default should be used.
       options = {
-        cache-root = mkOption {
-          type = types.absolute-pathname;
-          default = "/tmp/cgit";
-        };
-        cache-size = mkOption {
-          type = types.uint;
-          default = 1000;
-        };
-        css = mkOption {
-          type = types.absolute-pathname;
-          default = "/static/cgit.css";
-        };
-        enable-commit-graph = mkOption {
-          type = types.bool;
-          default = true;
-        };
-        enable-index-links = mkOption {
-          type = types.bool;
-          default = true;
-        };
-        enable-index-owner = mkOption {
-          type = types.bool;
-          default = false;
-        };
-        enable-log-filecount = mkOption {
-          type = types.bool;
-          default = true;
-        };
-        enable-log-linecount = mkOption {
-          type = types.bool;
-          default = true;
-        };
-        enable-remote-branches = mkOption {
-          type = types.bool;
-          default = true;
-        };
+        cache-root = defaultAbsolutpath("/tmp/cgit");
+        cache-size = defaultUint(1000);
+        css = defaultAbsolutpath("/static/cgit.css");
+        enable-commit-graph = defaultBool(true);
+        enable-index-links = defaultBool(true);
+        enable-index-owner = defaultBool(false);
+        enable-log-filecount = defaultBool(true);
+        enable-log-linecount = defaultBool(true);
+        enable-remote-branches = defaultBool(true);
         logo = mkOption {
           type = types.absolute-pathname;
           default = "/static/cgit.png";