use name from library

7 files changed, 14 insertions, 13 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index e487fae..a427677 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -1,8 +1,9 @@
 {
   config,
   pkgs,
+  lib,
   ...
-}: {
+}: with lib; {
   imports = [ (mkAliasOptionModule [ "ivi" ] [ "users" "users" ivi.username ]) ];
 
   time.timeZone = "Europe/Amsterdam";
diff --git a/profiles/core/git.nix b/profiles/core/git.nix
index 84b165a..31136ee 100644
--- a/profiles/core/git.nix
+++ b/profiles/core/git.nix
@@ -1,9 +1,9 @@
-{config, ...}: {
+{config, lib, ...}: with lib; {
   hm = {
     programs.git = {
       enable = true;
-      userName = "Mike Vink";
-      userEmail = "mike1994vink@gmail.com";
+      userName = ivi.realName;
+      userEmail = ivi.email;
       extraConfig = {
         worktree.guessRemote = true;
         mergetool.fugitive.cmd = "vim -f -c \"Gdiff\" \"$MERGED\"";
diff --git a/profiles/core/hm.nix b/profiles/core/hm.nix
index 5e56fed..2d3d085 100644
--- a/profiles/core/hm.nix
+++ b/profiles/core/hm.nix
@@ -1,7 +1,7 @@
 {inputs, config, lib, ...}: with lib; {
   imports = [
     inputs.home-manager.nixosModules.default
-    (mkAliasOptionModule [ "hm" ] [ "home-manager" "users" "mike" ])
+    (mkAliasOptionModule [ "hm" ] [ "home-manager" "users" ivi.username ])
   ];
 
   system.extraDependencies = collectFlakeInputs inputs.home-manager;
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index fc33dcb..198e5a7 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -49,7 +49,7 @@
       enable = true;
       matchBlocks = {
         "*" = {
-          identityFile = "${config.users.users.mike.home}/.ssh/id_ed25519";
+          identityFile = "${config.ivi.home}/.ssh/id_ed25519";
         };
       };
     };
@@ -60,8 +60,8 @@
     };
 
     home.sessionPath = [
-      "${config.users.users.mike.home}/.krew/bin"
-      "${config.users.users.mike.home}/.cargo/bin"
+      "${config.ivi.home}/.krew/bin"
+      "${config.ivi.home}/.cargo/bin"
       "${pkgs.ncurses}/bin"
     ];
 
@@ -142,9 +142,9 @@
         k             = "kubectl ";
         d             = "docker ";
         ls            = "ls --color=auto";
-        s             = "sudo nixos-rebuild switch --flake ${config.users.users.mike.home}/flake#";
+        s             = "sudo nixos-rebuild switch --flake ${config.ivi.home}/flake#";
         b             = "/run/current-system/bin/switch-to-configuration boot";
-        h             = "home-manager switch --flake ${config.users.users.mike.home}/flake --impure";
+        h             = "home-manager switch --flake ${config.ivi.home}/flake --impure";
         fa            = "azdo-switch-project";
         v             = "nvim";
         V             = "nvim -S .vimsession.vim";
diff --git a/profiles/core/meta.nix b/profiles/core/meta.nix
index 3f1d334..f813b56 100644
--- a/profiles/core/meta.nix
+++ b/profiles/core/meta.nix
@@ -1,6 +1,6 @@
 {inputs,lib,config, ...}: with lib; {
   lib.meta = {
-    configPath = "${config.users.users.mike.home}/flake";
+    configPath = "${config.ivi.home}/flake";
     mkMutableSymlink = path:
       config.hm.lib.file.mkOutOfStoreSymlink
         (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path));
diff --git a/profiles/core/secrets.nix b/profiles/core/secrets.nix
index 15d6ee5..6b52376 100644
--- a/profiles/core/secrets.nix
+++ b/profiles/core/secrets.nix
@@ -1,7 +1,7 @@
 {machine,inputs,config,lib,pkgs,...}: with lib; {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    (mkAliasOptionModule [ "secrets" ] [ "home-manager" "users" "mike" ]) # TODO: get my username(s) from machine config
+    (mkAliasOptionModule [ "secrets" ] [ "home-manager" "users" ivi.username ]) # TODO: get my username(s) from machine config
   ];
   sops = {
     age.sshKeyPaths = [];
diff --git a/profiles/email/mailsync.nix b/profiles/email/mailsync.nix
index 3095194..5e1037a 100644
--- a/profiles/email/mailsync.nix
+++ b/profiles/email/mailsync.nix
@@ -28,7 +28,7 @@
       Service = {
         Type = "oneshot";
         RemainAfterExit = "no";
-        ExecSearchPath = "${config.users.users.mike.home}/.local/bin:${config.hm.home.profileDirectory}/bin:/run/current-system/sw/bin";
+        ExecSearchPath = "${config.ivi.home}/.local/bin:${config.hm.home.profileDirectory}/bin:/run/current-system/sw/bin";
         ExecStart = "mailsync";
       };
     };