Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-25 21:30:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor code cleaning

Browse source
This commit is contained in:
Julien Malka 2024-03-30 20:58:04 +01:00
parent fe8bd69ebe
commit 44b3f14d48
Signed by: Luj
GPG key ID: 6FC74C847011FD83
9 changed files with 32 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/mkmachine.nix
View file

@ -26,8 +26,8 @@ nixpkgs.lib.nixosSystem {
}; };
modules = builtins.attrValues modules ++ [ modules = builtins.attrValues modules ++ [
../machines/base.nix ../machines/base.nix
inputs.sops-nix.nixosModules.sops
host-config host-config
inputs.sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
inputs.simple-nixos-mailserver.nixosModule inputs.simple-nixos-mailserver.nixosModule
inputs.attic.nixosModules.atticd inputs.attic.nixosModules.atticd
@ -36,7 +36,6 @@ nixpkgs.lib.nixosSystem {
inputs.buildbot-nix.nixosModules.buildbot-master inputs.buildbot-nix.nixosModules.buildbot-master
inputs.buildbot-nix.nixosModules.buildbot-worker inputs.buildbot-nix.nixosModules.buildbot-worker
inputs.nix-hash-collection.nixosModules.hash-collection inputs.nix-hash-collection.nixosModules.hash-collection
inputs.nur.nixosModules.nur inputs.nur.nixosModules.nur
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -48,22 +47,14 @@ nixpkgs.lib.nixosSystem {
waybar = prev.waybar.overrideAttrs (oldAttrs: { waybar = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
}); });
tinystatus = prev.pkgs.callPackage ../packages/tinystatus { }; # Packages comming from other repositories
inherit (prev.unstable) jackett;
inherit (prev.unstable) radarr;
htpdate = prev.pkgs.callPackage ../packages/htpdate { };
authelia = prev.pkgs.callPackage ../packages/authelia { };
paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
inherit (prev.unstable) tailscale;
inherit (prev.unstable) nodePackages;
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
inherit (prev.unstable) mosh;
attic = inputs.attic.packages.${system}.default; attic = inputs.attic.packages.${system}.default;
inherit (inputs.colmena.packages.${system}) colmena; inherit (inputs.colmena.packages.${system}) colmena;
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
inherit (prev.unstable) bcachefs-tools; inherit (prev.unstable) bcachefs-tools;
zotero = inputs.zotero-nix.packages.${system}.default; zotero = inputs.zotero-nix.packages.${system}.default;
# My own packages
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
}) })
]; ];
} }

7
modules/deluge/default.nix
View file

@ -39,8 +39,7 @@ in
services.deluge = { services.deluge = {
enable = true; enable = true;
inherit (cfg) user; inherit (cfg) user group;
inherit (cfg) group;
openFirewall = true; openFirewall = true;
declarative = true; declarative = true;
authFile = "/run/secrets/deluge"; authFile = "/run/secrets/deluge";
@ -55,9 +54,9 @@ in
} }
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]); (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
} }

10
modules/hydra/default.nix
View file

@ -18,9 +18,9 @@ in
mkMerge [{ mkMerge [{
services.hydra = { services.hydra = {
inherit port;
enable = true; enable = true;
notificationSender = "hydra@localhost"; notificationSender = "hydra@localhost";
inherit port;
buildMachinesFiles = [ ]; buildMachinesFiles = [ ];
useSubstitutes = true; useSubstitutes = true;
}; };
@ -28,9 +28,11 @@ in
networking.firewall = { allowedTCPPorts = [ port ]; }; networking.firewall = { allowedTCPPorts = [ port ]; };
} }
(mkIf cfg.nginx.enable (recursiveUpdate { (mkIf cfg.nginx.enable (recursiveUpdate
services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me"; {
} (mkSubdomain cfg.nginx.subdomain port)) )]); services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
}
(mkSubdomain cfg.nginx.subdomain port)))]);

6
modules/jackett/default.nix
View file

@ -32,14 +32,14 @@ in
mkMerge [{ mkMerge [{
services.jackett = { services.jackett = {
enable = true; enable = true;
inherit (cfg) user; package = pkgs.unstable.jackett;
inherit (cfg) group; inherit (cfg) user group;
}; };
} }
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]); (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);

41
modules/jellyfin/default.nix
View file

@ -32,47 +32,16 @@ in
mkMerge [{ mkMerge [{
services.jellyfin = { services.jellyfin = {
enable = true; enable = true;
inherit (cfg) user; inherit (cfg) user group;
inherit (cfg) group;
}; };
# services.nginx.appendHttpConfig = ''
# server {
# server_name tv.julienmalka.me;
# listen 80;
# return 301 https://$server_name$request_uri;
# }
# server {
# server_name tv.julienmalka.me;
# listen 443 ssl http2;
# include ${../authelia/authelia.conf}; # Authelia auth endpoint
# location / {
# proxy_pass http://127.0.0.1:8096;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# include ${../authelia/secure.conf}; # Protect this endpoint
# }
# }
# '';
} }
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port)) (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]); (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);

7
modules/lidarr/default.nix
View file

@ -33,14 +33,13 @@ in
mkMerge [{ mkMerge [{
services.lidarr = { services.lidarr = {
enable = true; enable = true;
inherit (cfg) user; inherit (cfg) user group;
inherit (cfg) group;
}; };
} }
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]); (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);

8
modules/radarr/default.nix
View file

@ -33,13 +33,13 @@ in
mkMerge [{ mkMerge [{
services.radarr = { services.radarr = {
enable = true; enable = true;
inherit (cfg) user; package = pkgs.unstable.radarr;
inherit (cfg) group; inherit (cfg) user group;
}; };
} }
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]); (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);

3
modules/sonarr/default.nix
View file

@ -33,8 +33,7 @@ in
mkMerge [{ mkMerge [{
services.sonarr = { services.sonarr = {
enable = true; enable = true;
inherit (cfg) user; inherit (cfg) user group;
inherit (cfg) group;
}; };
} }

5
modules/transmission/default.nix
View file

@ -39,8 +39,7 @@ in
services.transmission = { services.transmission = {
enable = true; enable = true;
inherit (cfg) user; inherit (cfg) user group;
inherit (cfg) group;
credentialsFile = "/run/secrets/transmission"; credentialsFile = "/run/secrets/transmission";
downloadDirPermissions = "770"; downloadDirPermissions = "770";
settings = { settings = {
@ -52,7 +51,7 @@ in
}; };
} }
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port) )]); (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))]);