Merge remote-tracking branch 'lass/master'

5 files changed, 50 insertions, 15 deletions

diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index c5f38c1f3..483a4f84b 100644
--- a/nin/1systems/axon/config.nix
+++ b/nin/1systems/axon/config.nix
@@ -11,6 +11,7 @@ with lib;
     <stockholm/nin>
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     #../2configs/copyq.nix
+    <stockholm/nin/2configs/ableton.nix>
     <stockholm/nin/2configs/games.nix>
     <stockholm/nin/2configs/git.nix>
     <stockholm/nin/2configs/retiolum.nix>
@@ -98,6 +99,9 @@ with lib;
     enable = true;
   };
 
+  services.xserver.displayManager.sessionCommands = ''
+    ${pkgs.xorg.xhost}/bin/xhost + local:
+  '';
 
   services.xserver.desktopManager.xfce = let
     xbindConfig = pkgs.writeText "xbindkeysrc" ''
diff --git a/nin/2configs/ableton.nix b/nin/2configs/ableton.nix
new file mode 100644
index 000000000..343a9089d
--- /dev/null
+++ b/nin/2configs/ableton.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }: let
+  mainUser = config.users.extraUsers.nin;
+in {
+  users.users= {
+    ableton = {
+      isNormalUser = true;
+      extraGroups = [
+        "audio"
+        "video"
+      ];
+      packages = [
+        pkgs.wine
+        pkgs.winetricks
+      ];
+    };
+  };
+  security.sudo.extraConfig = ''
+    ${mainUser.name} ALL=(ableton) NOPASSWD: ALL
+  '';
+}
diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix
index 9ebbaabd2..aed4a9f48 100644
--- a/nin/2configs/git.nix
+++ b/nin/2configs/git.nix
@@ -36,17 +36,6 @@ let
   make-public-repo = name: { cgit ? {}, ... }: {
     inherit cgit name;
     public = true;
-    hooks = {
-      post-receive = pkgs.git-hooks.irc-announce {
-        # TODO make nick = config.krebs.build.host.name the default
-        nick = config.krebs.build.host.name;
-        channel = "#xxx";
-        server = "irc.r";
-        verbose = config.krebs.build.host.name == "onondaga";
-        # TODO define branches in some kind of option per repo
-        branches = [ "master" ];
-      };
-    };
   };
 
   make-rules =
diff --git a/nin/2configs/im.nix b/nin/2configs/im.nix
new file mode 100644
index 000000000..b078dbd53
--- /dev/null
+++ b/nin/2configs/im.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+{
+  environment.systemPackages = with pkgs; [
+    (pkgs.writeDashBin "im" ''
+      export PATH=${makeSearchPath "bin" (with pkgs; [
+        tmux
+        gnugrep
+        weechat
+      ])}
+      ssh chat@onondaga
+      if tmux list-sessions -F\#S | grep -q '^im''$'; then
+        exec tmux attach -t im
+      else
+        exec tmux new -s im weechat
+      fi
+    '')
+  ];
+}
diff --git a/nin/source.nix b/nin/source.nix
index ccf5e6acc..9fb2cb390 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -4,6 +4,11 @@ host@{ name, secure ? false }: let
               then "buildbot"
               else "nin";
   _file = <stockholm> + "/nin/1systems/${name}/source.nix";
+  pkgs = import <nixpkgs> {
+    overlays = map import [
+      <stockholm/krebs/5pkgs>
+    ];
+  };
 in
   evalSource (toString _file) {
     nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix";
@@ -12,8 +17,6 @@ in
       nin = "/home/nin/secrets/${name}";
     };
     stockholm.file = toString <stockholm>;
-    nixpkgs.git = {
-      url = https://github.com/nixos/nixpkgs;
-      ref = "afe9649";
-    };
+    stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
+    nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
   }