Integrate inputs into custom

This commit is contained in:
Andreas Zweili 2022-11-04 19:35:57 +01:00
parent caccf0a853
commit 246c58e84d
42 changed files with 291 additions and 291 deletions

View File

@ -1,4 +1,5 @@
{ { inputs }: {
username = "andreas"; username = "andreas";
version = "22.05"; version = "22.05";
inputs = inputs;
} }

View File

@ -34,79 +34,79 @@
, home-manager , home-manager
}: }:
let let
custom = import ./custom; custom = import ./custom { inherit inputs; };
mkComputer = import "${inputs.self}/lib/mk_computer.nix"; mkComputer = import "${custom.inputs.self}/lib/mk_computer.nix";
mkRaspi = import "${inputs.self}/lib/mk_raspi.nix"; mkRaspi = import "${custom.inputs.self}/lib/mk_raspi.nix";
in in
{ {
nixosConfigurations = { nixosConfigurations = {
gwyn = mkComputer { gwyn = mkComputer {
hostname = "gwyn"; hostname = "gwyn";
home-module = "desktop"; home-module = "desktop";
inherit custom inputs; inherit custom;
}; };
desktop-vm = mkComputer { desktop-vm = mkComputer {
hostname = "desktop-vm"; hostname = "desktop-vm";
home-module = "desktop"; home-module = "desktop";
inherit custom inputs; inherit custom;
}; };
staubfinger = mkComputer { staubfinger = mkComputer {
hostname = "staubfinger"; hostname = "staubfinger";
home-module = "desktop"; home-module = "desktop";
inherit custom inputs; inherit custom;
}; };
# Servers # Servers
git = mkRaspi { git = mkRaspi {
hostname = "git"; hostname = "git";
inherit custom inputs; inherit custom;
}; };
loki-test = mkRaspi { loki-test = mkRaspi {
hostname = "loki-test"; hostname = "loki-test";
inherit custom inputs; inherit custom;
}; };
mail = mkComputer { mail = mkComputer {
hostname = "mail"; hostname = "mail";
inherit custom inputs; inherit custom;
}; };
nextcloud = mkComputer { nextcloud = mkComputer {
hostname = "nextcloud"; hostname = "nextcloud";
inherit custom inputs; inherit custom;
}; };
pihole = mkComputer { pihole = mkComputer {
hostname = "pihole"; hostname = "pihole";
inherit custom inputs; inherit custom;
}; };
plex = mkComputer { plex = mkComputer {
hostname = "plex"; hostname = "plex";
home-module = "plex"; home-module = "plex";
inherit custom inputs; inherit custom;
}; };
proxy = mkRaspi { proxy = mkRaspi {
hostname = "proxy"; hostname = "proxy";
inherit custom inputs; inherit custom;
}; };
management = mkRaspi { management = mkRaspi {
hostname = "management"; hostname = "management";
home-module = "management"; home-module = "management";
inherit custom inputs; inherit custom;
}; };
restic-server = mkComputer { restic-server = mkComputer {
hostname = "restic-server"; hostname = "restic-server";
inherit custom inputs; inherit custom;
}; };
ttrss = mkComputer { ttrss = mkComputer {
hostname = "ttrss"; hostname = "ttrss";
inherit custom inputs; inherit custom;
}; };
}; };
homeConfigurations = { homeConfigurations = {
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration { "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
configuration = import "${inputs.self}/home-manager/work-wsl.nix"; configuration = import "${custom.inputs.self}/home-manager/work-wsl.nix";
system = "x86_64-linux"; system = "x86_64-linux";
username = custom.username; username = custom.username;
homeDirectory = "/home/${custom.username}"; homeDirectory = "/home/${custom.username}";
extraSpecialArgs = { extraSpecialArgs = {
inherit custom inputs; inherit custom;
}; };
}; };
}; };

View File

@ -1,32 +1,32 @@
{ inputs, custom }: { pkgs, ... }: { custom }: { pkgs, ... }:
{ {
imports = [ imports = [
"${inputs.self}/home-manager/software/ansible" "${custom.inputs.self}/home-manager/software/ansible"
(import "${inputs.self}/home-manager/common" { inherit custom; }) (import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${inputs.self}/home-manager/software/calibre" "${custom.inputs.self}/home-manager/software/calibre"
"${inputs.self}/home-manager/software/czkawka" "${custom.inputs.self}/home-manager/software/czkawka"
"${inputs.self}/home-manager/software/dunst" "${custom.inputs.self}/home-manager/software/dunst"
"${inputs.self}/home-manager/software/emacs" "${custom.inputs.self}/home-manager/software/emacs"
"${inputs.self}/home-manager/software/evince" "${custom.inputs.self}/home-manager/software/evince"
"${inputs.self}/home-manager/software/fzf" "${custom.inputs.self}/home-manager/software/fzf"
"${inputs.self}/home-manager/software/git" "${custom.inputs.self}/home-manager/software/git"
"${inputs.self}/home-manager/software/grobi" "${custom.inputs.self}/home-manager/software/grobi"
"${inputs.self}/home-manager/software/keeweb" "${custom.inputs.self}/home-manager/software/keeweb"
"${inputs.self}/home-manager/software/mime-apps" "${custom.inputs.self}/home-manager/software/mime-apps"
"${inputs.self}/home-manager/software/mpv" "${custom.inputs.self}/home-manager/software/mpv"
"${inputs.self}/home-manager/software/nitrogen" "${custom.inputs.self}/home-manager/software/nitrogen"
"${inputs.self}/home-manager/software/obsidian" "${custom.inputs.self}/home-manager/software/obsidian"
(import "${inputs.self}/home-manager/software/podget" { (import "${custom.inputs.self}/home-manager/software/podget" {
downloadDir = "/home/andreas/Downloads"; downloadDir = "/home/andreas/Downloads";
}) })
"${inputs.self}/home-manager/software/pycharm" "${custom.inputs.self}/home-manager/software/pycharm"
"${inputs.self}/home-manager/software/rapid-photo-downloader" "${custom.inputs.self}/home-manager/software/rapid-photo-downloader"
"${inputs.self}/home-manager/software/signal" "${custom.inputs.self}/home-manager/software/signal"
"${inputs.self}/home-manager/software/ssh" "${custom.inputs.self}/home-manager/software/ssh"
"${inputs.self}/home-manager/software/starship" "${custom.inputs.self}/home-manager/software/starship"
"${inputs.self}/home-manager/software/telegram" "${custom.inputs.self}/home-manager/software/telegram"
"${inputs.self}/home-manager/software/vim" "${custom.inputs.self}/home-manager/software/vim"
"${inputs.self}/home-manager/software/work-desktop" "${custom.inputs.self}/home-manager/software/work-desktop"
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
arc-theme arc-theme
@ -46,9 +46,9 @@
programs.git.userEmail = "andreas@zweili.ch"; programs.git.userEmail = "andreas@zweili.ch";
# raw config files # raw config files
home.file.".config/qtile/config.py".source = "${inputs.self}/home-manager/configs/qtile/config.py"; home.file.".config/qtile/config.py".source = "${custom.inputs.self}/home-manager/configs/qtile/config.py";
home.file.".config/qtile/autostart.sh".source = "${inputs.self}/home-manager/configs/qtile/autostart.sh"; home.file.".config/qtile/autostart.sh".source = "${custom.inputs.self}/home-manager/configs/qtile/autostart.sh";
home.file.".config/terminator".source = "${inputs.self}/home-manager/configs/terminator"; home.file.".config/terminator".source = "${custom.inputs.self}/home-manager/configs/terminator";
programs.bash = { programs.bash = {
enable = true; enable = true;

View File

@ -1,11 +1,11 @@
{ custom, inputs }: { ... }: { custom }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/home-manager/common" { inherit custom; }) (import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${inputs.self}/home-manager/software/fzf" "${custom.inputs.self}/home-manager/software/fzf"
"${inputs.self}/home-manager/software/git" "${custom.inputs.self}/home-manager/software/git"
"${inputs.self}/home-manager/software/vim" "${custom.inputs.self}/home-manager/software/vim"
"${inputs.self}/home-manager/software/starship" "${custom.inputs.self}/home-manager/software/starship"
]; ];
programs.git.userEmail = "andreas@zweili.ch"; programs.git.userEmail = "andreas@zweili.ch";

View File

@ -1,13 +1,13 @@
{ custom, inputs }: { ... }: { custom }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/home-manager/common" { inherit custom; }) (import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${inputs.self}/home-manager/software/emacs" "${custom.inputs.self}/home-manager/software/emacs"
"${inputs.self}/home-manager/software/fzf" "${custom.inputs.self}/home-manager/software/fzf"
"${inputs.self}/home-manager/software/git" "${custom.inputs.self}/home-manager/software/git"
"${inputs.self}/home-manager/software/ssh" "${custom.inputs.self}/home-manager/software/ssh"
"${inputs.self}/home-manager/software/starship" "${custom.inputs.self}/home-manager/software/starship"
"${inputs.self}/home-manager/software/vim" "${custom.inputs.self}/home-manager/software/vim"
]; ];
programs.git.userEmail = "andreas@zweili.ch"; programs.git.userEmail = "andreas@zweili.ch";

View File

@ -1,8 +1,8 @@
{ custom, inputs }: { ... }: { custom }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/home-manager/headless.nix" { inherit custom inputs; }) (import "${custom.inputs.self}/home-manager/headless.nix" { inherit custom; })
(import "${inputs.self}/home-manager/software/podget" { (import "${custom.inputs.self}/home-manager/software/podget" {
downloadDir = "/mnt/media/podcasts"; downloadDir = "/mnt/media/podcasts";
}) })
]; ];

View File

@ -1,8 +1,8 @@
{ custom, inputs }: { ... }: { custom, inputs }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/home-manager/common" { inherit custom; }) (import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${inputs.self}/home-manager/software/git" "${custom.inputs.self}/home-manager/software/git"
]; ];
programs.git.userEmail = "andreas@zweili.ch"; programs.git.userEmail = "andreas@zweili.ch";

View File

@ -1,14 +1,14 @@
{ inputs, custom }: { pkgs, ... }: { custom }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/home-manager/common" { inherit custom; }) (import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${inputs.self}/home-manager/software/ansible" "${custom.inputs.self}/home-manager/software/ansible"
"${inputs.self}/home-manager/software/emacs" "${custom.inputs.self}/home-manager/software/emacs"
"${inputs.self}/home-manager/software/fzf" "${custom.inputs.self}/home-manager/software/fzf"
"${inputs.self}/home-manager/software/git" "${custom.inputs.self}/home-manager/software/git"
"${inputs.self}/home-manager/software/starship" "${custom.inputs.self}/home-manager/software/starship"
"${inputs.self}/home-manager/software/vagrant-wsl" "${custom.inputs.self}/home-manager/software/vagrant-wsl"
"${inputs.self}/home-manager/software/vim" "${custom.inputs.self}/home-manager/software/vim"
]; ];
programs.git.userEmail = "zweili@contria.com"; programs.git.userEmail = "zweili@contria.com";

View File

@ -1,20 +1,20 @@
{ custom, hostname, inputs, system ? "x86_64-linux", home-module ? "headless" }: { custom, hostname, system ? "x86_64-linux", home-module ? "headless" }:
let let
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import custom.inputs.nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
pkgs = import inputs.nixpkgs { pkgs = import custom.inputs.nixpkgs {
inherit system; inherit system;
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
overlays = [ overlays = [
overlay-unstable overlay-unstable
inputs.nix-alien.overlay custom.inputs.nix-alien.overlay
# (final: prev: { # (final: prev: {
# nextcloud-client = prev.nextcloud-client.overrideAttrs (_: rec { # nextcloud-client = prev.nextcloud-client.overrideAttrs (_: rec {
# version = "3.6.0"; # version = "3.6.0";
@ -29,29 +29,29 @@ let
]; ];
}; };
in in
inputs.nixpkgs.lib.nixosSystem custom.inputs.nixpkgs.lib.nixosSystem
{ {
inherit system pkgs; inherit system pkgs;
specialArgs = { inherit custom inputs; }; specialArgs = { inherit custom; };
modules = ( modules = (
[ [
# System configuration for this host # System configuration for this host
(import "${inputs.self}/systems/${hostname}" { (import "${custom.inputs.self}/systems/${hostname}" {
inherit custom inputs hostname; inherit custom hostname;
}) })
# Common configuration # Common configuration
(import "${inputs.self}/modules/common-x86" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/common-x86" { inherit custom; })
inputs.agenix.nixosModules.age custom.inputs.agenix.nixosModules.age
{ environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; } { environment.systemPackages = [ custom.inputs.agenix.defaultPackage.${system} ]; }
inputs.home-manager.nixosModules.home-manager custom.inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [ home-manager.users.${custom.username}.imports = [
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom inputs; }) (import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom; })
]; ];
} }
]); ]);

View File

@ -1,44 +1,45 @@
{ custom, hostname, inputs, system ? "aarch64-linux", home-module ? "headless" }: { custom, hostname, system ? "aarch64-linux", home-module ? "headless" }:
let let
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import custom.inputs.nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
pkgs = import inputs.nixpkgs { pkgs = import custom.inputs.nixpkgs {
inherit system; inherit system;
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
overlays = [ overlays = [
overlay-unstable overlay-unstable
inputs.nix-alien.overlay custom.inputs.nix-alien.overlay
]; ];
}; };
in in
inputs.nixpkgs.lib.nixosSystem {
custom.inputs.nixpkgs.lib.nixosSystem {
inherit pkgs system; inherit pkgs system;
specialArgs = { inherit custom inputs; }; specialArgs = { inherit custom; };
modules = ( modules = (
[ [
# System configuration for this host # System configuration for this host
(import "${inputs.self}/systems/${hostname}" (import "${custom.inputs.self}/systems/${hostname}"
{ inherit custom hostname inputs; }) { inherit custom hostname; })
# Common configuration # Common configuration
(import "${inputs.self}/modules/common" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/common" { inherit custom; })
inputs.agenix.nixosModules.age custom.inputs.agenix.nixosModules.age
{ environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; } { environment.systemPackages = [ custom.inputs.agenix.defaultPackage.${system} ]; }
inputs.home-manager.nixosModules.home-manager custom.inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [ home-manager.users.${custom.username}.imports = [
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom inputs; }) (import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom; })
]; ];
} }
]); ]);

View File

@ -1,7 +1,7 @@
{ custom, inputs }: { ... }: { custom }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/modules/common" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/common" { inherit custom; })
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

View File

@ -1,7 +1,7 @@
{ inputs, custom }: { pkgs, ... }: { custom }: { pkgs, ... }:
{ {
imports = [ imports = [
"${inputs.self}/modules/cli" "${custom.inputs.self}/modules/cli"
]; ];
# The rough location # The rough location
@ -71,10 +71,10 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; nixPath = [ "nixpkgs=${custom.inputs.nixpkgs}" ];
registry = { registry = {
nixpkgs.flake = inputs.nixpkgs; nixpkgs.flake = custom.inputs.nixpkgs;
nix-config.flake = inputs.self; nix-config.flake = custom.inputs.self;
}; };
autoOptimiseStore = true; autoOptimiseStore = true;

View File

@ -1,9 +1,9 @@
{ inputs, custom }: { pkgs, ... }: { custom }: { pkgs, ... }:
{ {
imports = [ imports = [
"${inputs.self}/modules/hunspell" "${custom.inputs.self}/modules/hunspell"
"${inputs.self}/modules/nix-alien" "${custom.inputs.self}/modules/nix-alien"
(import "${inputs.self}/modules/libimobiledevice" { inherit custom; }) (import "${custom.inputs.self}/modules/libimobiledevice" { inherit custom; })
]; ];
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;

View File

@ -1,4 +1,4 @@
{ inputs }: { config, pkgs, ... }: { custom }: { config, pkgs, ... }:
let let
mailserver-setup = (pkgs.writeScriptBin "mailserver-setup" mailserver-setup = (pkgs.writeScriptBin "mailserver-setup"
"${builtins.readFile (pkgs.fetchurl { "${builtins.readFile (pkgs.fetchurl {
@ -31,7 +31,7 @@ in
volumes = [ volumes = [
"/etc/localtime:/etc/localtime:ro" "/etc/localtime:/etc/localtime:ro"
"/var/lib/acme/mail.zweili.org:/etc/letsencrypt/live/mail.zweili.org:ro" "/var/lib/acme/mail.zweili.org:/etc/letsencrypt/live/mail.zweili.org:ro"
"${inputs.self}/modules/docker-mailserver/sa-learn:/etc/cron.d/sa-learn" "${custom.inputs.self}/modules/docker-mailserver/sa-learn:/etc/cron.d/sa-learn"
]; ];
extraOptions = [ extraOptions = [
''--mount=type=volume,source=maildata,target=/var/mail,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/docker-mailserver/maildata,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"'' ''--mount=type=volume,source=maildata,target=/var/mail,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/docker-mailserver/maildata,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''

View File

@ -1,8 +1,8 @@
{ custom, inputs }: { config, ... }: { custom }: { config, ... }:
{ {
age.secrets.personalEmailKey = age.secrets.personalEmailKey =
{ {
file = "${inputs.self}/scrts/personal_email.key.age"; file = "${custom.inputs.self}/scrts/personal_email.key.age";
mode = "600"; mode = "600";
owner = custom.username; owner = custom.username;
group = "users"; group = "users";

View File

@ -1,6 +1,6 @@
{ domain, inputs }: { config, ... }: { custom, domain }: { config, ... }:
{ {
age.secrets.giteaEnv.file = "${inputs.self}/scrts/gitea_env.age"; age.secrets.giteaEnv.file = "${custom.inputs.self}/scrts/gitea_env.age";
virtualisation.oci-containers = { virtualisation.oci-containers = {
backend = "docker"; backend = "docker";

View File

@ -1,8 +1,8 @@
{ dataDir, documentRoot ? "/var/www/html", domain, inputs, port ? "9000", }: { custom, dataDir, documentRoot ? "/var/www/html", domain, port ? "9000", }:
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
"${inputs.self}/modules/nginx-acme-base" "${custom.inputs.self}/modules/nginx-acme-base"
]; ];
services.nginx = { services.nginx = {
appendHttpConfig = '' appendHttpConfig = ''

View File

@ -1,6 +1,6 @@
{ domain, inputs, port ? "8080" }: { ... }: { { custom, domain, port ? "8080" }: { ... }: {
imports = [ imports = [
"${inputs.self}/modules/nginx-acme-base" "${custom.inputs.self}/modules/nginx-acme-base"
]; ];
services.nginx = { services.nginx = {
appendHttpConfig = '' appendHttpConfig = ''

View File

@ -1,4 +1,4 @@
{ inputs }: { config, ... }: { custom }: { config, ... }:
{ {
networking = { networking = {
firewall.allowedTCPPorts = [ firewall.allowedTCPPorts = [
@ -11,7 +11,7 @@
67 # DHCP 67 # DHCP
]; ];
}; };
age.secrets.piholeEnv.file = "${inputs.self}/scrts/pihole_env.age"; age.secrets.piholeEnv.file = "${custom.inputs.self}/scrts/pihole_env.age";
virtualisation.oci-containers = { virtualisation.oci-containers = {
backend = "docker"; backend = "docker";
containers."pihole" = { containers."pihole" = {

View File

@ -1,6 +1,6 @@
{ inputs }: { config, ... }: { custom }: { config, ... }:
{ {
age.secrets.plexClaim.file = "${inputs.self}/scrts/plex_claim.age"; age.secrets.plexClaim.file = "${custom.inputs.self}/scrts/plex_claim.age";
networking = { networking = {
firewall.allowedTCPPorts = [ firewall.allowedTCPPorts = [
32400 # Web Interface/ Remote Access 32400 # Web Interface/ Remote Access

View File

@ -1,14 +1,14 @@
{ inputs { custom
, path , path
, tag ? "home-dir" , tag ? "home-dir"
, time , time
}: { config, pkgs, ... }: }: { config, pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/modules/telegram-notifications" { inherit inputs; }) (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
]; ];
age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age"; age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
systemd.timers."restic-backups" = { systemd.timers."restic-backups" = {
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
@ -30,7 +30,7 @@
onFailure = [ "unit-status-telegram@%n.service" ]; onFailure = [ "unit-status-telegram@%n.service" ];
script = '' script = ''
${pkgs.restic}/bin/restic backup \ ${pkgs.restic}/bin/restic backup \
--exclude-file=${inputs.self}/modules/restic/excludes.txt \ --exclude-file=${custom.inputs.self}/modules/restic/excludes.txt \
--tag ${tag} ${path} --tag ${tag} ${path}
${pkgs.restic}/bin/restic forget \ ${pkgs.restic}/bin/restic forget \

View File

@ -1,14 +1,14 @@
{ inputs { custom
, path , path
, tag ? "home-dir" , tag ? "home-dir"
, time , time
}: { config, pkgs, ... }: }: { config, pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/modules/telegram-notifications" { inherit inputs; }) (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
]; ];
age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age"; age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
systemd.timers."restic-backups" = { systemd.timers."restic-backups" = {
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
@ -30,7 +30,7 @@
onFailure = [ "unit-status-telegram@%n.service" ]; onFailure = [ "unit-status-telegram@%n.service" ];
script = '' script = ''
${pkgs.restic}/bin/restic backup \ ${pkgs.restic}/bin/restic backup \
--exclude-file=${inputs.self}/modules/restic/excludes.txt \ --exclude-file=${custom.inputs.self}/modules/restic/excludes.txt \
--tag ${tag} ${path} --tag ${tag} ${path}
${pkgs.mariadb}/bin/mysqldump --single-transaction --all-databases | \ ${pkgs.mariadb}/bin/mysqldump --single-transaction --all-databases | \

View File

@ -1,9 +1,9 @@
{ inputs }: { config, pkgs, ... }: { custom }: { config, pkgs, ... }:
let let
repository = "/mnt/restic-server"; repository = "/mnt/restic-server";
in in
{ {
age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age"; age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
restic restic

View File

@ -1,4 +1,4 @@
{ custom, inputs }: { config, pkgs, ... }: { custom }: { config, pkgs, ... }:
let let
password_file = config.age.secrets.resticKey.path; password_file = config.age.secrets.resticKey.path;
repository = "rest:http://10.7.89.30:8000"; repository = "rest:http://10.7.89.30:8000";
@ -44,17 +44,18 @@ let
in in
{ {
imports = [ imports = [
(import "${inputs.self}/modules/telegram-notifications" { inherit inputs; }) (import "${custom.inputs.self}/modules/telegram-notifications"
{ inherit custom; })
]; ];
age.secrets.infomaniakEnv = { age.secrets.infomaniakEnv = {
file = "${inputs.self}/scrts/infomaniak_env.age"; file = "${custom.inputs.self}/scrts/infomaniak_env.age";
mode = "600"; mode = "600";
owner = custom.username; owner = custom.username;
group = "users"; group = "users";
}; };
age.secrets.resticKey = { age.secrets.resticKey = {
file = "${inputs.self}/scrts/restic.key.age"; file = "${custom.inputs.self}/scrts/restic.key.age";
mode = "600"; mode = "600";
owner = custom.username; owner = custom.username;
group = "users"; group = "users";
@ -82,7 +83,7 @@ in
onFailure = [ "unit-status-telegram@%n.service" ]; onFailure = [ "unit-status-telegram@%n.service" ];
script = '' script = ''
${pkgs.restic}/bin/restic \ ${pkgs.restic}/bin/restic \
--exclude-file=${inputs.self}/modules/restic/excludes.txt \ --exclude-file=${custom.inputs.self}/modules/restic/excludes.txt \
--tag home-dir \ --tag home-dir \
backup /home/${custom.username} backup /home/${custom.username}

View File

@ -1,4 +1,4 @@
{ inputs }: { config, pkgs, ... }: { custom }: { config, pkgs, ... }:
let let
send-to-telegram = pkgs.writeShellScript "send-to-telegram" '' send-to-telegram = pkgs.writeShellScript "send-to-telegram" ''
export $(${pkgs.gnugrep}/bin/grep -v '^#' ${config.age.secrets.telegramNotifyEnv.path} | ${pkgs.findutils}/bin/xargs) export $(${pkgs.gnugrep}/bin/grep -v '^#' ${config.age.secrets.telegramNotifyEnv.path} | ${pkgs.findutils}/bin/xargs)
@ -16,7 +16,7 @@ let
$UNITSTATUS"''; $UNITSTATUS"'';
in in
{ {
age.secrets.telegramNotifyEnv.file = "${inputs.self}/scrts/telegram_notify_env.age"; age.secrets.telegramNotifyEnv.file = "${custom.inputs.self}/scrts/telegram_notify_env.age";
systemd.services."unit-status-telegram@" = { systemd.services."unit-status-telegram@" = {
description = "Unit Status Telegram Service"; description = "Unit Status Telegram Service";
unitConfig = { unitConfig = {

View File

@ -1,17 +1,17 @@
{ domain, inputs }: { config, pkgs, ... }: { custom, domain }: { config, pkgs, ... }:
let let
domain = "test.2li.ch"; domain = "test.2li.ch";
in in
{ {
imports = [ imports = [
(import "${inputs.self}/modules/nginx-fpm" { (import "${custom.inputs.self}/modules/nginx-fpm" {
dataDir = "/mnt/data/ttrss/app"; dataDir = "/mnt/data/ttrss/app";
inherit domain inputs pkgs; inherit custom domain pkgs;
}) })
"${inputs.self}/modules/data-share" "${custom.inputs.self}/modules/data-share"
"${inputs.self}/modules/postgresql" "${custom.inputs.self}/modules/postgresql"
]; ];
age.secrets.ttrssEnv.file = "${inputs.self}/scrts/ttrss_env.age"; age.secrets.ttrssEnv.file = "${custom.inputs.self}/scrts/ttrss_env.age";
services.postgresql = { services.postgresql = {
ensureDatabases = [ "ttrssdb" ]; ensureDatabases = [ "ttrssdb" ];

View File

@ -1,6 +1,6 @@
{ domain, inputs }: { config, ... }: { custom, domain }: { config, ... }:
{ {
age.secrets.ttrssEnv.file = "${inputs.self}/scrts/ttrss_env.age"; age.secrets.ttrssEnv.file = "${custom.inputs.self}/scrts/ttrss_env.age";
virtualisation.oci-containers = { virtualisation.oci-containers = {
backend = "docker"; backend = "docker";

View File

@ -1,12 +1,12 @@
{ custom, hostname, inputs }: { ... }: { custom, hostname }: { ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/modules/desktop" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/desktop" { inherit custom; })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/espanso" { inherit custom; }) (import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${inputs.self}/modules/logs-share" "${custom.inputs.self}/modules/logs-share"
(import "${inputs.self}/modules/nix-direnv" { inherit custom; }) (import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
"${inputs.self}/modules/tmux" "${custom.inputs.self}/modules/tmux"
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"ata_piix" "ata_piix"

View File

@ -1,24 +1,24 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
let let
domain = "git.2li.ch"; domain = "git.2li.ch";
in in
{ {
imports = [ imports = [
(import "${inputs.self}/systems/raspi4" { (import "${custom.inputs.self}/systems/raspi4" {
ip = "10.7.89.109"; ip = "10.7.89.109";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server-mysql-client" { (import "${custom.inputs.self}/modules/restic-server-mysql-client" {
path = "/home/andreas"; path = "/home/andreas";
time = "03:00"; inherit inputs; time = "03:00"; inherit custom;
}) })
(import "${inputs.self}/modules/nginx-proxy" { (import "${custom.inputs.self}/modules/nginx-proxy" {
inherit domain inputs; inherit custom domain;
}) })
(import "${inputs.self}/modules/gitea" { (import "${custom.inputs.self}/modules/gitea" {
inherit domain inputs; inherit custom domain;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/mariadb" "${custom.inputs.self}/modules/mariadb"
]; ];
} }

View File

@ -1,27 +1,27 @@
{ custom, hostname, inputs }: { lib, ... }: { custom, hostname }: { lib, ... }:
{ {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.dell-precision-5530 custom.inputs.nixos-hardware.nixosModules.dell-precision-5530
inputs.nixos-hardware.nixosModules.common-gpu-nvidia custom.inputs.nixos-hardware.nixosModules.common-gpu-nvidia
inputs.nixos-hardware.nixosModules.common-gpu-intel custom.inputs.nixos-hardware.nixosModules.common-gpu-intel
"${inputs.self}/hardware/bluetooth" "${custom.inputs.self}/hardware/bluetooth"
"${inputs.self}/hardware/nvidia" "${custom.inputs.self}/hardware/nvidia"
"${inputs.self}/hardware/dvd" "${custom.inputs.self}/hardware/dvd"
"${inputs.self}/modules/data-share" "${custom.inputs.self}/modules/data-share"
(import "${inputs.self}/modules/desktop" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/desktop" { inherit custom; })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/droidcam" { inherit custom; }) (import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
(import "${inputs.self}/modules/email" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/email" { inherit custom; })
(import "${inputs.self}/modules/eog" { inherit custom; }) (import "${custom.inputs.self}/modules/eog" { inherit custom; })
(import "${inputs.self}/modules/espanso" { inherit custom; }) (import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${inputs.self}/modules/lockscreen" "${custom.inputs.self}/modules/lockscreen"
"${inputs.self}/modules/logs-share" "${custom.inputs.self}/modules/logs-share"
(import "${inputs.self}/modules/nix-direnv" { inherit custom; }) (import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
(import "${inputs.self}/modules/pipewire" { inherit custom; }) (import "${custom.inputs.self}/modules/pipewire" { inherit custom; })
"${inputs.self}/modules/scripts" "${custom.inputs.self}/modules/scripts"
"${inputs.self}/modules/tlp" "${custom.inputs.self}/modules/tlp"
"${inputs.self}/modules/tmux" "${custom.inputs.self}/modules/tmux"
(import "${inputs.self}/modules/restic" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/restic" { inherit custom; })
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"aesni_intel" "aesni_intel"

View File

@ -1,14 +1,14 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/raspi4" { (import "${custom.inputs.self}/systems/raspi4" {
ip = "10.7.89.10"; ip = "10.7.89.10";
inherit hostname inputs; inherit hostname custom;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/pihole" { inherit inputs; }) # needs to be limited to lan interface (import "${custom.inputs.self}/modules/pihole" { inherit custom; }) # needs to be limited to lan interface
"${inputs.self}/modules/router" "${custom.inputs.self}/modules/router"
"${inputs.self}/modules/tmux" "${custom.inputs.self}/modules/tmux"
"${inputs.self}/modules/unbound" # needs to be limited to lan interface "${custom.inputs.self}/modules/unbound" # needs to be limited to lan interface
]; ];
} }

View File

@ -1,21 +1,21 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.123"; ip = "10.7.89.123";
inherit hostname inputs; inherit hostname custom;
}) })
(import "${inputs.self}/modules/restic-server-client" { (import "${custom.inputs.self}/modules/restic-server-client" {
path = "/home/andreas"; path = "/home/andreas";
time = "04:30"; time = "04:30";
inherit inputs; inherit custom;
}) })
(import "${inputs.self}/modules/nginx-proxy" { (import "${custom.inputs.self}/modules/nginx-proxy" {
domain = "mail.zweili.org"; inherit inputs; domain = "mail.zweili.org"; inherit custom;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/docker-mailserver" { inherit inputs; }) (import "${custom.inputs.self}/modules/docker-mailserver" { inherit custom; })
"${inputs.self}/modules/mariadb" "${custom.inputs.self}/modules/mariadb"
]; ];
} }

View File

@ -1,22 +1,22 @@
{ custom, hostname, inputs }: { ... }: { custom, hostname }: { ... }:
let let
domain = "test.2li.ch"; domain = "test.2li.ch";
in in
{ {
imports = [ imports = [
(import "${inputs.self}/systems/raspi4" { (import "${custom.inputs.self}/systems/raspi4" {
ip = "10.7.89.150"; ip = "10.7.89.150";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/logs-share" "${custom.inputs.self}/modules/logs-share"
(import "${inputs.self}/modules/restic-server-client" { (import "${custom.inputs.self}/modules/restic-server-client" {
path = "/home/andreas"; path = "/home/andreas";
tag = "management"; tag = "management";
time = "23:30"; time = "23:30";
inherit inputs; inherit custom;
}) })
"${inputs.self}/modules/tmux" "${custom.inputs.self}/modules/tmux"
]; ];
services.nginx.virtualHosts."${domain}".locations = { services.nginx.virtualHosts."${domain}".locations = {
"/".extraConfig = '' "/".extraConfig = ''

View File

@ -1,17 +1,17 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.103"; ip = "10.7.89.103";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server-mysql-client" { (import "${custom.inputs.self}/modules/restic-server-mysql-client" {
path = "/home/andreas"; path = "/home/andreas";
time = "04:00"; inherit inputs; time = "04:00"; inherit custom;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/mariadb" "${custom.inputs.self}/modules/mariadb"
"${inputs.self}/modules/nginx-acme-base" "${custom.inputs.self}/modules/nginx-acme-base"
]; ];
services.nginx = { services.nginx = {

View File

@ -1,17 +1,17 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.2"; ip = "10.7.89.2";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server-client" { (import "${custom.inputs.self}/modules/restic-server-client" {
path = "/var/lib/pihole"; path = "/var/lib/pihole";
tag = "pihole"; tag = "pihole";
time = "05:00"; inherit inputs; time = "05:00"; inherit custom;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/pihole" { inherit inputs; }) (import "${custom.inputs.self}/modules/pihole" { inherit custom; })
"${inputs.self}/modules/unbound" "${custom.inputs.self}/modules/unbound"
]; ];
} }

View File

@ -1,18 +1,18 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.112"; ip = "10.7.89.112";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server-client" { (import "${custom.inputs.self}/modules/restic-server-client" {
path = "/var/lib/plex"; path = "/var/lib/plex";
tag = "plex"; tag = "plex";
time = "03:30"; time = "03:30";
inherit inputs; inherit custom;
}) })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/media-share" "${custom.inputs.self}/modules/media-share"
(import "${inputs.self}/modules/plex" { inherit inputs; }) (import "${custom.inputs.self}/modules/plex" { inherit custom; })
]; ];
} }

View File

@ -1,9 +1,9 @@
{ inputs, hostname, ip }: { ... }: { custom, hostname, ip }: { ... }:
{ {
imports = [ imports = [
"${inputs.self}/modules/log-to-ram" "${custom.inputs.self}/modules/log-to-ram"
"${inputs.self}/modules/ntp" "${custom.inputs.self}/modules/ntp"
"${inputs.self}/modules/syslog" "${custom.inputs.self}/modules/syslog"
]; ];
networking = { networking = {

View File

@ -1,21 +1,21 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/raspi4" { (import "${custom.inputs.self}/systems/raspi4" {
ip = "10.7.89.99"; ip = "10.7.89.99";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server-client" { (import "${custom.inputs.self}/modules/restic-server-client" {
path = "/home/andreas"; path = "/home/andreas";
time = "00:00"; time = "00:00";
inherit inputs; inherit custom;
}) })
"${inputs.self}/modules/nginx-acme-base" "${custom.inputs.self}/modules/nginx-acme-base"
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/grav" "${custom.inputs.self}/modules/grav"
"${inputs.self}/modules/haproxy" "${custom.inputs.self}/modules/haproxy"
"${inputs.self}/modules/heimdall" "${custom.inputs.self}/modules/heimdall"
"${inputs.self}/modules/rss-bridge" "${custom.inputs.self}/modules/rss-bridge"
]; ];
services.nginx = { services.nginx = {

View File

@ -1,10 +1,10 @@
{ inputs, hostname, ip }: { pkgs, ... }: { custom, hostname, ip }: { pkgs, ... }:
{ {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.raspberry-pi-4 custom.inputs.nixos-hardware.nixosModules.raspberry-pi-4
"${inputs.self}/modules/log-to-ram" "${custom.inputs.self}/modules/log-to-ram"
"${inputs.self}/modules/ntp" "${custom.inputs.self}/modules/ntp"
"${inputs.self}/modules/syslog" "${custom.inputs.self}/modules/syslog"
]; ];
fileSystems = { fileSystems = {

View File

@ -1,10 +1,10 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.30"; ip = "10.7.89.30";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/restic-server" { inherit inputs; }) (import "${custom.inputs.self}/modules/restic-server" { inherit custom; })
]; ];
} }

View File

@ -1,18 +1,18 @@
{ custom, hostname, inputs }: { ... }: { custom, hostname }: { ... }:
{ {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.common-gpu-intel custom.inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop custom.inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd custom.inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
"${inputs.self}/hardware/bluetooth" "${custom.inputs.self}/hardware/bluetooth"
(import "${inputs.self}/modules/desktop" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/desktop" { inherit custom; })
(import "${inputs.self}/modules/docker" { inherit custom; }) (import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${inputs.self}/modules/droidcam" { inherit custom; }) (import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
(import "${inputs.self}/modules/espanso" { inherit custom; }) (import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${inputs.self}/modules/lockscreen" "${custom.inputs.self}/modules/lockscreen"
(import "${inputs.self}/modules/restic" { inherit custom inputs; }) (import "${custom.inputs.self}/modules/restic" { inherit custom; })
"${inputs.self}/modules/tlp" "${custom.inputs.self}/modules/tlp"
"${inputs.self}/modules/tmux" "${custom.inputs.self}/modules/tmux"
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"aesni_intel" "aesni_intel"

View File

@ -1,25 +1,22 @@
{ custom, hostname, inputs }: { pkgs, ... }: { custom, hostname }: { pkgs, ... }:
let let
domain = "ttrss.2li.ch"; domain = "ttrss.2li.ch";
in in
{ {
imports = [ imports = [
(import "${inputs.self}/systems/proxmox-vm" { (import "${custom.inputs.self}/systems/proxmox-vm" {
ip = "10.7.89.115"; ip = "10.7.89.115";
inherit hostname inputs; inherit custom hostname;
}) })
(import "${inputs.self}/modules/nginx-proxy" { (import "${custom.inputs.self}/modules/nginx-proxy" { inherit custom domain; })
inherit domain inputs; (import "${custom.inputs.self}/modules/restic-server-mysql-client" {
})
(import "${inputs.self}/modules/restic-server-mysql-client" {
path = "/var/lib/ttrss"; path = "/var/lib/ttrss";
tag = "ttrss"; tag = "ttrss";
time = "23:00"; inherit inputs; time = "23:00";
inherit custom;
}) })
(import "${inputs.self}/modules/ttrss" { (import "${custom.inputs.self}/modules/ttrss" { inherit custom domain; })
inherit domain inputs; (import "${custom.inputs.self}/modules/docker" { inherit custom; })
}) "${custom.inputs.self}/modules/mariadb"
(import "${inputs.self}/modules/docker" { inherit custom; })
"${inputs.self}/modules/mariadb"
]; ];
} }