diff --git a/flake.lock b/flake.lock index ec81d20..b1ae1a6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,14 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770165109, - "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", + "lastModified": 1790734419, + "narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=", "owner": "ryantm", "repo": "agenix", - "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", + "rev": "3daa710894355fa2fad8243380af373a2b4046ef", "type": "github" }, "original": { @@ -27,7 +24,7 @@ "unifi-os-server", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1776249299, @@ -43,72 +40,29 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1790340521, + "narHash": "sha256-cRrWlIjVRJ6BHDr9caUdXsZ3owzWIKYHpNmGPHBInIU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "f5c082a40f7571c266e74e80ae2e68aadd8a9fc7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1786862985, - "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=", + "lastModified": 1790822859, + "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "github" }, "original": { @@ -157,32 +111,17 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "unifi-os-server": { "inputs": { "blueprint": "blueprint", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1783941815, - "narHash": "sha256-9S5fNoQpSipPSRijOhgB0JHsZlLQxJzEzgM8Ia9SJz4=", + "lastModified": 1790769259, + "narHash": "sha256-ljXAQbDER3+8Ja1G3RJQMxzFOko0w/4hi5BhLnaYmSc=", "owner": "rcambrj", "repo": "unifi-os-server", - "rev": "075e542294406a2f3449e06dab12765ce56958c3", + "rev": "5811d0cde711d517dab32e8c6f471287a5df8cf4", "type": "github" }, "original": { @@ -193,11 +132,11 @@ }, "vpn-confinement": { "locked": { - "lastModified": 1785142579, - "narHash": "sha256-WEPxDMiKt3uGVVu/aorHnIgYYW62mEq2Q+rlN3qH6bg=", + "lastModified": 1789394839, + "narHash": "sha256-trdjVJKmDBbzgbP8pd+R7iKbGkdRu0nmXgQlBR/hEiU=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "b3aa71a7edfe6af748c23729d1bdec3b499741ff", + "rev": "a21f66ccd9f644c3770ccdf287cb380c00192628", "type": "github" }, "original": { diff --git a/modules/security/ssh.nix b/modules/security/ssh.nix index 2945291..23d6697 100644 --- a/modules/security/ssh.nix +++ b/modules/security/ssh.nix @@ -13,9 +13,11 @@ AllowUsers = ["nick" "gitea"]; MaxAuthTries = 3; PerSourcePenalties = "crash:3600s authfail:3600s max:86400s"; + PerSourcePenaltyExemptList = "10.0.0.0/24"; }; }; users.users."nick".openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwouafzGDRGeMJQbm9ME/1CSkXicdL7TthJjWkhyLYd nick@Theseus" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdC37ZsslHOM7n3o92e9h8jyqbmm0ox18d40uGX4Duu nicknase27" ]; } diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 10c00cc..fe608ec 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -10,7 +10,7 @@ environmentFile = "/run/secrets/caddy.env"; package = pkgs.caddy.withPlugins { plugins = ["github.com/caddy-dns/cloudflare@v0.2.4"]; - hash = "sha256-7GoH8YLCoPmPExQxoga2FHB58zQDoZVf1BBwkVi0SsQ="; + hash = "sha256-Oirb6ZtU/c6C/SfICWpfBAEGDTepWShPQdWW0LlhF20="; }; globalConfig = '' email {$EMAIL} @@ -78,6 +78,11 @@ ''; serverAliases = ["watch.nicknase27.com"]; }; + "mc.nicknase27.com" = { + extraConfig = '' + reverse_proxy localhost:25565 + ''; + }; # Local "opn.nicknase27.com" = { diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix index 2e76af9..aaa9285 100644 --- a/modules/services/gitea.nix +++ b/modules/services/gitea.nix @@ -17,19 +17,6 @@ }; }; }; - - # Runner - # gitea-actions-runner = { - # instances.default = { - # enable = true; - # name = "hermes"; - # url = "https://git.nicknase27.com"; - # tokenFile = config.age.secrets.gitea-runner.path; - # labels = [ - # "ubuntu-latest:docker://node:20-bookworm" - # ]; - # }; - # }; }; age.secrets = { @@ -39,13 +26,8 @@ owner = "gitea"; group = "gitea"; }; - # gitea-runner = { - # file = ../../secrets/gitea-runner.age; - # path = "/run/secrets/gitea-runner"; - # owner = "gitea-runner"; - # group = "gitea-runner"; - # }; }; + networking.firewall = { allowedTCPPorts = [3000]; }; diff --git a/modules/services/navidrome.nix b/modules/services/navidrome.nix index 472375b..0bf6b41 100644 --- a/modules/services/navidrome.nix +++ b/modules/services/navidrome.nix @@ -3,8 +3,14 @@ lib, config, ... -}: { +}: let + discord-plugin-wasm = pkgs.pkgsCross.wasi32.navidromePlugins.discord-rich-presence; + navidrome-skip-tests = pkgs.navidrome.overrideAttrs (oldAttrs: { + doCheck = false; + }); +in { services.navidrome = { + package = navidrome-skip-tests; #Settings enable = true; openFirewall = true; @@ -30,12 +36,14 @@ EnableStarRating = true; DefaultUIVolume = 100; + LyricsPriority = "embedded,.lrc,.txt,.srt"; + LastFM.Enabled = true; }; #Plugins plugins = with pkgs.navidromePlugins; [ - discord-rich-presence + discord-plugin-wasm ]; #Environment diff --git a/modules/services/transmission.nix b/modules/services/transmission.nix index 57651f4..7fdecfe 100644 --- a/modules/services/transmission.nix +++ b/modules/services/transmission.nix @@ -1,7 +1,4 @@ -{ - config, - ... -}: { +{config, ...}: { # Define VPN network namespace vpnNamespaces.wg0 = { enable = true; diff --git a/modules/system/networking.nix b/modules/system/networking.nix index 251dab2..4fe01bd 100644 --- a/modules/system/networking.nix +++ b/modules/system/networking.nix @@ -5,6 +5,7 @@ firewall = { enable = true; trustedInterfaces = ["podman0" "docker0" "cni-podman0"]; + allowedTCPPorts = [25565]; }; nftables = { enable = true; diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 29fccc7..bdc5c52 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -9,5 +9,6 @@ alejandra nixd restic + jdk21 ]; } diff --git a/modules/system/users.nix b/modules/system/users.nix index c57d0df..3b59b44 100644 --- a/modules/system/users.nix +++ b/modules/system/users.nix @@ -10,7 +10,6 @@ eza yazi dysk - tmux btop fzf ripgrep diff --git a/secrets/wg0.age b/secrets/wg0.age index 9b0e956..a082bed 100644 Binary files a/secrets/wg0.age and b/secrets/wg0.age differ