hm & lil chores

This commit is contained in:
Kulvir Singh
2025-01-07 00:01:27 +05:30
parent c5cb34ac1c
commit e0adf7ec6a
4 changed files with 21 additions and 24 deletions

View File

@@ -23,10 +23,10 @@
username = "lilj"; username = "lilj";
email = "kulvir@duck.com"; email = "kulvir@duck.com";
system = "aarch64-darwin"; # apple target arch system = "aarch64-darwin"; # apple
x86 = "x86_64-linux"
forAllSystems = nixpkgs.lib.genAttrs [ forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-darwin" "aarch64-darwin"
"aarch64-linux"
]; ];
inherit (self) outputs; inherit (self) outputs;
in { in {
@@ -40,27 +40,16 @@
specialArgs = {inherit inputs username email outputs system;}; specialArgs = {inherit inputs username email outputs system;};
modules = [ modules = [
./hosts/mba ./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 # darwin-rebuild switch --flake .#vps
nixosConfigurations = forAllSystems (system: { nixosConfigurations."vps" = nixpkgs.lib.nixosSystem {
"vps" = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs username email outputs;};
inherit system; modules = [
specialArgs = {inherit inputs username email outputs system;}; ./hosts/vps
modules = [ ];
./hosts/mba };
];
};
});
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
}; };

View File

@@ -7,8 +7,8 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "${username}"; userName = "Kulvir Singh";
userEmail = "${email}"; userEmail = "kulvirs734@gmail.com";
aliases = { aliases = {
cm = "commit -m"; cm = "commit -m";
@@ -22,7 +22,7 @@
# includes = [ # includes = [
# { # {
# path = "~/corpo/.gitconfig"; # path = "./.gitconfig";
# condition = "gitdir:~/path/corpo/"; # condition = "gitdir:~/path/corpo/";
# } # }
# ]; # ];

View File

@@ -1,5 +1,7 @@
{outputs, ...}: { {inputs, outputs, username, email, ...}: {
imports = [ imports = [
inputs.home-manager.darwinModules.home-manager
./configuration.nix ./configuration.nix
./mac-apps.nix ./mac-apps.nix
./nix.nix ./nix.nix
@@ -13,4 +15,11 @@
# outputs.overlays.nur # outputs.overlays.nur
]; ];
}; };
home-manager = {
backupFileExtension = "hnm";
useUserPackages = true;
extraSpecialArgs = {inherit username email outputs;};
users.${username} = import ./home.nix;
};
} }

View File

@@ -5,7 +5,6 @@
# ghostty = inputs.ghostty.packages.aarch64-darwin.default; # ghostty = inputs.ghostty.packages.aarch64-darwin.default;
discord = prev.discord.override { discord = prev.discord.override {
withOpenASAR = true;
withVencord = true; withVencord = true;
}; };
}; };