diff --git a/flake.lock b/flake.lock index 4d773e3..968577d 100644 --- a/flake.lock +++ b/flake.lock @@ -506,16 +506,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1767325753, + "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 74702f9..0ef07cc 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; emanote.url = "github:srid/emanote"; emanote.inputs.emanote-template.follows = ""; @@ -30,7 +30,6 @@ modules = [ { nixpkgs.config.permittedInsecurePackages = [ - "forgejo-1.20.6-1-unstable-2024-04-18" "jitsi-meet-1.0.8792" ]; } diff --git a/nixos-apps/git.ewanick.com.nix b/nixos-apps/git.ewanick.com.nix index b9379ce..50bed3b 100644 --- a/nixos-apps/git.ewanick.com.nix +++ b/nixos-apps/git.ewanick.com.nix @@ -21,9 +21,10 @@ in }; services.gitea-actions-runner = { - package = pkgs.unstable.forgejo-runner; + package = pkgs.forgejo-runner; instances."linode-nixos" = { enable = true; + name = "Linode-Nixos"; url = baseUrl; tokenFile = ./git.ewanick.com/tokenFile; hostPackages = with pkgs; [ @@ -40,7 +41,7 @@ in ]; }; }; - systemd.services."gitea-runner-linode-nixos".serviceConfig.ReadWritePaths = "/var/www/example.com"; + systemd.services."gitea-runner-linode-nixos".serviceConfig.ReadWritePaths = "/var/www"; services.caddy = { enable = true; diff --git a/server-config/configuration.nix b/server-config/configuration.nix index a1673d6..e7c75b9 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -66,8 +66,8 @@ }; # Configure keymap in X11 - services.xserver.layout = "us"; - services.xserver.xkbOptions = "ctrl:swapcaps"; + services.xserver.xkb.layout = "us"; + services.xserver.xkb.options = "ctrl:swapcaps"; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.alice = {