diff --git a/flake.lock b/flake.lock index 20a7baf..47b89d2 100644 --- a/flake.lock +++ b/flake.lock @@ -433,16 +433,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1685451684, + "narHash": "sha256-Y5iqtWkO82gHAnrBvNu/yLQsiVNJRCad4wWGz2a1urk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "6b0edc9c690c1d8a729f055e0d73439045cfda55", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index acf3bc0..b20eaf0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration"; inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-22.11"; + nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; @@ -82,7 +82,7 @@ }; flake = { - checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; deploy = import ./machines/deploy.nix (inputs // { inherit inputs; diff --git a/machines/newton/configuration.nix b/machines/newton/configuration.nix index ad39993..2b91fbf 100644 --- a/machines/newton/configuration.nix +++ b/machines/newton/configuration.nix @@ -18,7 +18,7 @@ }; system = { - stateVersion = "22.11"; + stateVersion = "23.05"; autoUpgrade.enable = true; }; } diff --git a/machines/serverle/configuration.nix b/machines/serverle/configuration.nix index 422f903..e42a116 100644 --- a/machines/serverle/configuration.nix +++ b/machines/serverle/configuration.nix @@ -25,7 +25,7 @@ }; system = { - stateVersion = "22.11"; + stateVersion = "23.05"; autoUpgrade.enable = true; }; } diff --git a/machines/serverle/hardware-configuration.nix b/machines/serverle/hardware-configuration.nix index ff1ae08..d8c8351 100644 --- a/machines/serverle/hardware-configuration.nix +++ b/machines/serverle/hardware-configuration.nix @@ -28,7 +28,5 @@ }; # Kernel configuration kernelParams = [ "cma=64M" "console=tty0" ]; - # remove with 23.05 - kernelPackages = pkgs.unstable.linuxKernel.packages.linux_rpi4; }; } diff --git a/modules/services/gitea/default.nix b/modules/services/gitea/default.nix index fba6819..87d735f 100644 --- a/modules/services/gitea/default.nix +++ b/modules/services/gitea/default.nix @@ -18,9 +18,11 @@ in config = lib.mkIf cfg.enable { services.gitea = { enable = true; - httpPort = cfg.port; - rootUrl = "https://code.${domain}"; settings = { + server = { + HTTP_PORT = cfg.port; + ROOT_URL = "https://code.${domain}"; + }; session.COOKIE_SECURE = true; service.DISABLE_REGISTRATION = true; ui.DEFAULT_THEME = "arc-green"; diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix index e5802ab..18e4bee 100644 --- a/modules/services/nextcloud/default.nix +++ b/modules/services/nextcloud/default.nix @@ -53,7 +53,7 @@ in config = lib.mkIf cfg.enable { services.nextcloud = { enable = true; - package = pkgs.nextcloud25; + package = pkgs.nextcloud26; hostName = "cloud.${domain}"; maxUploadSize = cfg.maxSize; autoUpdateApps.enable = true; diff --git a/modules/services/ssh-server/default.nix b/modules/services/ssh-server/default.nix index b9acc42..c8834e1 100644 --- a/modules/services/ssh-server/default.nix +++ b/modules/services/ssh-server/default.nix @@ -13,8 +13,10 @@ in # Enable the OpenSSH daemon. enable = true; # Be more secure - permitRootLogin = "no"; - passwordAuthentication = false; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; }; # Opens the relevant UDP ports. diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix index c919bd8..6f99dd9 100644 --- a/modules/system/podman/default.nix +++ b/modules/system/podman/default.nix @@ -25,10 +25,9 @@ in dockerSocket.enable = true; # Allow DNS resolution in the default network - defaultNetwork.dnsname.enable = true; + defaultNetwork.settings.dns_enabled = true; - # TODO enable in NixOS 23.05 - # autoPrune.enable = true; + autoPrune.enable = true; }; }; } diff --git a/profiles/desktop-apps/default.nix b/profiles/desktop-apps/default.nix index f60f12c..d64d007 100644 --- a/profiles/desktop-apps/default.nix +++ b/profiles/desktop-apps/default.nix @@ -14,7 +14,7 @@ in ghostwriter (gimp-with-plugins.override { plugins = with gimpPlugins; [ - resynthesizer + # resynthesizer # disabled because broken with python3 ]; }) keepassxc diff --git a/profiles/desktop-dev/default.nix b/profiles/desktop-dev/default.nix index cdd35d2..198627f 100644 --- a/profiles/desktop-dev/default.nix +++ b/profiles/desktop-dev/default.nix @@ -30,13 +30,14 @@ in ms-azuretools.vscode-docker ms-python.python ms-vscode-remote.remote-ssh + equinusocio.vsc-material-theme ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "vsc-material-theme"; # TODO included in 23.05 - publisher = "Equinusocio"; - version = "33.8.0"; - sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; - } + # { + # name = "vsc-material-theme"; + # publisher = "Equinusocio"; + # version = "33.8.0"; + # sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; + # } ]; }) ]; diff --git a/profiles/sway/theme.nix b/profiles/sway/theme.nix index 07095d2..14208a8 100644 --- a/profiles/sway/theme.nix +++ b/profiles/sway/theme.nix @@ -21,6 +21,6 @@ in arc-kde-theme arc-theme ]; - qt5.platformTheme = "qt5ct"; + qt.platformTheme = "qt5ct"; }; }