felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-05-24 01:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update to nixos 23.05

Browse source
This commit is contained in:
Felix Buehler 2023-06-01 00:09:26 +02:00
parent 337679971a
commit bd978f6b03
12 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -433,16 +433,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1685314633, "lastModified": 1685451684,
"narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", "narHash": "sha256-Y5iqtWkO82gHAnrBvNu/yLQsiVNJRCad4wWGz2a1urk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", "rev": "6b0edc9c690c1d8a729f055e0d73439045cfda55",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"type": "indirect" "type": "indirect"
} }
}, },

4
flake.nix
View file

@ -2,7 +2,7 @@
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
nix.url = "github:NixOS/nix"; nix.url = "github:NixOS/nix";
nixpkgs.url = "nixpkgs/nixos-22.11"; nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@ -82,7 +82,7 @@
}; };
flake = { 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 // { deploy = import ./machines/deploy.nix (inputs // {
inherit inputs; inherit inputs;

2
machines/newton/configuration.nix
View file

@ -18,7 +18,7 @@
}; };
system = { system = {
stateVersion = "22.11"; stateVersion = "23.05";
autoUpgrade.enable = true; autoUpgrade.enable = true;
}; };
} }

2
machines/serverle/configuration.nix
View file

@ -25,7 +25,7 @@
}; };
system = { system = {
stateVersion = "22.11"; stateVersion = "23.05";
autoUpgrade.enable = true; autoUpgrade.enable = true;
}; };
} }

2
machines/serverle/hardware-configuration.nix
View file

@ -28,7 +28,5 @@
}; };
# Kernel configuration # Kernel configuration
kernelParams = [ "cma=64M" "console=tty0" ]; kernelParams = [ "cma=64M" "console=tty0" ];
# remove with 23.05
kernelPackages = pkgs.unstable.linuxKernel.packages.linux_rpi4;
}; };
} }

6
modules/services/gitea/default.nix
View file

@ -18,9 +18,11 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.gitea = { services.gitea = {
enable = true; enable = true;
httpPort = cfg.port;
rootUrl = "https://code.${domain}";
settings = { settings = {
server = {
HTTP_PORT = cfg.port;
ROOT_URL = "https://code.${domain}";
};
session.COOKIE_SECURE = true; session.COOKIE_SECURE = true;
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
ui.DEFAULT_THEME = "arc-green"; ui.DEFAULT_THEME = "arc-green";

2
modules/services/nextcloud/default.nix
View file

@ -53,7 +53,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud25; package = pkgs.nextcloud26;
hostName = "cloud.${domain}"; hostName = "cloud.${domain}";
maxUploadSize = cfg.maxSize; maxUploadSize = cfg.maxSize;
autoUpdateApps.enable = true; autoUpdateApps.enable = true;

6
modules/services/ssh-server/default.nix
View file

@ -13,8 +13,10 @@ in
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
enable = true; enable = true;
# Be more secure # Be more secure
permitRootLogin = "no"; settings = {
passwordAuthentication = false; PermitRootLogin = "no";
PasswordAuthentication = false;
};
}; };
# Opens the relevant UDP ports. # Opens the relevant UDP ports.

5
modules/system/podman/default.nix
View file

@ -25,10 +25,9 @@ in
dockerSocket.enable = true; dockerSocket.enable = true;
# Allow DNS resolution in the default network # 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;
}; };
}; };
} }

2
profiles/desktop-apps/default.nix
View file

@ -14,7 +14,7 @@ in
ghostwriter ghostwriter
(gimp-with-plugins.override { (gimp-with-plugins.override {
plugins = with gimpPlugins; [ plugins = with gimpPlugins; [
resynthesizer # resynthesizer # disabled because broken with python3
]; ];
}) })
keepassxc keepassxc

13
profiles/desktop-dev/default.nix
View file

@ -30,13 +30,14 @@ in
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
ms-python.python ms-python.python
ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh
equinusocio.vsc-material-theme
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{ # {
name = "vsc-material-theme"; # TODO included in 23.05 # name = "vsc-material-theme";
publisher = "Equinusocio"; # publisher = "Equinusocio";
version = "33.8.0"; # version = "33.8.0";
sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; # sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM=";
} # }
]; ];
}) })
]; ];

2
profiles/sway/theme.nix
View file

@ -21,6 +21,6 @@ in
arc-kde-theme arc-kde-theme
arc-theme arc-theme
]; ];
qt5.platformTheme = "qt5ct"; qt.platformTheme = "qt5ct";
}; };
} }