From 19e63eea54b6541764c401369e70136b5194d654 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 10:42:48 +0100 Subject: [PATCH 1/8] Add direnv --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a048e25..86a6be5 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,6 +56,7 @@ home.packages = with pkgs; [ # Coding: + direnv git kate From ce29616895bcd8f0998386642e92585171d6c3bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:17:48 +0100 Subject: [PATCH 2/8] Maybe this user is breaking things? --- nixos/queen/mail-server.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 7a63eda..57f643b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,13 +20,13 @@ sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - users.users = { - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; - }; + # users.users = { + # virtualMail = { + # isSystemUser = true; + # isNormalUser = false; + # group = "virtualMail"; + # }; + # }; mailserver = { enable = true; From 1b2b7dc2a15aa5d804916acb72036068db177de9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:19:29 +0100 Subject: [PATCH 3/8] Group too? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8c49387..ff5a6f4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,7 +150,7 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; - users.groups.virtualMail = {}; + # users.groups.virtualMail = {}; users.users = { lillian = { From 0db4d00c8ced109973194d19f8dcd809b0fc71c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 09:54:34 +0100 Subject: [PATCH 4/8] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9740215..d8feb82 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702814335, - "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4dba0bd01956170667458be7b45f68170a63651", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702812162, - "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", + "lastModified": 1702937567, + "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", + "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", "type": "github" }, "original": { From 8988c584150d5008f7de0a9326cad2c3d08d95bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:04:24 +0100 Subject: [PATCH 5/8] Upgrade nextcloud 27 > 28 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ff5a6f4..4444710 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -95,7 +95,7 @@ aria2 git-filter-repo home-manager - nextcloud27 + nextcloud28 nginx noto-fonts noto-fonts-emoji-blob-bin From 3485993263943945105c7d7d04070f1498b4d331 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:05:54 +0100 Subject: [PATCH 6/8] Oops should add that there --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5768161..6b0e559 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,7 +48,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; # Use HTTPS for links https = true; From 0743acc51d029e03892ce46139cd25e77229b7a0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:07:32 +0100 Subject: [PATCH 7/8] Music is gone --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6b0e559..3fea0f6 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 55f4b4c12600e43195d17b9ee09c941523d65950 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:08:27 +0100 Subject: [PATCH 8/8] Let's just forget this for now eh --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3fea0f6..71d61da 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = {