Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename disko input to diskoConfig for clarity

Browse Source
This commit is contained in:
blacknull
2024-10-10 14:40:41 -05:00
parent f11a6ab86e
commit bf08d28785
7 changed files with 379 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

569
flake.lock generated
View File

File diff suppressed because it is too large Load Diff

12
flake.nix
View File

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

2
home/flake.nix
View File

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

2
home/packages/external/flake.nix vendored
View File

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

2
home/packages/flake.nix
View File

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

2
system/disko/flake.nix
View File

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

4
system/flake.nix
View File

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