This commit is contained in:
parent
cedc64ab9b
commit
e3bc048e42
2 changed files with 13 additions and 32 deletions
25
flake.nix
25
flake.nix
|
|
@ -1,4 +1,3 @@
|
||||||
# flake.nix — place this in the root of your nixos-config repo
|
|
||||||
{
|
{
|
||||||
description = "FredOS NixOS configuration";
|
description = "FredOS NixOS configuration";
|
||||||
|
|
||||||
|
|
@ -7,11 +6,11 @@
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs"; # shares your nixpkgs, no double download
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
omnisearch = {
|
omnisearch = {
|
||||||
url = "git+https://git.bwaaa.monster/omnisearch/omnisearch";
|
url = "git+https://git.bwaaa.monster/omnisearch";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -20,32 +19,28 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-flatpak = {
|
nix-flatpak.url = "github:gmodena/nix-flatpak";
|
||||||
url = "github:gmodena/nix-flatpak";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, omnisearch, zen-browser, nix-flatpak, ... } @ inputs:
|
outputs = { self, nixpkgs, home-manager, omnisearch, zen-browser, nix-flatpak, ... } @ inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
# Helper so each host doesn't have to repeat the boilerplate
|
|
||||||
mkHost = hostname: nixpkgs.lib.nixosSystem {
|
mkHost = hostname: nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs; }; # makes 'inputs' available in all your .nix files
|
specialArgs = { inherit inputs; };
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/${hostname}.nix # your existing per-host file
|
./hosts/${hostname}.nix
|
||||||
./common.nix # your existing shared config
|
./common.nix
|
||||||
home-manager.nixosModules.homeManager
|
home-manager.nixosModules.homeManager
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak
|
||||||
|
omnisearch.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
FredOS-Gaming = mkHost "FredOS-Gaming";
|
FredOS-Gaming = mkHost "FredOS-Gaming";
|
||||||
FredOS-Mediaserver = mkHost "FredOS-Mediaserver";
|
FredOS-Mediaserver = mkHost "FredOS-Mediaserver";
|
||||||
FredOS-Macbook = mkHost "FredOS-Macbook";
|
FredOS-Macbook = mkHost "FredOS-Macbook";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -1,19 +1,5 @@
|
||||||
|
#omnisearch.nix
|
||||||
|
{ ... }:
|
||||||
{
|
{
|
||||||
inputs = {
|
services.omnisearch.enable = true;
|
||||||
omnisearch = {
|
|
||||||
url = "git+https://git.bwaaa.monster/omnisearch";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, omnisearch, ... }: {
|
|
||||||
nixosConfigurations.mySystem = nixpkgs.lib.nixosSystem {
|
|
||||||
modules = [
|
|
||||||
omnisearch.nixosModules.default
|
|
||||||
{
|
|
||||||
services.omnisearch.enable = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue