diff --git a/flake.lock b/flake.lock index ba3e2f3..d7aa5c8 100644 --- a/flake.lock +++ b/flake.lock @@ -492,11 +492,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774237443, - "narHash": "sha256-4h/vWMOCvd0s5WK7DONqlljImbbKG55gmnVfBcxcFoY=", + "lastModified": 1774495900, + "narHash": "sha256-3nR7HKulLSib37PWcWrfELuSrikFLiTqAqX2HQ9dV7g=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "d17f058f96e7993b50879e871a742b3ed9a5f429", + "rev": "3e06fd5f99381f8101c8e7b5a1473154dd0095cd", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "openspec": "openspec" }, "locked": { - "lastModified": 1774231264, - "narHash": "sha256-Igcbq2IHBn+ZthttcFBI2/H8H8zh6pOJOG5LkPbmHYA=", + "lastModified": 1774490486, + "narHash": "sha256-EKS6eJ3FtKRnvPuHESwLb4wt7qksP6+uB0pMkr+4Epg=", "ref": "refs/heads/master", - "rev": "99d281fd4f5d5deb2487761194b4926b59e8d6cd", - "revCount": 185, + "rev": "0aa01e3738d3dc874df2471ac858ef5c0b96fc5b", + "revCount": 194, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -710,11 +710,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1774230720, - "narHash": "sha256-cFg5kIiLTt9mRjZuc6cu7W5ClVIyAgrtKEHGUwFaSKc=", + "lastModified": 1774490099, + "narHash": "sha256-5JVR0LHJFpW5xlsZbyVGdr9fEzNySXHz/e13At7GUOQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "127473ff3102f1d1c4804b54dc557a6a01d26a68", + "rev": "b957e2e2a4dd4ecc3a407241f501545b567e0c4c", "type": "github" }, "original": { @@ -790,11 +790,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -897,16 +897,16 @@ ] }, "locked": { - "lastModified": 1774222321, - "narHash": "sha256-JQsccVflS/GAjzguvZTLn7UH7tsou8yCSlaA48DVY10=", + "lastModified": 1774392635, + "narHash": "sha256-04eOIBHX9e8Brwn+uL/7q8szvRUilr4G0B8eB76dhKU=", "owner": "anomalyco", "repo": "opencode", - "rev": "eb3bfffad453f1c8c3f0f92bba0d8e34c83fa244", + "rev": "0dcdf5f529dced23d8452c9aa5f166abb24d8f7c", "type": "github" }, "original": { "owner": "anomalyco", - "ref": "v1.3.0", + "ref": "v1.3.2", "repo": "opencode", "type": "github" } diff --git a/flake.nix b/flake.nix index 121b103..a58eaf1 100644 --- a/flake.nix +++ b/flake.nix @@ -298,6 +298,18 @@ }; modules = [./home/users/produktion/AZPIPRODUKTION04.nix]; }; + "vertrieb@AZPIVERTRIEB01" = let + system = "aarch64-linux"; + in + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = { + inherit inputs outputs system; + hostname = "AZPIVERTRIEB01"; + username = "vertrieb"; + }; + modules = [./home/users/vertrieb/AZPIVERTRIEB01.nix]; + }; }; deploy.nodes = { AZ-CLD-1 = { diff --git a/home/features/desktop/theme.nix b/home/features/desktop/theme.nix index 8d00f5a..fc8915d 100644 --- a/home/features/desktop/theme.nix +++ b/home/features/desktop/theme.nix @@ -10,7 +10,7 @@ }; gtk = { enable = true; - theme = { + gtk4.theme = { name = "Dracula"; package = pkgs.dracula-theme; }; diff --git a/home/users/vertrieb/AZPIVERTRIEB01.nix b/home/users/vertrieb/AZPIVERTRIEB01.nix new file mode 100644 index 0000000..83bcbb8 --- /dev/null +++ b/home/users/vertrieb/AZPIVERTRIEB01.nix @@ -0,0 +1,19 @@ +{...}: { + imports = [ + ../../common + ../../common/pi-base.nix + ]; + wayland.windowManager.hyprland.settings = { + env = [ + "WEBAPP_URL,http://192.168.152.98:4711/login/Fertigung" + "HYPRCURSOR_THEME,rose-pine-hyprcursor" + "HYPRCURSOR_SIZE,32" + "WLR_NO_HARDWARE_CURSORS,1" + ]; + exec-once = [ + "chromium --app=$WEBAPP_URL" + ]; + monitor = [ + ]; + }; +} diff --git a/hosts/AZ-PRM-1/services/default.nix b/hosts/AZ-PRM-1/services/default.nix index 7522076..21edcc4 100644 --- a/hosts/AZ-PRM-1/services/default.nix +++ b/hosts/AZ-PRM-1/services/default.nix @@ -8,6 +8,7 @@ ./postgres.nix ./traefik.nix ]; + services.traefik.dynamicConfigOptions.http = { services.ptrg.loadBalancer.servers = [{url = "http://192.168.152.102:7784/";}]; @@ -18,12 +19,23 @@ entrypoints = "websecure"; }; - services.AZHA.loadBalancer.servers = [{url = "http://192.168.153.194:8123/";}]; + services.AZHA.loadBalancer.servers = [{url = "http://192.168.152.47:8123/";}]; routers.AZHA = { rule = "Host(`ha.l.az-gruppe.com`)"; tls = {certResolver = "ionos";}; service = "AZHA"; entrypoints = "websecure"; }; + services.AZDESK.loadBalancer.servers = [ + { + url = "https://azdesk.az-group.local:443/"; + } + ]; + routers.AZDESK = { + rule = "Host(`it-ticket.l.az-gruppe.com`)"; + tls = {certResolver = "ionos";}; + service = "AZDESK"; + entrypoints = "websecure"; + }; }; } diff --git a/hosts/AZ-PRM-1/services/traefik.nix b/hosts/AZ-PRM-1/services/traefik.nix index 956f906..0ac077c 100644 --- a/hosts/AZ-PRM-1/services/traefik.nix +++ b/hosts/AZ-PRM-1/services/traefik.nix @@ -3,6 +3,7 @@ enable = true; staticConfigOptions = { log = {level = "WARN";}; + serversTransport.insecureSkipVerify = true; certificatesResolvers = { ionos = { acme = { diff --git a/hosts/AZLT124-L/configuration.nix b/hosts/AZLT124-L/configuration.nix index 798c0d0..1bf4ded 100644 --- a/hosts/AZLT124-L/configuration.nix +++ b/hosts/AZLT124-L/configuration.nix @@ -15,7 +15,7 @@ boot.loader.systemd-boot.enable = true; boot.initrd.kernelModules = ["amdgpu" "hid_asus"]; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["pcie_aspm=off"]; + boot.kernelParams = ["pcie_aspm=off" "pcie_port_pm=off"]; boot.extraModprobeConfig = '' options hid_asus enable_touchpad=1 options mt7925e disable_aspm=1 @@ -25,7 +25,17 @@ security.polkit.enable = true; security.pam.services.gdm.enableGnomeKeyring = true; networking = { - wireless.iwd.enable = true; + wireless.iwd = { + enable = true; + settings = { + Settings = { + Timers = "DefaultRoamThreshold=30"; + }; + General = { + AddressRandomization = "network"; + }; + }; + }; networkmanager = { enable = true; wifi = { @@ -35,7 +45,24 @@ }; hostName = "AZLT124-L"; }; - + systemd.services.disable-wifi-powersave = { + description = "Disable WiFi power save"; + after = ["network-online.target" "iwd.service"]; + wants = ["network-online.target"]; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = '' + ${pkgs.bash}/bin/bash -c 'for i in {1..30}; do \ + ${pkgs.iw}/bin/iw dev wlan0 set power_save off 2>/dev/null && exit 0; \ + sleep 1; \ + done; exit 1' + ''; + Restart = "on-failure"; + RestartSec = "10s"; + }; + }; # Define your hostname. # warp-terminal update fix # networking.extraHosts = ''