From eac9c4b67d7ec7810bf1b2dd21a44efa2b8df97f Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 4 Feb 2026 22:05:56 -0600 Subject: [PATCH] http1 traefik --- flake.lock | 37 ------------------- flake.nix | 8 ++-- .../nixos@iso-minimal/default.nix | 18 +++++++++ .../x86_64-linux/root@iso-minimal/default.nix | 18 +++++++++ modules/nixos/services/traefik/default.nix | 11 ++++++ .../x86_64-install-iso/graphical/default.nix | 6 ++- .../iso-minimal}/default.nix | 15 ++++++-- 7 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 homes/x86_64-linux/nixos@iso-minimal/default.nix create mode 100644 homes/x86_64-linux/root@iso-minimal/default.nix rename systems/{x86_64-install-iso/minimal => x86_64-linux/iso-minimal}/default.nix (82%) diff --git a/flake.lock b/flake.lock index 5c9dd7d..f4327fb 100644 --- a/flake.lock +++ b/flake.lock @@ -841,21 +841,6 @@ "type": "github" } }, - "nixlib_2": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat_4", @@ -897,27 +882,6 @@ "type": "github" } }, - "nixos-generators_2": { - "inputs": { - "nixlib": "nixlib_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769813415, - "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "8946737ff703382fda7623b9fab071d037e897d5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1769302137, @@ -1346,7 +1310,6 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixai": "nixai", "nixos-apple-silicon": "nixos-apple-silicon", - "nixos-generators": "nixos-generators_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_11", "nixpkgs-otbr": "nixpkgs-otbr", diff --git a/flake.nix b/flake.nix index d46eda9..439909d 100644 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nixos-generators = { + # url = "github:nix-community/nixos-generators"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; impermanence.url = "github:nix-community/impermanence"; diff --git a/homes/x86_64-linux/nixos@iso-minimal/default.nix b/homes/x86_64-linux/nixos@iso-minimal/default.nix new file mode 100644 index 0000000..281b2f1 --- /dev/null +++ b/homes/x86_64-linux/nixos@iso-minimal/default.nix @@ -0,0 +1,18 @@ +{ + lib, + namespace, + ... +}: +let + inherit (lib.${namespace}) disabled; +in +{ + home.username = "root"; + services = { + nextcloud-client = lib.mkForce disabled; + kdeconnect = { + enable = false; + indicator = false; + }; + }; +} diff --git a/homes/x86_64-linux/root@iso-minimal/default.nix b/homes/x86_64-linux/root@iso-minimal/default.nix new file mode 100644 index 0000000..281b2f1 --- /dev/null +++ b/homes/x86_64-linux/root@iso-minimal/default.nix @@ -0,0 +1,18 @@ +{ + lib, + namespace, + ... +}: +let + inherit (lib.${namespace}) disabled; +in +{ + home.username = "root"; + services = { + nextcloud-client = lib.mkForce disabled; + kdeconnect = { + enable = false; + indicator = false; + }; + }; +} diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index 6e2fbc7..9db99a5 100755 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -202,6 +202,16 @@ in dynamicConfigOptions = { http = { + serversTransports = { + internal-https = { + insecureSkipVerify = true; + }; + http1 = { + serverName = "localhost"; + disableHTTP2 = true; + }; + }; + middlewares = { authentik = { forwardAuth = { @@ -282,6 +292,7 @@ in url = cacheUrl; } ]; + serversTransport = "http1"; }; hass.loadBalancer.servers = [ { diff --git a/systems/x86_64-install-iso/graphical/default.nix b/systems/x86_64-install-iso/graphical/default.nix index a372d9f..3dcc501 100644 --- a/systems/x86_64-install-iso/graphical/default.nix +++ b/systems/x86_64-install-iso/graphical/default.nix @@ -40,7 +40,7 @@ # ################################################### network = { - hostName = "nuc-nixos"; + hostName = "nixos"; firewall = { enable = true; allowPing = true; @@ -62,11 +62,13 @@ # ################################################### user = { - name = "admin"; + name = "nixos"; linger = true; }; }; + home-manager.users.nixos.snowfallorg.user.name = "nixos"; + # ################################################### # # Boot # # # ################################################### diff --git a/systems/x86_64-install-iso/minimal/default.nix b/systems/x86_64-linux/iso-minimal/default.nix similarity index 82% rename from systems/x86_64-install-iso/minimal/default.nix rename to systems/x86_64-linux/iso-minimal/default.nix index e008112..4250c7f 100644 --- a/systems/x86_64-install-iso/minimal/default.nix +++ b/systems/x86_64-linux/iso-minimal/default.nix @@ -34,7 +34,7 @@ # ################################################### network = { - hostName = "nuc-nixos"; + hostName = "nixos"; firewall = { enable = true; allowPing = true; @@ -56,17 +56,26 @@ # ################################################### user = { - name = "admin"; + name = "nixos"; linger = true; }; }; + specialisation.graphical.configuation = { + # ################################################### + # # Desktop # # + # ################################################### + ${namespace}.desktop.cosmic.enable = true; + }; + + # home-manager.users.nixos.snowfallorg.user.name = "nixos"; + # ################################################### # # Boot # # # ################################################### boot = { - kernelPackages = lib.mkForce pkgs.${namespace}.linuxPackages_cachyos-server-lto-znver4; + kernelPackages = lib.mkForce pkgs.${namespace}.linuxPackages_cachyos-server-lto; supportedFilesystems.zfs = false; };