From c37252222847ee23e525e7a7e15d8955d98bb7e6 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel.flanagan@divvypay.com>
Date: Thu, 14 Sep 2023 10:16:52 -0500
Subject: [PATCH] More fixes for work

---
 home.nix                      | 13 ++++---------
 home/{daniel.nix => user.nix} | 11 ++++++++++-
 home/work.nix                 |  6 ++++++
 3 files changed, 20 insertions(+), 10 deletions(-)
 rename home/{daniel.nix => user.nix} (98%)
 create mode 100644 home/work.nix

diff --git a/home.nix b/home.nix
index 1d8e779..c2027bb 100644
--- a/home.nix
+++ b/home.nix
@@ -7,11 +7,8 @@ inputs:
   in inputs.home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
     modules = [
-      (import
-        ./home/daniel.nix
-        ./home/linux.nix
-
-        pkgs)
+      (import ./home/user.nix pkgs)
+      (import ./home/linux.nix pkgs)
     ];
   };
 
@@ -21,10 +18,8 @@ inputs:
   in inputs.home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
     modules = [
-      (import
-        ./home/daniel.nix
-
-        pkgs)
+      (import ./home/user.nix pkgs)
+      (import ./home/work.nix pkgs)
     ];
   };
 }
diff --git a/home/daniel.nix b/home/user.nix
similarity index 98%
rename from home/daniel.nix
rename to home/user.nix
index 8dfeb9e..d74f921 100644
--- a/home/daniel.nix
+++ b/home/user.nix
@@ -6,7 +6,7 @@
   #   };
   # };
 
-  home.username = "daniel";
+  home.username = lib.mkDefault "daniel";
   home.homeDirectory = lib.mkDefault "/home/daniel/.home";
   home.stateVersion = "23.05";
 
@@ -15,6 +15,15 @@
     # I use this for managing the following programs' versions instead of nix:
     # kubectl, aws
 
+    # text editor
+    pkgs.helix
+
+    # I need gawk for my fish prompt
+    pkgs.gawk
+
+    pkgs.nil
+    pkgs.nixpkgs-fmt
+
     # TODO: os-specific scripts? macOS versus Linux (arch or nixos? do I need to distinguish at that point?)
     (pkgs.buildEnv { name = "my-scripts"; paths = [ ../scripts ]; })
   ];
diff --git a/home/work.nix b/home/work.nix
new file mode 100644
index 0000000..c41f5c9
--- /dev/null
+++ b/home/work.nix
@@ -0,0 +1,6 @@
+{ lib, ... }: let 
+  username = "daniel.flanagan@divvypay.com";
+in {
+  home.username = username;
+  home.homeDirectory = "/Users/${username}";
+}