From 5b77bbbe1167dd1c09ad6b5e0a8f3218f303b262 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 9 Jun 2015 17:40:19 +0200
Subject: [PATCH 1/2] Make i3 compile.

---
 common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.nix b/common.nix
index b267f85..591c8e5 100644
--- a/common.nix
+++ b/common.nix
@@ -49,7 +49,7 @@
     gnupg
     pass xclip pwgen
     gcc
-    # remmina
+    remmina
     silver-searcher
     tree
     python
@@ -91,6 +91,7 @@
     # libreoffice = pkgs.libreoffice.override { jdk = pkgs.jdk; };  # reuse package cache
     jre = pkgs.openjdk8;
     jdk = pkgs.openjdk8;
+    i3 = pkgs.stdenv.lib.overrideDerivation pkgs.i3 (oldAttrs: { doCheck = false; });
   };
 
   environment.variables.EDITOR = "${pkgs.vim}/bin/vim";

From 239a49b17ece8b3a5a65d0a7135190e497cbfdbe Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 9 Jun 2015 17:40:27 +0200
Subject: [PATCH 2/2] archachatina: add beets

---
 archachatina.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/archachatina.nix b/archachatina.nix
index 8629b42..9106111 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -12,4 +12,10 @@
   networking.hostName = "archachatina"; # Define your hostname.
   networking.hostId = "cc7ea3ba";
 
+  environment.systemPackages = with pkgs; [
+    beets
+    mediainfo
+    flac
+  ];
+
 }