From 41851ee975c1017aa693cff6f548cf68caa9bd20 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Tue, 21 Oct 2025 15:29:04 +0200
Subject: [PATCH] update git setup and add fallback to rebuild and update
 nextcloud to 32

---
 home-manager/desktop/default.nix               |  8 +++++---
 home-manager/hosts/shodan/lillian.nix          | 18 ++++++++++++++++--
 justfile                                       |  4 ++--
 .../package-configs/nextcloud/default.nix      |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix
index 2ee2b59..389c88f 100644
--- a/home-manager/desktop/default.nix
+++ b/home-manager/desktop/default.nix
@@ -239,9 +239,11 @@
     home-manager.enable = true;
     git = {
       enable = true;
-      userEmail = "git@lillianviolet.dev";
-      userName = "Lillian-Violet";
-      extraConfig = {
+      settings = {
+        user = {
+          name = "Lillian-Violet";
+          email = "git@lillianviolet.dev";
+        };
         init = {
           defaultBranch = "main";
         };
diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix
index 36cb8f6..f075b0f 100644
--- a/home-manager/hosts/shodan/lillian.nix
+++ b/home-manager/hosts/shodan/lillian.nix
@@ -100,8 +100,22 @@
     home-manager.enable = true;
     git = {
       enable = true;
-      userEmail = "git@lillianviolet.dev";
-      userName = "Lillian-Violet";
+      settings = {
+        user = {
+          name = "Lillian-Violet";
+          email = "git@lillianviolet.dev";
+        };
+        init = {
+          defaultBranch = "main";
+        };
+      };
+      ignores = [
+        "*.direnv"
+        "*.vscode"
+        ".envrc"
+        "venv"
+        "venv"
+      ];
       signing.format = "ssh";
     };
   };
diff --git a/justfile b/justfile
index dba9460..44b9a63 100644
--- a/justfile
+++ b/justfile
@@ -1,10 +1,10 @@
 # Build the nixos configuration and switch to it
 build:
-    sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json 
+    sudo echo "sudo check..." && sudo nixos-rebuild --fallback --log-format internal-json -v switch --flake .# --show-trace |& nom --json 
 
 # Build the nixos configuration bot don't switch to it until a reboot
 boot:
-    sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v boot --flake .# --show-trace |& nom --json 
+    sudo echo "sudo check..." && sudo nixos-rebuild --fallback --log-format internal-json -v boot --flake .# --show-trace |& nom --json 
 
 # Run the nix flake in the nix repl
 run:
diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix
index c1960ff..aff2c38 100644
--- a/nixos/server/package-configs/nextcloud/default.nix
+++ b/nixos/server/package-configs/nextcloud/default.nix
@@ -50,7 +50,7 @@
     enable = true;
     hostName = "nextcloud.gladtherescake.eu";
 
-    package = pkgs.nextcloud31;
+    package = pkgs.nextcloud32;
 
     # Use HTTPS for links
     https = true;