whovian/nixos_config
1
0
Fork 0
Code Issues Pull requests Activity

Swap lix input to actually be a flake, and make external_lix package.

Browse source 
Plus adds other inputs that are being used anyway, so they're not needlessly replicated.
This commit is contained in:
Whovian NTSN 2024-08-18 21:37:47 -04:00
parent 6eafc5dfc8
commit d76fd19332
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
flake.nix
View file

@ -10,6 +10,7 @@
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL/main"; url = "github:nix-community/NixOS-WSL/main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
@ -56,7 +57,8 @@
git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG} git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash} git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
*/ */
flake = false; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
}; };
lix-module = { lix-module = {
@ -88,13 +90,18 @@
url = "github:nix-systems/default"; url = "github:nix-systems/default";
}; };
# Ditto to github:edolstra/flake-compat
flake-compat = {
url = "github:edolstra/flake-compat";
};
}; # inputs }; # inputs
outputs = { outputs = {
# Needed # Needed
self, nixpkgs, nixos-wsl, self, nixpkgs, nixos-wsl,
# Lix # Lix
lix-module, lix, lix-module,
# Added by me # Added by me
agenix, home-manager, nix-index-database, xil, aaru, ... }: agenix, home-manager, nix-index-database, xil, aaru, ... }:
let let
@ -288,7 +295,7 @@
]; ];
}; };
my_nixos_vm = nixpkgs.lib.nixosSystem { /* my_nixos_vm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./system/my_nixos_vm/configuration.nix ./system/my_nixos_vm/configuration.nix
@ -350,9 +357,9 @@
} }
]; ];
}; };
*/
/* /* nixps = nixpkgs.lib.nixosSystem {
nixps = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./system/xps/configuration.nix ./system/xps/configuration.nix
@ -390,7 +397,7 @@
} }
]; ];
}; };
*/ */
}; };
packages.x86_64-linux = { packages.x86_64-linux = {
@ -405,17 +412,15 @@
# rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; }; # rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; };
# rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; }; # rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; };
# rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; }; # rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; };
new_rclone = pkgs.rclone.overrideAttrs ( new_rclone = pkgs.rclone.overrideAttrs ( oldAttrs: {
oldAttrs: {
patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ]; patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];
} } );
); new_nix-init = pkgs.nix-init.overrideAttrs (oldAttrs: {
new_nix-init = pkgs.nix-init.overrideAttrs (oldAttrs: rec { patches = [ ./home/packages/nix-init/default_to_package.diff ];
patches = [ ./home/packages/nix-init/default_to_package.diff ]; } );
}
);
build_isoimage-pc = self.nixosConfigurations.isoimage-pc.config.system.build.isoImage; build_isoimage-pc = self.nixosConfigurations.isoimage-pc.config.system.build.isoImage;
external_lix = lix.packages.x86_64-linux.nix;
external_xil = xil.packages.x86_64-linux.xil; external_xil = xil.packages.x86_64-linux.xil;
external_aaru = aaru.packages.x86_64-linux.git; external_aaru = aaru.packages.x86_64-linux.git;
}; };