mirror of
https://github.com/genebean/dots.git
synced 2026-03-27 01:17:42 -04:00
Restructure Darwin configuration
So far, this is just based on mightymac. The other devices will be updated soon.
This commit is contained in:
parent
ce3a1b5e20
commit
f95cc09e13
45 changed files with 14 additions and 18 deletions
|
|
@ -46,7 +46,7 @@ creation_rules:
|
|||
key_groups:
|
||||
- age:
|
||||
- *user_mini_watcher
|
||||
- path_regex: modules/system/common/secrets.yaml$
|
||||
- path_regex: modules/hosts/common/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *system_hetznix01
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
mkDarwinHost = import ./mkDarwinHost.nix { inherit inputs; };
|
||||
mkNixosHost = import ./mkNixosHost.nix { inherit inputs; };
|
||||
in {
|
||||
inherit (mkDarwinHost)
|
||||
mkDarwinHost
|
||||
;
|
||||
inherit (mkNixosHost)
|
||||
mkNixosHost
|
||||
;
|
||||
inherit (mkDarwinHost) mkDarwinHost;
|
||||
inherit (mkNixosHost) mkNixosHost;
|
||||
}
|
||||
|
|
@ -26,12 +26,12 @@
|
|||
useUserPackages = true;
|
||||
users.${username}.imports = [
|
||||
inputs.sops-nix.homeManagerModule # user-level secrets management
|
||||
../modules/home-manager/hosts/${hostname}/${username}.nix
|
||||
../modules/hosts/darwin/${hostname}/${username}.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
../modules/system/common/all-darwin.nix # system-wide stuff
|
||||
../modules/hosts/darwin # system-wide stuff
|
||||
../modules/hosts/darwin/${hostname} # host specific stuff
|
||||
] ++ additionalModules; # end modules
|
||||
}; # end darwinSystem
|
||||
|
|
|
|||
|
|
@ -335,14 +335,14 @@ in {
|
|||
|
||||
home.file = {
|
||||
".config/nvim/lua/config" = {
|
||||
source = ../files/nvim/lua/config;
|
||||
source = ./files/nvim/lua/config;
|
||||
recursive = true;
|
||||
};
|
||||
".config/nvim/lua/plugins" = {
|
||||
source = ../files/nvim/lua/plugins;
|
||||
source = ./files/nvim/lua/plugins;
|
||||
recursive = true;
|
||||
};
|
||||
".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
|
||||
".config/powershell/Microsoft.VSCode_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
|
||||
".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
|
||||
".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{ username, ... }: {
|
||||
home.stateVersion = "23.11";
|
||||
imports = [
|
||||
../../common/all-cli.nix
|
||||
../home.nix
|
||||
../../common
|
||||
../../common/all-gui.nix
|
||||
../../common/all-darwin.nix
|
||||
];
|
||||
|
||||
programs = {
|
||||
Loading…
Add table
Add a link
Reference in a new issue