From 94b40d62d2124d1f6cecc714c646689bd738bfd7 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@beatdata.it>
Date: Tue, 12 Apr 2022 10:27:57 +0200
Subject: [PATCH] Darwin fixes

---
 flake.lock                     |  2 +-
 flake.nix                      |  6 ++++--
 hosts/mbp/configuration.nix    | 20 ++++++++++++++++++--
 users/andreaciceri/default.nix | 11 ++++++++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index d738da1..a3946d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,7 +18,7 @@
     "darwin": {
       "inputs": {
         "nixpkgs": [
-          "unstable"
+          "stable"
         ]
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 467a856..98ee9a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
       home.inputs.nixpkgs.follows = "unstable";
 
       darwin.url = "github:LnL7/nix-darwin";
-      darwin.inputs.nixpkgs.follows = "unstable";
+      darwin.inputs.nixpkgs.follows = "stable";
 
       deploy.follows = "digga/deploy";
 
@@ -173,7 +173,9 @@
         system = "x86_64-darwin";
         modules = [ home.darwinModules.home-manager ./hosts/mbp ];
         inputs = { inherit darwin; };
-        specialArgs = { inherit emacs-overlay; };
+        specialArgs = {
+          inherit emacs-overlay; unstablePkgsInput = inputs.unstablePkgs;
+        };
       };
     };
 }
diff --git a/hosts/mbp/configuration.nix b/hosts/mbp/configuration.nix
index 3acf2ed..eff978b 100644
--- a/hosts/mbp/configuration.nix
+++ b/hosts/mbp/configuration.nix
@@ -1,4 +1,9 @@
-{ pkgs, home-manager, emacs-overlay, ... }:
+{ pkgs
+, home-manager
+, emacs-overlay
+, unstablePkgsInput
+, ...
+}:
 {
   imports = [
     ../../users/andreaciceri
@@ -15,7 +20,13 @@
   };
 
   nixpkgs = {
-    overlays = [ (import ../../pkgs) emacs-overlay.overlay ];
+    overlays = [
+      (import ../../pkgs {
+        inherit unstablePkgsInput
+          ;
+      })
+      emacs-overlay.overlay
+    ];
     config.allowUnfree = true;
   };
 
@@ -25,5 +36,10 @@
       user = "andreaciceri";
       options = "--delete-older-than 3d";
     };
+    package = pkgs.nixUnstable;
+    extraOptions = ''
+      experimental-features = nix-command
+      experimental-features = flakes
+    '';
   };
 }
diff --git a/users/andreaciceri/default.nix b/users/andreaciceri/default.nix
index 385ed68..f24e8b4 100644
--- a/users/andreaciceri/default.nix
+++ b/users/andreaciceri/default.nix
@@ -13,13 +13,22 @@
       yarn
       pinentry_mac
       openscad
-      nodejs
+      nodejs-14_x
+
+      poetry
+      ipfs
+      ipget
 
       yabai
       skhd
       spacebar
       xquartz
       xterm
+
+      qmk
+
+      youtube-dl
+      ffmpeg
     ];
 
     programs.gpg = {