From 026bd6d77fd013bc9086afed5111714020bae163 Mon Sep 17 00:00:00 2001
From: xenia <xenia.agda@gmail.com>
Date: Thu, 19 Oct 2023 00:18:10 +0200
Subject: [PATCH] Different username and homeDirectory

---
 flake.nix | 17 +++++++++++++----
 home.nix  |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 971ba56b..5e67f95a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,12 +32,13 @@
       xdg-runtime-dir = "/tmp/xdg-rt";
 
       mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
-      mkHome = {system, pkgs} : import ./home.nix {
+      mkHome = {username, home-dir, system, pkgs} : import ./home.nix {
+        inherit username home-dir pkgs xdg-runtime-dir;
+
         kak-pkg = kak.packages.${system}.kak;
         unispect = unispect.packages.${system}.unispect;
         ansi-utils = ansi-utils.packages.${system};
         unambig-path = unambig-path.packages.${system}.unambig-path;
-        inherit pkgs xdg-runtime-dir;
       };
       mkLaptop = {system, pkgs} : import ./laptop.nix {
         inherit pkgs xdg-runtime-dir;
@@ -51,7 +52,11 @@
         let
           system = "aarch64-darwin";
           pkgs = mkPkgs system;
-          home = mkHome { inherit system pkgs; };
+          home = mkHome {
+            username = "xenia";
+            home-dir = "/Users/xenia";
+            inherit system pkgs;
+          };
           laptop = mkLaptop { inherit system pkgs; };
           mac = mkMac { inherit system pkgs laptop; };
         in home-manager.lib.homeManagerConfiguration {
@@ -68,7 +73,11 @@
         let
           system = "x86_64-linux";
           pkgs = mkPkgs system;
-          home = mkHome { inherit system pkgs; };
+          home = mkHome {
+            username = "coral";
+            home-dir = "/home/coral";
+            inherit system pkgs;
+          };
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
diff --git a/home.nix b/home.nix
index 11c77fc8..c66ec0d6 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }:
+{ pkgs, username, home-dir, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }:
 
 let
   kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; };
@@ -6,8 +6,8 @@ let
   extras = import ./extras.nix pkgs;
 
 in rec {
-  home.username = "xenia";
-  home.homeDirectory = "/Users/xenia";
+  home.username = username;
+  home.homeDirectory = home-dir;
 
   home.stateVersion = "23.05";