mirror of
https://github.com/Stunkymonkey/nixos.git
synced 2025-05-23 17:35:38 +02:00
update to nixos 23.05
This commit is contained in:
parent
337679971a
commit
bd978f6b03
12 changed files with 28 additions and 26 deletions
8
flake.lock
generated
8
flake.lock
generated
|
@ -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"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
|
||||
system = {
|
||||
stateVersion = "22.11";
|
||||
stateVersion = "23.05";
|
||||
autoUpgrade.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
};
|
||||
|
||||
system = {
|
||||
stateVersion = "22.11";
|
||||
stateVersion = "23.05";
|
||||
autoUpgrade.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -28,7 +28,5 @@
|
|||
};
|
||||
# Kernel configuration
|
||||
kernelParams = [ "cma=64M" "console=tty0" ];
|
||||
# remove with 23.05
|
||||
kernelPackages = pkgs.unstable.linuxKernel.packages.linux_rpi4;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ in
|
|||
ghostwriter
|
||||
(gimp-with-plugins.override {
|
||||
plugins = with gimpPlugins; [
|
||||
resynthesizer
|
||||
# resynthesizer # disabled because broken with python3
|
||||
];
|
||||
})
|
||||
keepassxc
|
||||
|
|
|
@ -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=";
|
||||
# }
|
||||
];
|
||||
})
|
||||
];
|
||||
|
|
|
@ -21,6 +21,6 @@ in
|
|||
arc-kde-theme
|
||||
arc-theme
|
||||
];
|
||||
qt5.platformTheme = "qt5ct";
|
||||
qt.platformTheme = "qt5ct";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue