kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

style: alejandra, deadnix, statix

Browse source
This commit is contained in:
Kat Inskip 2024-08-03 16:10:47 -07:00
parent 2e7ee0e4ca
commit 17c69c99de
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
78 changed files with 1051 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/system/deploy.nix
View file

@ -27,7 +27,7 @@ in {
autoRollback = mkOptionDefault true;
magicRollback = mkOptionDefault true;
fastConnection = mkOptionDefault false;
hostname = mkOptionDefault "${name}.inskip.me";
hostname = mkOptionDefault "${name}.tail0b3cc1.ts.net";
profiles.system = {
user = "root";
path = inputs.deploy-rs.lib.${config.system}.activate.nixos inputs.self.nixosConfigurations.${name};

64
modules/system/host.nix
View file

@ -79,18 +79,18 @@ in {
}
.${string.toLower config.type};
modules = mkMerge [
(mkIf (config.folder != "linux") [
# per-OS modules
tree.modules.${config.folder}
# per-OS user definition
tree.home.user.${config.folder}
])
(mkIf (config.folder != "linux" && config.folder != "home") [
# per-OS configuration
tree.${config.folder}.common
# true base module
tree.common
])
(mkIf (config.folder != "linux") [
# per-OS modules
tree.modules.${config.folder}
# per-OS user definition
tree.home.user.${config.folder}
])
(mkIf (config.folder != "linux" && config.folder != "home") [
# per-OS configuration
tree.${config.folder}.common
# true base module
tree.common
])
];
builder =
{
@ -107,23 +107,29 @@ in {
}
// args);
in
args: let
nixos = sys args;
in
nixos.extendModules {
modules =
nixos.config.scalpels
++ [
inputs.scalpel.nixosModules.scalpel
];
specialArgs = {prev = nixos;};
};
args: let
nixos = sys args;
in
nixos.extendModules {
modules =
nixos.config.scalpels
++ [
inputs.scalpel.nixosModules.scalpel
];
specialArgs = {prev = nixos;};
};
home = args: let
renamedArgs = set.rename "specialArgs" "extraSpecialArgs" args;
renamedArgsWithPkgs = renamedArgs // { inherit lib; pkgs = pkgs.${args.system}; };
attrsToRemove = [ "configuration" "username" "homeDirectory" "stateVersion" "extraModules" "system" ];
safeArgs = removeAttrs renamedArgsWithPkgs attrsToRemove;
in inputs.home-manager.lib.homeManagerConfiguration safeArgs;
renamedArgs = set.rename "specialArgs" "extraSpecialArgs" args;
renamedArgsWithPkgs =
renamedArgs
// {
inherit lib;
pkgs = pkgs.${args.system};
};
attrsToRemove = ["configuration" "username" "homeDirectory" "stateVersion" "extraModules" "system"];
safeArgs = removeAttrs renamedArgsWithPkgs attrsToRemove;
in
inputs.home-manager.lib.homeManagerConfiguration safeArgs;
darwin = inputs.darwin.lib.darwinSystem;
macos = inputs.darwin.lib.darwinSystem;
}
@ -145,4 +151,4 @@ in {
system = config;
};
};
}
}