diff --git a/flake.lock b/flake.lock index 6d1eeb6..03e16c9 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1736366465, - "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1735979091, + "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1736085891, - "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", + "lastModified": 1735956190, + "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", + "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736283893, - "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -676,45 +676,29 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1736394720, - "narHash": "sha256-WHz4YZbGhsAthr+teG64E7PVmIZeD8S3OORVMVw5Br0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f3762b9c4b04856beec3d8ecb781df3c8aac7b04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -758,11 +742,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -803,11 +787,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736374433, - "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", + "lastModified": 1736112263, + "narHash": "sha256-tSYWCZhs21SVg+X6jQrHGchok3db6nqZ4vL+x2ySJWk=", "owner": "nix-community", "repo": "nixvim", - "rev": "83153e96c25d989020d028af51cf947aa843dc3c", + "rev": "7896856db1de897e95333aed381f06fa8788fff7", "type": "github" }, "original": { @@ -824,11 +808,11 @@ ] }, "locked": { - "lastModified": 1736141144, - "narHash": "sha256-B8+ufizwKxcsiim1JwGMWuBV0mzT21YTOWGJ8vB++Cg=", + "lastModified": 1736140611, + "narHash": "sha256-91LE62GlfXn4tjdwXyvv8YNTF/GZZ/Fyp1WoHDUKEAw=", "ref": "refs/heads/main", - "rev": "05677857384453abcccc4ea2a3b5273753673a4e", - "revCount": 99, + "rev": "8622e741a8271d21cecd2590d51e699fc566dd44", + "revCount": 98, "type": "git", "url": "https://git.sapphic.engineer/noe/noe.sh" }, @@ -922,7 +906,6 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", - "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", @@ -976,11 +959,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1736203741, - "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", + "lastModified": 1736064798, + "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", + "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", "type": "github" }, "original": { @@ -1062,11 +1045,11 @@ ] }, "locked": { - "lastModified": 1736115332, - "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7af1c49..895318b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,8 @@ # Nixpkgs (usually unstable) nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-master.url = "github:nixos/nixpkgs/master"; # Home manageKr home-manager = { diff --git a/nixos/hosts/pihole/default.nix b/nixos/hosts/pihole/default.nix index a8648ba..88e714e 100644 --- a/nixos/hosts/pihole/default.nix +++ b/nixos/hosts/pihole/default.nix @@ -3,7 +3,6 @@ ../../templates/proxmox-lxc.nix ../../server.nix ../../features/podman.nix - # ../../features/nginx.nix ]; networking.hostName = "pihole"; @@ -11,7 +10,7 @@ nixpkgs.hostPlatform = "x86_64-linux"; networking.firewall = { - allowedTCPPorts = [ 53 80 443 ]; + allowedTCPPorts = [ 53 80 ]; allowedUDPPorts = [ 53 ]; }; @@ -19,39 +18,20 @@ enable = false; }; - networking.nameservers = lib.mkForce [ - "2606:4700:4700::1111" - "2606:4700:4700::1001" - "1.1.1.1" - "1.0.0.1" + networking.nameservers = [ + "2606:4700:4700::1111#one.one.one.one" + "2606:4700:4700::1001#one.one.one.one" + "1.1.1.1#one.one.one.one" + "1.0.0.1#one.one.one.one" ]; - - # services.nginx = { - # virtualHosts."pihole.hoki-porgy.ts.net" = { - # listen = [ - # { addr = "0.0.0.0"; port = 443; ssl = true; } - # { addr = "[::]"; port = 443; ssl = true; } - # ]; - - - - # locations."/" = { - # recommendedProxySettings = true; - # proxyPass = "http://localhost:80"; - # }; - # }; - # }; virtualisation.oci-containers.containers = { pihole = { - image = "ghcr.io/pi-hole/pihole:nightly"; + image = "docker.io/pihole/pihole"; ports = [ "53:53/tcp" "53:53/udp" "80:80/tcp" - "443:443/tcp" - "67:67/tcp" - "67:67/udp" ]; volumes = [ "etc-pihole:/etc/pihole" @@ -61,9 +41,8 @@ TZ = config.time.timeZone; VIRTUAL_HOST = "pihole.hoki-porgy.ts.net"; PROXY_LOCATION = "pihole.hoki-porgy.ts.net"; - DNSMASQ_LISTENING = "all"; + # FTLCONF_LOCAL_IPV4 = config.networking.interfaces.tailscale0.ipv4.addresses[0].address; }; - extraOptions = ["--dns=127.0.0.1" "--dns=1.1.1.1" "--cap-add=NET_ADMIN"]; }; }; } diff --git a/nixos/hosts/plex/default.nix b/nixos/hosts/plex/default.nix index b4cb696..8b51be4 100644 --- a/nixos/hosts/plex/default.nix +++ b/nixos/hosts/plex/default.nix @@ -13,7 +13,6 @@ services.plex = { enable = true; openFirewall = true; - package = pkgs.master.plex; }; internal.nas0 = { diff --git a/nixos/hosts/seedbox/default.nix b/nixos/hosts/seedbox/default.nix index 81e03cd..eb72d02 100644 --- a/nixos/hosts/seedbox/default.nix +++ b/nixos/hosts/seedbox/default.nix @@ -17,5 +17,5 @@ nixpkgs.hostPlatform = "x86_64-linux"; internal.nas0.useSMB = true; - internal.nas0.lazyMount = true; + internal.nas0.lazyMount = false; } diff --git a/nixos/hosts/seedbox/www/index.html b/nixos/hosts/seedbox/www/index.html index a8313f3..c848db8 100644 --- a/nixos/hosts/seedbox/www/index.html +++ b/nixos/hosts/seedbox/www/index.html @@ -1,133 +1,9 @@ - -seedbox - - -
-
-

the seedbox

-
-
- -
📺
-
Shows & Anime
-
sonarr
- - -
🎥
-
Movies
-
radarr
- - -
🎶
-
Music
-
lidarr
- -
-
- -
Tracker Management
-
prowlarr
- - -
Torrent Client
-
transmission
- -
-
+

user: foxfox

+ diff --git a/overlays/default.nix b/overlays/default.nix index 81f5316..d39b19a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -27,7 +27,7 @@ config.allowUnfree = true; }; - master = import inputs.nixpkgs-master { + master = import inputs.nixpkgs-unstable { system = final.system; config.allowUnfree = true; };