Compare commits

...

2 commits

Author SHA1 Message Date
fruchti 131c18230a Rupert: Add changes for 23.11 2023-12-02 21:36:19 +01:00
fruchti f678ad57f8 Rupert: Add working video decoding HW acceleration 2023-12-02 21:35:50 +01:00
4 changed files with 28 additions and 13 deletions

View file

@ -38,7 +38,7 @@
xsel xsel
]; ];
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
vollkorn vollkorn
alegreya alegreya-sans alegreya alegreya-sans
b612 b612

View file

@ -21,6 +21,24 @@ in
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelParams = [ "acpi=force" "reboot=bios" ]; boot.kernelParams = [ "acpi=force" "reboot=bios" ];
boot.initrd.kernelModules = [ "i915" ];
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
};
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
(if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
libvdpau-va-gl
vaapiVdpau
# intel-media-driver
];
};
environment.variables = {
VDPAU_DRIVER = "va_gl";
};
hardware.cpu.intel.updateMicrocode = true;
networking.hostName = "Rupert"; networking.hostName = "Rupert";
users.users = { users.users = {
@ -56,6 +74,7 @@ in
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.config.common.default = "*";
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;

View file

@ -5,7 +5,6 @@ in
{ {
services.hedgedoc = { services.hedgedoc = {
enable = true; enable = true;
workDir = "/data/hedgedoc";
environmentFile = "/secrets/hedgedoc.env"; environmentFile = "/secrets/hedgedoc.env";
settings = { settings = {
port = 7000; port = 7000;

View file

@ -6,7 +6,7 @@ in
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
https = true; https = true;
package = pkgs.nextcloud26; package = pkgs.nextcloud27;
hostName = hostName; hostName = hostName;
datadir = "/data/nextcloud"; datadir = "/data/nextcloud";
config = { config = {
@ -19,7 +19,6 @@ in
]; ];
}; };
caching.redis = true; caching.redis = true;
enableBrokenCiphersForSSE = false;
}; };
services.postgresql = { services.postgresql = {
@ -27,16 +26,14 @@ in
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
ensurePermissions = { ensureDBOwnership = true;
"DATABASE nextcloud" = "ALL PRIVILEGES";
};
}
{
name = "superuser";
ensurePermissions = {
"ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
};
} }
# {
# name = "superuser";
# ensurePermissions = {
# "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
# };
# }
]; ];
ensureDatabases = [ "nextcloud" ]; ensureDatabases = [ "nextcloud" ];
}; };