diff --git a/.forgejo/workflows/main.yml b/.forgejo/workflows/main.yml index 1ab5969..3dcfe63 100644 --- a/.forgejo/workflows/main.yml +++ b/.forgejo/workflows/main.yml @@ -23,7 +23,7 @@ jobs: runs-on: kaylee continue-on-error: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install Nix uses: https://github.com/DeterminateSystems/nix-installer-action@main diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index 53023bc..c98ec65 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install Nix uses: https://github.com/DeterminateSystems/nix-installer-action@main diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index c8d2cde..2f5760e 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1764534535, + "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "784a83782ce00985bee65c588d4c315ec0b5a172", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1764534535, + "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "784a83782ce00985bee65c588d4c315ec0b5a172", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764405884, - "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=", + "lastModified": 1764488513, + "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f", + "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764399944, - "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=", + "lastModified": 1764485473, + "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", "owner": "YaLTeR", "repo": "niri", - "rev": "b35bcae35b3f9665043c335e55ed5828af77db85", + "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", "type": "github" }, "original": { @@ -466,16 +466,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 657fb04..e576e18 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -4,7 +4,7 @@ inputs = { # System configuration determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/dot_config/flake/machines/saffron/configuration.nix b/dot_config/flake/machines/saffron/configuration.nix index df6038d..7769e5b 100644 --- a/dot_config/flake/machines/saffron/configuration.nix +++ b/dot_config/flake/machines/saffron/configuration.nix @@ -49,6 +49,92 @@ reverse_proxy serenity.pizzly-bortle.ts.net:5600 ''; }; + virtualHosts."search.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:6000 + ''; + }; + virtualHosts."monitor.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:8090 + ''; + }; + virtualHosts."gitforge.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:3000 + ''; + }; + virtualHosts."ssh.gitforge.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:3022 + ''; + }; + virtualHosts."immich.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:2283 + ''; + }; + virtualHosts."nextcloud.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:8100 + ''; + }; + # virtualHosts."documentserver.mayoff.ca" = { + # extraConfig = '' + # tls { + # dns cloudflare {env.CLOUDFLARE_API_TOKEN} + # } + # reverse_proxy serenity.pizzly-bortle.ts.net:8101 + # ''; + # }; + virtualHosts."chat.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:8009 + ''; + }; + virtualHosts."media.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy serenity.pizzly-bortle.ts.net:8096 + ''; + }; + virtualHosts."homeassistant.mayoff.ca" = { + extraConfig = '' + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + reverse_proxy homeassistant.pizzly-bortle.ts.net:8123 { + header_up Host {upstream_hostport} + header_up X-Real-IP {remote_host} + header_up X-Forwarded-For {remote_host} + header_up X-Forwarded-Proto {scheme} + header_up X-Forwarded-Host {host} + } + ''; + }; }; # Set your time zone. diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index 1f10968..a86e691 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -40,7 +40,7 @@ trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; }; - programs.fw-fanctrl.enable = true; + hardware.fw-fanctrl.enable = true; # Enable networking networking.hostName = "wash"; @@ -133,7 +133,7 @@ services.flatpak.enable = true; services.power-profiles-daemon.enable = true; - services.logind.lidSwitch = "suspend-then-hibernate"; + services.logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate"; systemd.sleep.extraConfig = '' HibernateDelaySec=30m SuspendState=mem diff --git a/dot_config/flake/modules/nixos/android-studio.nix b/dot_config/flake/modules/nixos/android-studio.nix index 3e1ab9e..3f75887 100644 --- a/dot_config/flake/modules/nixos/android-studio.nix +++ b/dot_config/flake/modules/nixos/android-studio.nix @@ -6,6 +6,5 @@ programs.adb.enable = true; services.udev.packages = [ - pkgs.android-udev-rules ]; } diff --git a/dot_config/flake/modules/nixos/niri.nix b/dot_config/flake/modules/nixos/niri.nix index dc8548b..58faf78 100644 --- a/dot_config/flake/modules/nixos/niri.nix +++ b/dot_config/flake/modules/nixos/niri.nix @@ -9,7 +9,7 @@ programs.niri.package = pkgs.niri-unstable; - services.xserver.displayManager.gdm.enable = true; + services.displayManager.gdm.enable = true; niri-flake.cache.enable = true; programs.niri.enable = true; services.upower.enable = true;