Compare commits

..

No commits in common. "131c18230a1febb74c8a0d004eb79816a14cafdf" and "d6f2c33a0948feb0b2218b97471df1cd5553c465" have entirely different histories.

4 changed files with 13 additions and 28 deletions

View file

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

View file

@ -21,24 +21,6 @@ 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 = {
@ -74,7 +56,6 @@ 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,6 +5,7 @@ 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.nextcloud27; package = pkgs.nextcloud26;
hostName = hostName; hostName = hostName;
datadir = "/data/nextcloud"; datadir = "/data/nextcloud";
config = { config = {
@ -19,6 +19,7 @@ in
]; ];
}; };
caching.redis = true; caching.redis = true;
enableBrokenCiphersForSSE = false;
}; };
services.postgresql = { services.postgresql = {
@ -26,14 +27,16 @@ in
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
ensureDBOwnership = true; ensurePermissions = {
"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" ];
}; };