A bunch of new structure changes.

This commit is contained in:
Annika Merris 2024-05-17 07:48:51 -04:00
parent 1f29ea79b4
commit 634a129840
3 changed files with 102 additions and 55 deletions

View file

@ -4,59 +4,55 @@
inputs = {
# nixpkgs.url = "github:auxolotl/nixpkgs/nixos-unstable";
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
};
sops-nix = {
url = "github:Mic92/sops-nix";
};
catppuccin-vsc = {
url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
};
catppuccin-vsc = {
url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
};
solaar = {
url = "github:Svenum/Solaar-Flake/latest";
inputs.nixpkgs.follows = "nixpkgs";
};
solaar = {
url = "github:Svenum/Solaar-Flake/latest";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, lix-module, solaar, ... }@inputs:
let
system = "x86_64";
in {
nixosConfigurations = {
default = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/default/configuration.nix
inputs.home-manager.nixosModules.default
inputs.sops-nix.nixosModules.sops
lix-module.nixosModules.default
];
};
kim = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/kim/configuration.nix
inputs.home-manager.nixosModules.default
inputs.sops-nix.nixosModules.sops
lix-module.nixosModules.default
solaar.nixosModules.default
];
let
system = "x86_64";
globals = rec {
user = "annika";
fullName = "Annika Merris";
gitName = fullName;
gitEmail = "me@annikamerris.com";
nixfilesRepo = "ssh://git@forgejo.local.merr.is:2222/annika/nixos2.git";
};
in
{
nixosConfigurations = {
kim = import ./hosts/kim {
inherit inputs globals overlays;
};
};
homeConfigurations = {
kim = nixosConfigurations.kim.config.home-manager.users.${globals.user}.home;
};
};
};
}