Merge branch 'rewrite' into main-merge

This commit is contained in:
Christoph Hollizeck 2025-10-28 10:12:10 +01:00
commit d37342150e
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
143 changed files with 3513 additions and 6761 deletions

123
flake.nix
View file

@ -1,17 +1,28 @@
{
description = "NixOs Config";
description = "All encompassing flake";
nixConfig = {
allow-import-from-derivation = true;
};
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default-linux";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
flake-parts.url = "github:hercules-ci/flake-parts";
import-tree.url = "github:vic/import-tree";
treefmt-nix.url = "github:numtide/treefmt-nix";
catppuccin.url = "github:catppuccin/nix";
sops-nix.url = "github:Mic92/sops-nix";
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/e880129391be2f558d6c205cfd931be338b3b707";
nixpkgs-tuya-vacuum.url = "github:Daholli/nixpkgs/84b34e39e7a0879367189f34401191f6a0364bcf";
home-manager = {
url = "github:nix-community/home-manager/master";
# url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -70,13 +81,6 @@
};
};
###
# Snowfall dependencies
snowfall-lib = {
url = "github:snowfallorg/lib";
inputs.nixpkgs.follows = "nixpkgs";
};
helix = {
url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs";
@ -88,30 +92,17 @@
flake = false;
};
sops-nix.url = "github:Mic92/sops-nix";
## temporary
zen-browser.url = "github:0xc000022070/zen-browser-flake";
raspberry-pi-nix = {
url = "github:JamieMagee/raspberry-pi-nix/25118248489e047a7da43a21409b457aa2af315e";
inputs.nixpkgs.follows = "nixpkgs";
};
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
catppuccin.url = "github:catppuccin/nix";
###############
# homeassitant
tuya-vaccum-maps = {
url = "github:jaidenlabelle/tuya-vacuum-maps";
flake = false;
};
################
## inputs for dev shells
#
git-hooks = {
url = "github:cachix/git-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
devenv = {
url = "github:cachix/devenv";
# inputs.nixpkgs.follows = "nixpkgs";
@ -135,78 +126,4 @@
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
inputs:
let
lib = inputs.snowfall-lib.mkLib {
inherit inputs;
src = ./.;
snowfall = {
meta = {
name = "wyrdgard";
title = "Wyrdgard";
};
namespace = "wyrdgard";
};
};
in
lib.mkFlake {
channels-config = {
allowUnfree = true;
};
outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
overlays = with inputs; [
devenv.overlays.default
niri-flake.overlays.niri
];
homes.modules = with inputs; [
sops-nix.homeManagerModules.sops
catppuccin.homeModules.catppuccin
];
systems.modules.nixos = with inputs; [
home-manager.nixosModules.home-manager
nix-ld.nixosModules.nix-ld
sops-nix.nixosModules.sops
catppuccin.nixosModules.catppuccin
];
systems.hosts.yggdrasil.modules = with inputs; [
niri-flake.nixosModules.niri
];
homes.hosts.yggdrasil.modules = with inputs; [
niri-flake.homeModules.niri
];
systems.hosts.nixberry.modules = with inputs; [
raspberry-pi-nix.nixosModules.raspberry-pi
raspberry-pi-nix.nixosModules.sd-image
];
systems.hosts.loptland.modules = with inputs; [
simple-nixos-mailserver.nixosModules.default
];
systems.hosts.wsl.modules = with inputs; [ nixos-wsl.nixosModules.default ];
}
// rec {
self = inputs.self;
hydraJobs = {
# hosts = lib.mapAttrs (_: cfg: cfg.config.system.build.toplevel) (
# lib.filterAttrs (name: cfg: name != "nixberry") self.outputs.nixosConfigurations
# );
hosts = lib.mapAttrs (_: cfg: cfg.config.system.build.toplevel) self.outputs.nixosConfigurations;
packages = self.packages;
shells = lib.filterAttrs (name: shell: name == "x86_64-linux") self.devShells;
};
};
}