2 files changed, 10 insertions, 15 deletions
diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index e12558c..d3cb7c0 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -2,24 +2,20 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 let
   hcr = pkgs.callPackage ./scripts/hm-changes-report.nix { inherit config pkgs; };
   scr = pkgs.callPackage ./scripts/system-changes-report.nix { inherit config pkgs; };
-  unstable = import <unstable> { };
 in
 {
   imports = [
     ./zsh.nix
-    <sops-nix/modules/home-manager/sops.nix>
+    inputs.sops-nix.homeManagerModules.sops
   ];
 
-  nixpkgs.config.allowUnfreePredicate =
-    pkg: builtins.elem (lib.getName pkg) [ "aspell-dict-en-science" ];
-
   nix = {
-    package = pkgs.nix;
     settings = {
       extra-experimental-features = [
         "nix-command"
@@ -46,10 +42,7 @@ in
     hcr
     scr
 
-    aspell
-    aspellDicts.en
-    aspellDicts.en-computers
-    aspellDicts.en-science
+    (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
     bandwhich
     bottom
     broot
@@ -381,4 +374,7 @@ in
       ];
     };
   };
+
+  programs.nh.enable = true;
 }
+
diff --git a/nix-conf/home/includes/darwin.nix b/nix-conf/home/includes/darwin.nix
index e58c756..6a15642 100644
--- a/nix-conf/home/includes/darwin.nix
+++ b/nix-conf/home/includes/darwin.nix
@@ -73,7 +73,7 @@ in
     #mpc-cli
     #mpd
     #ncmpcpp
-    nix # on darwin we are not using nixos (duh)
+    nix
     nodejs
     pam-reattach
     pinentry_mac
@@ -90,10 +90,9 @@ in
     wget
   ];
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "emacs-mac-macport-29.1"
-    "emacs-mac-macport-with-packages-29.1"
-  ];
+  home.sessionVariables = {
+    NH_DARWIN_FLAKE = "/etc/nix-darwin";
+  };
 
   nix.settings = {
     sandbox = true;