From 22950ff17da1d197f55f1e73783da9077c2e3cdb Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 1 Nov 2021 12:16:34 -0600
Subject: extract programs.{ssh,emacs}

---
 profiles/darwin.nix   | 28 ++++++++++++++--------------
 profiles/groq.nix     |  4 +++-
 profiles/laptop.nix   |  2 ++
 profiles/workshop.nix |  2 ++
 4 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'profiles')

diff --git a/profiles/darwin.nix b/profiles/darwin.nix
index c221e9e..9640d22 100644
--- a/profiles/darwin.nix
+++ b/profiles/darwin.nix
@@ -2,29 +2,29 @@
 
 let
   homedir = builtins.getEnv "HOME";
-  haskellOverlay = self: super: {
-    haskellPackages = super.haskellPackages.override (old: {
-      overrides = self: super: {
-        hledger = self.callPackage ./pkgs/hledger-1.19.1.nix {};
-        hledger-lib = self.callPackage ./pkgs/hledger-lib-1.19.1.nix {};
-      };
-    });
-  };
+  #haskellOverlay = self: super: {
+  #  haskellPackages = super.haskellPackages.override (old: {
+  #    overrides = self: super: {
+  #      hledger = self.callPackage ./pkgs/hledger-1.19.1.nix {};
+  #      hledger-lib = self.callPackage ./pkgs/hledger-lib-1.19.1.nix {};
+  #    };
+  #  });
+  #};
 in
 {
   nixpkgs.overlays = [
-    haskellOverlay
+    #haskellOverlay
   ];
 
   imports = [
-    ./lib/common.nix
-    ./lib/email.nix
+    ../lib/common.nix
+    #../lib/email.nix
+    ../lib/ssh.nix
   ];
   home = {
-    sessionVariables.PATH = "/usr/local/opt/mysql@5.7/bin:${homedir}/bin:${homedir}/.cabal/bin:${homedir}/.local/bin:$PATH";
     packages = with pkgs; [
-      muchsync
-      (haskellPackages.ghcWithPackages (ps: with ps; [hledger]))
+      #muchsync
+      #(haskellPackages.ghcWithPackages (ps: with ps; [hledger]))
       coreutils
     ];
   };
diff --git a/profiles/groq.nix b/profiles/groq.nix
index d1214b3..dc7df02 100644
--- a/profiles/groq.nix
+++ b/profiles/groq.nix
@@ -5,7 +5,9 @@ let
 in
 {
   imports = [
-    ./common.nix
+    ../lib/common.nix
+    ../lib/packages.nix
+    ../lib/ssh.nix
   ];
 
   accounts = {
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index e8bdbba..6104901 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -4,6 +4,8 @@
 {
   imports = [
     ../lib/linux.nix
+    ../lib/ssh.nix
+    ../lib/packages.nix
   ];
   home = {
     packages = [
diff --git a/profiles/workshop.nix b/profiles/workshop.nix
index 0691b61..25d2d9f 100644
--- a/profiles/workshop.nix
+++ b/profiles/workshop.nix
@@ -4,6 +4,8 @@
 {
   imports = [
     ../lib/linux.nix
+    ../lib/ssh.nix
+    ../lib/packages.nix
   ];
   home = {
     sessionVariables = {
-- 
cgit v1.2.3