diff --git a/flake.lock b/flake.lock index 84c138e..59d7617 100644 --- a/flake.lock +++ b/flake.lock @@ -450,36 +450,20 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", - "owner": "NixOS", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1754772842, diff --git a/flake.nix b/flake.nix index 63dea88..1e70a48 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-25.05"; + # nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager/master"; @@ -162,7 +162,6 @@ }; dalinar = nixpkgs-stable.lib.nixosSystem { inherit system; - pkgs = stable; specialArgs = { inherit inputs; }; modules = [ ./systems/dalinar/configuration.nix diff --git a/modules/base.nix b/modules/base.nix index 2152397..c3a7726 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -17,6 +17,8 @@ in { settings = { auto-optimise-store = true; }; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; }; + # nixpkgs.config.allowUnFree = true; + # pkgs.config.allowUnfree = true; system.autoUpgrade = { enable = true; diff --git a/systems/dalinar/configuration.nix b/systems/dalinar/configuration.nix index 28154c0..09c79bf 100644 --- a/systems/dalinar/configuration.nix +++ b/systems/dalinar/configuration.nix @@ -147,6 +147,7 @@ services.locate = { enable = true; package = pkgs.plocate; + localuser = null; }; # Enable the OpenSSH daemon. @@ -204,8 +205,6 @@ "vpnui.cochrun.xyz" "inv.cochrun.xyz" "tubesync.cochrun.xyz" - "amp.cochrun.xyz" - "workout.cochrun.xyz" ]; passwordFile = "/home/chris/ddclientp"; protocol = "namecheap"; @@ -289,11 +288,6 @@ reverse_proxy localhost:8123 ''; }; - virtualHosts = { - "amp.cochrun.xyz".extraConfig = '' - reverse_proxy localhost:4533 - ''; - }; virtualHosts = { "ai.cochrun.xyz".extraConfig = '' reverse_proxy localhost:11434 @@ -306,7 +300,7 @@ }; virtualHosts = { "inv.cochrun.xyz".extraConfig = '' - reverse_proxy http://127.0.0.1:3499 + reverse_proxy http://127.0.0.1:3000 ''; }; virtualHosts = { @@ -334,11 +328,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 @@ -384,12 +378,6 @@ }; }; - services.adguardhome = { - enable = true; - mutableSettings = true; - allowDHCP = true; - }; - systemd.services = { nextcloud-cron = { enable = true;