Skip to content

Commit

Permalink
# This is a combination of 14 commits.
Browse files Browse the repository at this point in the history 
# This is the 1st commit message:

Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #2 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #3 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #4 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #5 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #6 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #7 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #8 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #9 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #10 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #11 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #12 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #13 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs

# The commit message #14 will be skipped:

# fixup! Add flake inputs from myself, use nixosModules.default wherever possible, reduce flake inputs
  • Loading branch information
@SuperSandro2000
SuperSandro2000 committed Oct 28, 2024
1 parent 4cfc1f3 commit 355e3ec
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 17 deletions.
38 changes: 27 additions & 11 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

107 changes: 101 additions & 6 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
authentik = {
url = "github:nix-community/authentik-nix";
inputs = {
flake-compat.follows = "flake-compat";
flake-compat.follows = "";
flake-parts.follows = "flake-parts";
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
Expand All @@ -26,11 +26,19 @@
nixpkgs.follows = "nixpkgs";
};
};
crowdsec = {
# https://codeberg.org/kampka/nix-flake-crowdsec/pulls/16
# url = "https://codeberg.org/kampka/nix-flake-crowdsec/archive/main.zip";
url = "https://codeberg.org/sandro/nix-flake-crowdsec/archive/fix-eval.zip";
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
};
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-compat.url = "github:nix-community/flake-compat";
flake-parts = {
url = "github:hercules-ci/flake-parts";
fenix = {
Expand All @@ -44,6 +52,15 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
ifdyndnsd = {
url = "github:astro/ifdyndnsd";
inputs = {
fenix.follows = "fenix";
naersk.follows = "naersk";
nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils";
};
};
ifstate = {
url = "git+https://codeberg.org/m4rc3l/ifstate.nix";
inputs = {
Expand All @@ -58,6 +75,16 @@
flake-utils.follows = "flake-utils";
};
};
lanzaboote = {
url = "github:nix-community/lanzaboote";
inputs = {
flake-compat.follows = "";
flake-parts.follows = "flake-parts";
nixpkgs.follows = "nixpkgs";
pre-commit-hooks-nix.follows = "";
rust-overlay.follows = "rust-overlay";
};
};
microvm = {
url = "github:astro/microvm.nix";
inputs = {
Expand All @@ -75,7 +102,7 @@
url = "github:tpwrules/nixos-apple-silicon";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-compat.follows = "flake-compat";
flake-compat.follows = "";
};
};
nixos-hardware.url = "github:nixos/nixos-hardware";
Expand All @@ -87,15 +114,29 @@
flake-utils.follows = "flake-utils";
};
};
nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
inputs = {
flake-compat.follows = "";
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
};
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixvim = {
url = "github:nix-community/nixvim";
inputs = {
flake-compat.follows = "flake-compat";
flake-parts.follows = "flake-parts";
home-manager.follows = "home-manager";
# TODO: add after nix-darwin got added
# nix-darwin.follows = "nix-darwin";
nixpkgs.follows = "nixpkgs";
nuschtosSearch.follows = "search";
# https://github.com/nix-community/nixvim/blob/main/flake.nix#L12-L34
devshell.follows = "";
flake-compat.follows = "";
git-hooks.follows = "";
treefmt-nix.follows = "";
};
};
search = {
Expand Down Expand Up @@ -136,9 +177,16 @@
utils.follows = "flake-utils";
};
};
tsnsrv = {
url = "github:boinkor-net/tsnsrv";
inputs = {
flake-parts.follows = "flake-parts";
nixpkgs.follows = "nixpkgs";
};
};
};

outputs = { authentik, buzzrelay, c3d2-user-module, disko, flake-utils, home-manager, ifstate, ixp-manager, microvm, nixos-apple-silicon, nixos-hardware, nixos-modules, nixpkgs, nixvim, search, sflow-exporter, simple-nixos-mailserver, sops-nix, ticker, ... }:
outputs = { authentik, buzzrelay, c3d2-user-module, crowdsec, disko, flake-utils, home-manager, ifdyndnsd, ifstate, ixp-manager, lanzaboote, microvm, nixos-apple-silicon, nixos-hardware, nixos-modules, nixos-wsl, nixpkgs, nixvim, search, sflow-exporter, simple-nixos-mailserver, sops-nix, ticker, tsnsrv, ... }:
flake-utils.lib.eachDefaultSystem
(system:
let
Expand Down Expand Up @@ -175,6 +223,16 @@
name = "c3d2-user-module";
urlPrefix = "https://gitea.c3d2.de/c3d2/nix-user-module/src/branch/master/";
}
# crowdsec
{
modules = [
crowdsec.nixosModules.crowdsec
crowdsec.nixosModules.crowdsec-firewall-bouncer
{ _module.args = { inherit pkgs; }; }
];
name = "crowdsec";
urlPrefix = "https://codeberg.org/kampka/nix-flake-crowdsec/src/branch/main/";
}
# disko
{
modules = [ disko.nixosModules.default ];
Expand All @@ -196,16 +254,35 @@
}
# ifstate.nix
{
modules = [ ifstate.nixosModules.ifstate ];
modules = [ ifstate.nixosModules.default ];
name = "IfState.nix";
urlPrefix = "https://codeberg.org/m4rc3l/ifstate.nix/src/branch/main/";
}
# ifdyndnsd
{
modules = [
ifdyndnsd.nixosModule
{ _module.args = { inherit pkgs; }; }
];
name = "ifdyndnsd";
urlPrefix = "https://github.com/astro/ifdyndnsd/blob/main/";
}
# ixp-manager.nix
{
modules = [ ixp-manager.nixosModules.default { _module.args = { modulesPath = pkgs.path + "/nixos/modules"; }; } ];
name = "ixp-manager.nix";
urlPrefix = "https://github.com/dd-ix/ixp-manager.nix/tree/main/";
}
# lanzaboote
{
modules = [
lanzaboote.nixosModules.lanzaboote
lanzaboote.nixosModules.uki
{ _module.args = { inherit pkgs; }; }
];
name = "Lanzaboote";
urlPrefix = "https://github.com/nix-community/lanzaboote/blob/master/";
}
# microvm.nix
{
modules = [
Expand All @@ -216,6 +293,12 @@
name = "MicroVM.nix";
urlPrefix = "https://github.com/astro/microvm.nix/blob/main/";
}
# nix-topology
{
modules = [ nix-topology.nixosModules.default ];
name = "nix-topology";
urlPrefix = "https://github.com/oddlama/nix-topology/blob/main/";
}
# NixOS/nixpkgs
{
microvm.nixosModules.microvm
Expand Down Expand Up @@ -254,6 +337,12 @@
name = "NixOS Modules";
urlPrefix = "https://github.com/NuschtOS/nixos-modules/tree/main/";
}
# NixOS-WSL
{
modules = [ nixos-wsl.nixosModules.default ];
name = "Nixos-WSL";
urlPrefix = "https://github.com/nix-community/NixOS-WSL/blob/main/";
}
# nixvim
{
optionsJSON = nixvim.packages.${system}.options-json + /share/doc/nixos/options.json;
Expand Down Expand Up @@ -298,6 +387,12 @@
name = "ticker";
urlPrefix = "https://gitea.c3d2.de/astro/ticker/src/branch/master/";
}
# tsnsrv
{
modules = [ tsnsrv.nixosModules.default ];
name = "tsnsrv";
urlPrefix = "https://github.com/boinkor-net/tsnsrv/blob/main/";
}
];
};
};
Expand Down

0 comments on commit 355e3ec

Please sign in to comment.