From 619b19ebc8dfa800407eac4fc1d9183b0c1d5d80 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 27 Jan 2019 00:26:48 +0100
Subject: [PATCH 1/2] nix: migrate more packages into the overlay

---
 .../configuration/graphical-fullblown.nix     |  2 --
 nix/home-manager/profiles/common.nix          | 20 ++++-------------
 nix/home-manager/programs/homeshick.nix       |  3 ++-
 nix/os/profiles/common/pkg.nix                |  8 -------
 nix/overlay.nix                               | 22 ++++++++++++++++---
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index ecd1850..70d9557 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -53,8 +53,6 @@ in {
       ] ++ [
         pkgs.libffi
       ]);
-
-      staruml = callPackage ../../pkgs/staruml.nix { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
     };
   };
 
diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix
index 1f6ffc0..ed3daed 100644
--- a/nix/home-manager/profiles/common.nix
+++ b/nix/home-manager/profiles/common.nix
@@ -7,25 +7,13 @@ in {
   programs.home-manager.enable = true;
   programs.home-manager.path = https://github.com/rycee/home-manager/archive/master.tar.gz;
 
+  nixpkgs.overlays = [
+    (import ../../overlay.nix)
+  ];
+
   nixpkgs.config = {
     allowBroken = true;
     allowUnfree = true;
-
-    # TODO: move this to a pkgs overlay
-    packageOverrides = pkgs: with pkgs; {
-      busyboxStatic =  busybox.override {
-        enableStatic = true;
-        extraConfig = ''
-           CONFIG_STATIC y
-           CONFIG_INSTALL_APPLET_DONT y
-           CONFIG_INSTALL_APPLET_SYMLINKS n
-         '';
-      };
-
-      dropbearStatic = dropbear.override {
-        enableStatic = true;
-      };
-    };
   };
 
   home.keyboard = {
diff --git a/nix/home-manager/programs/homeshick.nix b/nix/home-manager/programs/homeshick.nix
index bb50b31..dc05362 100644
--- a/nix/home-manager/programs/homeshick.nix
+++ b/nix/home-manager/programs/homeshick.nix
@@ -3,7 +3,8 @@
 , ...
 }:
 
-let 
+let
+  # TODO: clean up the impurity in here
 
 in {
   home.sessionVariables = {
diff --git a/nix/os/profiles/common/pkg.nix b/nix/os/profiles/common/pkg.nix
index 9e80867..a4d1d64 100644
--- a/nix/os/profiles/common/pkg.nix
+++ b/nix/os/profiles/common/pkg.nix
@@ -11,14 +11,6 @@
     allowUnfree = true;
 
     packageOverrides = pkgs: with pkgs; {
-      busyboxStatic =  busybox.override {
-        enableStatic = true;
-        extraConfig = ''
-           CONFIG_STATIC y
-           CONFIG_INSTALL_APPLET_DONT y
-           CONFIG_INSTALL_APPLET_SYMLINKS n
-         '';
-      };
     };
   };
 
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 1d13c4f..7f0b3d5 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,5 +1,21 @@
-self: super: {
-  duplicay = super.callPackage ./pkgs/duplicacy {};
-  mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {};
+let
+
+in self: super: {
+
+  duplicacy = super.callPackage ./pkgs/duplicacy {};
   just = super.callPackage ./pkgs/just.nix {};
+  mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {};
+  staruml = super.callPackage ./pkgs/staruml.nix { inherit (super.gnome2) GConf; libgcrypt = super.libgcrypt_1_5; };
+
+  busyboxStatic =  super.busybox.override {
+    enableStatic = true;
+    extraConfig = ''
+       CONFIG_STATIC y
+       CONFIG_INSTALL_APPLET_DONT y
+       CONFIG_INSTALL_APPLET_SYMLINKS n
+     '';
+  };
+  dropbearStatic = super.dropbear.override {
+    enableStatic = true;
+  };
 }

From c9e75445d46f55aef69bf0769ef6ce0e4565c619 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 27 Jan 2019 00:27:32 +0100
Subject: [PATCH 2/2] nix: add podman and enable on all systems

---
 nix/os/profiles/common/pkg.nix | 2 ++
 nix/overlay.nix                | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/nix/os/profiles/common/pkg.nix b/nix/os/profiles/common/pkg.nix
index a4d1d64..720fcd8 100644
--- a/nix/os/profiles/common/pkg.nix
+++ b/nix/os/profiles/common/pkg.nix
@@ -35,5 +35,7 @@
 
     usbutils
     pciutils
+
+    podman
   ];
 }
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 7f0b3d5..0306421 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,6 +1,11 @@
 let
+  nixpkgs-master = import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs-channels/archive/de5fd9e6110489722e8667664dce9fdc17331866.tar.gz";
+    sha256 = "0z1j2pmvn15m2ir2i9l2prr81cq7f1x8xs4cv2s7q4fslz586ghn";
+  }) {};
 
 in self: super: {
+  podman = nixpkgs-master.podman;
 
   duplicacy = super.callPackage ./pkgs/duplicacy {};
   just = super.callPackage ./pkgs/just.nix {};