From c8a2a72ff4b26151bcb51f1284d18666bb91a3b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:20:45 +0100 Subject: [PATCH] Downgrade, this doesn't work --- flake.lock | 36 +++++++++++++++++------------------ nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 30 +++++++++++++++-------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 55be82d..e179486 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700814342, - "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..6da76f1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,22 +93,24 @@ services.postgresql = { enable = true; + package = pkgs.postgresql; + # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = {