From 728022e0d3143bc1c485187b07c933b95323cbeb Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 29 Apr 2016 07:02:24 +0200
Subject: machines/katara: restructure pkgs

---
 machines/profpatsch/katara.nix |  2 +-
 machines/profpatsch/pkgs.nix   | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

(limited to 'machines')

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 231e897b..71dda5f5 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -141,7 +141,7 @@ in {
         hp.cabal2nix          # convert cabal files to nixexprs
         hp.stack              # saviour of all
         git                   # version control system
-        gitAndTools.git-annex # version controlled binary file storage
+        myPkgs.git-annex # version controlled binary file storage
         # mercurial             # the other version control system
         silver-searcher       # file content searcher, > ack > grep
         telnet                # tcp debugging
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index b69bdded..f87ca3e2 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -1,19 +1,32 @@
 { pkgs, lib }:
 
+with pkgs;
 let
 
   addPythonRuntimeDeps = drv: deps: drv.overrideDerivation (old: {
     propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ deps;
   });
 
-in
-with pkgs;
-{
-
-  offlineimap = addPythonRuntimeDeps offlineimap [ pythonPackages.pygpgme ];
-
-  taffybar = taffybar.override {
-    ghcWithPackages = (haskellPackages.override {
+  # containered = name: packages: users: { ... }:
+  #   {
+  #     containers."${name}" = {
+  #       config = {
+  #         environment.systemPackages = packages;
+  #         users.users = users;
+  #         services.sshd.enable = true;
+  #       };
+  #       privateNetwork = true;
+  #       localAddress = "127.0.0.2";
+  #     };
+  #     nixpkgs.config.allowUnfree = true;
+  #   };
+
+  # pkgs
+
+  offlineimap = addPythonRuntimeDeps pkgs.offlineimap [ pkgs.pythonPackages.pygpgme ];
+
+  taffybar = pkgs.taffybar.override {
+    ghcWithPackages = (pkgs.haskellPackages.override {
       overrides = _: super: {
         taffybar = super.taffybar.overrideDerivation (old: {
           name = old.name + "foo";
@@ -27,11 +40,17 @@ with pkgs;
   };
 
   # sent = pkgs:q.sent.override { patches = [ ./sent-bg.patch ]; };
-  inherit sent;
 
   # mpv = pkgs.mpv.override { scripts = [ pkgs.mpvScripts.convert ]; };
-  inherit mpv;
 
   beets = pkgs.beets.override { enableAlternatives = true; };
 
-}
+  git-annex = pkgs.gitAndTools.git-annex.overrideDerivation (old: {
+      buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ];
+      postFixup = ''
+        wrapProgram $out/bin/git-annex --prefix PATH ":" "${pkgs.lsof}/bin";
+      '';
+  });
+
+in
+{ inherit taffybar offlineimap sent mpv beets git-annex; }
-- 
cgit 1.4.1