4 files changed, 25 insertions, 2 deletions
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 6896a66dc..28a03b8ff 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -13,6 +13,7 @@
 with lib;
 let
   mainUser = config.krebs.build.user.name;
+  awesomecfg = pkgs.awesomecfg.full;
 in
 {
   imports = [ ];
@@ -32,6 +33,13 @@ in
     displayManager.auto.user = mainUser;
     desktopManager.xterm.enable = false;
   };
+  nixpkgs.config.packageOverrides = pkgs: rec {
+    awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
+      postInstall = ''
+      cp ${awesomecfg}  $out/etc/xdg/awesome/rc.lua
+      '';
+    });
+  };
 
   i18n.consoleFont = "Lat2-Terminus16";
 
@@ -43,6 +51,7 @@ in
   };
 
   environment.systemPackages = with pkgs;[
+    pavucontrol
     xlockmore
     rxvt_unicode-with-plugins
     firefox
diff --git a/makefu/2configs/base-sources.nix b/makefu/2configs/base-sources.nix
index a2715ba4c..826cd6fef 100644
--- a/makefu/2configs/base-sources.nix
+++ b/makefu/2configs/base-sources.nix
@@ -5,8 +5,9 @@
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
       #url = https://github.com/makefu/nixpkgs;
-      rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+      rev = "dc18f39bfb2f9d1ba62c7e8ad98544bb15cb26b2"; # nixos-15.09
     };
+
     dir.secrets = {
       host = config.krebs.hosts.pornocauster;
       path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index 0ab64773f..793373859 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -43,7 +43,7 @@ let
       };
 
   set-ro-access = with git; repo: user:
-      optional repo.public {
+      singleton {
         inherit user;
         repo = [ repo ];
         perm = fetch;
diff --git a/makefu/2configs/vim.nix b/makefu/2configs/vim.nix
index b71d95148..02a46d22a 100644
--- a/makefu/2configs/vim.nix
+++ b/makefu/2configs/vim.nix
@@ -103,6 +103,19 @@ in {
       endfunction
       call InitBackupDir()
 
+      augroup Binary
+        " edit binaries in xxd-output, xxd is part of vim
+        au!
+        au BufReadPre  *.bin let &bin=1
+        au BufReadPost *.bin if &bin | %!xxd
+        au BufReadPost *.bin set ft=xxd | endif
+        au BufWritePre *.bin if &bin | %!xxd -r
+        au BufWritePre *.bin endif
+        au BufWritePost *.bin if &bin | %!xxd
+        au BufWritePost *.bin set nomod | endif
+      augroup END
+
+
 
     '';