rename disko input to diskoConfig for clarity

This commit is contained in:
2024-10-10 14:40:41 -05:00
parent f11a6ab86e
commit bf08d28785
7 changed files with 379 additions and 214 deletions

569
flake.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,7 @@
nathan.url = "./home";
system.url = "./system";
system.inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
system.inputs.diskoConfig.inputs.nixpkgs.follows = "nixpkgs";
};
@@ -41,8 +41,8 @@
};
modules = [
inputs.system.nixosModule
inputs.home-manager.nixosModules.home-manager
core_inputs.system.nixosModule
core_inputs.home-manager.nixosModules.home-manager
({ lib, ... }: {
sysconfig.${host}.enable = true;
@@ -82,14 +82,14 @@
packages.${iso_system}.default = nixosConfigurations.iso.config.system.build.isoImage;
homeConfigurations."nathan" = inputs.home-manager.lib.homeManagerConfiguration {
homeConfigurations."nathan" = core_inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = { inherit core_inputs; };
modules = [ inputs.nathan.homeManagerModule ];
modules = [ core_inputs.nathan.homeManagerModule ];
};
};

View File

@@ -41,6 +41,8 @@
iconTheme.name = "Tokyonight-Dark";
};
externalPackages.enable = true;
services.mpris-proxy.enable = true;
programs.ssh.enable = true;

View File

@@ -34,7 +34,7 @@
};
hmModule = import ./. { inherit self; };
hmModule = { config, lib, pkgs, ... }: import ./. { inherit config lib pkgs self; };
};
}

View File

@@ -20,7 +20,7 @@
in {
hmModule = import ./. { inherit pkgs-us self; };
hmModule = { pkgs, ... }: import ./. { inherit pkgs pkgs-us self; };
};
}

View File

@@ -7,7 +7,7 @@
disko.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { ... }@inputs: {
outputs = { self, ... }@inputs: {
module = { config, lib, pkgs, devices, ... }: {
imports = [

View File

@@ -11,7 +11,7 @@
prgms.url = "./programs";
disko.url = "./disko";
diskoConfig.url = "./disko";
impermanence.url = "./impermanence";
@@ -22,7 +22,7 @@
nixosModule = { config, lib, pkgs, core_inputs, ... }: {
imports = [
./configuration/configuration.nix
inputs.disko.module
inputs.diskoConfig.module
inputs.impermanence.module
inputs.sddm.module
inputs.srvcs.module