From e0adf7ec6aad37eff52ca83f7883a3f613118470 Mon Sep 17 00:00:00 2001
From: Kulvir Singh <kulvirs734@gmail.com>
Date: Tue, 7 Jan 2025 00:01:27 +0530
Subject: [PATCH] hm & lil chores

---
 flake.nix             | 27 ++++++++-------------------
 home-modules/git.nix  |  6 +++---
 hosts/mba/default.nix | 11 ++++++++++-
 overlays/default.nix  |  1 -
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/flake.nix b/flake.nix
index 84da316..8767ea7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,10 +23,10 @@
     username = "lilj";
     email = "kulvir@duck.com";
 
-    system = "aarch64-darwin"; # apple target arch
+    system = "aarch64-darwin"; # apple
+    x86 = "x86_64-linux"
     forAllSystems = nixpkgs.lib.genAttrs [
       "aarch64-darwin"
-      "aarch64-linux"
     ];
     inherit (self) outputs;
   in {
@@ -40,27 +40,16 @@
       specialArgs = {inherit inputs username email outputs system;};
       modules = [
         ./hosts/mba
-
-        home-manager.darwinModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.lilj = import ./hosts/mba/home.nix;
-          home-manager.extraSpecialArgs = {inherit username email outputs;};
-        }
       ];
     };
 
     # darwin-rebuild switch --flake .#vps
-    nixosConfigurations = forAllSystems (system: {
-      "vps" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = {inherit inputs username email outputs system;};
-        modules = [
-          ./hosts/mba
-        ];
-      };
-    });
+    nixosConfigurations."vps" = nixpkgs.lib.nixosSystem {
+      specialArgs = {inherit inputs username email outputs;};
+      modules = [
+        ./hosts/vps
+      ];
+    };
 
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
   };
diff --git a/home-modules/git.nix b/home-modules/git.nix
index 4e0abe5..15cbf0b 100644
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -7,8 +7,8 @@
   programs.git = {
     enable = true;
 
-    userName = "${username}";
-    userEmail = "${email}";
+    userName = "Kulvir Singh";
+    userEmail = "kulvirs734@gmail.com";
 
     aliases = {
       cm = "commit -m";
@@ -22,7 +22,7 @@
 
     # includes = [
     #   {
-    #     path = "~/corpo/.gitconfig";
+    #     path = "./.gitconfig";
     #     condition = "gitdir:~/path/corpo/";
     #   }
     # ];
diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix
index d82ce49..82b274a 100644
--- a/hosts/mba/default.nix
+++ b/hosts/mba/default.nix
@@ -1,5 +1,7 @@
-{outputs, ...}: {
+{inputs, outputs, username, email, ...}: {
   imports = [
+    inputs.home-manager.darwinModules.home-manager
+
     ./configuration.nix
     ./mac-apps.nix
     ./nix.nix
@@ -13,4 +15,11 @@
       # outputs.overlays.nur
     ];
   };
+
+  home-manager = {
+    backupFileExtension = "hnm";
+    useUserPackages = true;
+    extraSpecialArgs = {inherit username email outputs;};
+    users.${username} = import ./home.nix;
+  };
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index 6717c24..d6fe8f2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -5,7 +5,6 @@
     # ghostty = inputs.ghostty.packages.aarch64-darwin.default;
 
     discord = prev.discord.override {
-      withOpenASAR = true;
       withVencord = true;
     };
   };