diff --git a/nixos-apps/git.ewanick.com.nix b/nixos-apps/git.ewanick.com.nix index 3c31616..a010757 100644 --- a/nixos-apps/git.ewanick.com.nix +++ b/nixos-apps/git.ewanick.com.nix @@ -2,10 +2,12 @@ services.gitea = { enable = true; appName = "Bill's Gitea server, hosted on Linode using NixOS"; - domain = "git.ewanick.com"; - rootUrl = "https://git.ewanick.com/"; - httpPort = 3000; settings = { + server = { + DOMAIN = "git.ewanick.com"; + ROOT_URL = "https://git.ewanick.com/"; + HTTP_PORT = 3000; + }; service = { DISABLE_REGISTRATION = true; }; diff --git a/server-config/configuration.nix b/server-config/configuration.nix index dd31430..46bc1f1 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -17,12 +17,11 @@ ../nixos-apps/jitsi.crueltysquad.com.nix ../nixos-apps/cutesealfanpage.love.nix ../nixos-apps/fancytypist.com.nix - ../nixos-apps/seal-blog + # ../nixos-apps/seal-blog ]; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; networking.usePredictableInterfaceNames = false; networking.hostName = "linode-nixos"; @@ -89,16 +88,18 @@ # Enable Nix-ld for remote VSCode SSH to work programs.nix-ld.enable = true; environment.variables = { - NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [ + NIX_LD_LIBRARY_PATH = lib.mkDefault (lib.makeLibraryPath [ pkgs.stdenv.cc.cc - ]; - NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; + ]); + NIX_LD = lib.mkDefault (lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"); }; # Enable the OpenSSH daemon. services.openssh = { enable = true; - permitRootLogin = "no"; + settings = { + PermitRootLogin = "no"; + }; }; # Open ports in the firewall. @@ -118,5 +119,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.11"; # Did you read the comment? + system.stateVersion = "23.05"; # Did you read the comment? } diff --git a/server-config/flake.lock b/server-config/flake.lock index 75c5e6b..7c3dfb2 100644 --- a/server-config/flake.lock +++ b/server-config/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1680865339, - "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", + "lastModified": 1687729501, + "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0040164e473509b4aee6aedb3b923e400d6df10b", + "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/server-config/flake.nix b/server-config/flake.nix index de4f9ae..c27197e 100644 --- a/server-config/flake.nix +++ b/server-config/flake.nix @@ -2,7 +2,7 @@ description = "System flake for Linode NixOS server"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; }; outputs = inputs@{ nixpkgs, ... }: