More fixes for work

home.nix

@@ -7,11 +7,8 @@ inputs:
   in inputs.home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
     modules = [
-      (import
+      (import ./home/user.nix pkgs)
-        ./home/daniel.nix
+      (import ./home/linux.nix pkgs)
-        ./home/linux.nix
-
-        pkgs)
     ];
   };
 
@@ -21,10 +18,8 @@ inputs:
   in inputs.home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
     modules = [
-      (import
+      (import ./home/user.nix pkgs)
-        ./home/daniel.nix
+      (import ./home/work.nix pkgs)
-
-        pkgs)
     ];
   };
 }

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 ]; })
   ];

home/work.nix

@@ -0,0 +1,6 @@
+{ lib, ... }: let 
+  username = "daniel.flanagan@divvypay.com";
+in {
+  home.username = username;
+  home.homeDirectory = "/Users/${username}";
+}