From c92e49b5f9fda9ca2e861b32d8a71e35e72efe91 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 25 Aug 2025 10:08:54 -0500 Subject: [PATCH] updating dalinar --- flake.lock | 24 ++++++++++++++++++++---- flake.nix | 4 ++-- systems/dalinar/configuration.nix | 17 +++++++++-------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 59d7617..84c138e 100644 --- a/flake.lock +++ b/flake.lock @@ -450,16 +450,32 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1749086602, + "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "4792576cb003c994bd7cc1edada3129def20b27d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fc38e4b..63dea88 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; - # nixpkgs.follows = "nixos-cosmic/nixpkgs"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager/master"; diff --git a/systems/dalinar/configuration.nix b/systems/dalinar/configuration.nix index 36d0c77..28154c0 100644 --- a/systems/dalinar/configuration.nix +++ b/systems/dalinar/configuration.nix @@ -147,7 +147,6 @@ services.locate = { enable = true; package = pkgs.plocate; - localuser = null; }; # Enable the OpenSSH daemon. @@ -307,7 +306,7 @@ }; virtualHosts = { "inv.cochrun.xyz".extraConfig = '' - reverse_proxy http://127.0.0.1:3000 + reverse_proxy http://127.0.0.1:3499 ''; }; virtualHosts = { @@ -335,11 +334,11 @@ reverse_proxy localhost:9091 ''; }; - virtualHosts = { - "rtl.cochrun.xyz".extraConfig = '' - reverse_proxy localhost:3000 - ''; - }; + # virtualHosts = { + # "rtl.cochrun.xyz".extraConfig = '' + # reverse_proxy localhost:3000 + # ''; + # }; virtualHosts = { "prowlarr.cochrun.xyz".extraConfig = '' reverse_proxy localhost:9696 @@ -386,7 +385,9 @@ }; services.adguardhome = { - enabled = true; + enable = true; + mutableSettings = true; + allowDHCP = true; }; systemd.services = {