From c95b071af6a27239c835e4d3f8a397487eff0a15 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 15 Jun 2023 11:54:29 +0200 Subject: [PATCH 1/4] Upgrade stable nixpkgs to 23.05 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c11f335..669012b 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Configuration for Everest"; inputs = { -nixpkgs.url = "nixpkgs/nixos-22.11"; +nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; agenix = { From 31c2c681c73b2c74570df431e635be3f79fb18cc Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 15 Jun 2023 12:41:51 +0200 Subject: [PATCH 2/4] Upgrade stable home-manager to 23.05 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 669012b..8c8c19f 100755 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ agenix = { }; }; -home-manager.url = "github:nix-community/home-manager/release-22.11"; +home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-impermanence.url = "github:nix-community/impermanence"; From dd1c2b3cabc827b685f800a42ec5607ba2c748f5 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 15 Jun 2023 13:07:37 +0200 Subject: [PATCH 3/4] Rename deprecated options --- roles/server/gitea.nix | 8 +++++--- roles/server/ssh.nix | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/roles/server/gitea.nix b/roles/server/gitea.nix index ae5cbb7..40c8cb9 100644 --- a/roles/server/gitea.nix +++ b/roles/server/gitea.nix @@ -5,10 +5,12 @@ services.gitea = { enable = true; # TODO: Make this not be hardcoded - rootUrl = "http://everest.local:3000"; settings = { - #server.SSH_PORT = 69; - service.DISABLE_REGISTRATION = lib.mkDefault true; + server = { + #server.SSH_PORT = 69; + DISABLE_REGISTRATION = lib.mkDefault true; + ROOT_URL = "http://everest.local:3000"; + }; }; }; networking.firewall = { diff --git a/roles/server/ssh.nix b/roles/server/ssh.nix index fd19c30..576cd3b 100755 --- a/roles/server/ssh.nix +++ b/roles/server/ssh.nix @@ -3,8 +3,10 @@ { services.openssh = { enable = true; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; startWhenNeeded = true; - permitRootLogin = "no"; - passwordAuthentication = false; }; } From 541604355197d28689c0e8e5c6a5c4820b9bcef4 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 15 Jun 2023 13:59:36 +0200 Subject: [PATCH 4/4] Upgrade stateVersion to 23.05 --- machines/Everest/configuration.nix | 2 +- roles/common/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix index b349e46..5b6d2fe 100755 --- a/machines/Everest/configuration.nix +++ b/machines/Everest/configuration.nix @@ -76,7 +76,7 @@ useGlobalPkgs = true; users.toast = { config, ... }: { home = { - stateVersion = "22.11"; + stateVersion = "23.05"; file = { # This symlinks the Transmission downloads folder into my user's downloads folder for easy access "Downloads/Transmission".source = config.lib.file.mkOutOfStoreSymlink "/var/lib/transmission/Downloads"; diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 34901b3..96b3b9e 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -47,5 +47,5 @@ }; }; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; }