From 6b2871b27f7f74df108b287b65cfde4551fb2520 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sun, 5 Jan 2025 15:37:18 +0000
Subject: [PATCH 1/3] qenya/vscode: insert newline at eof on save

---
 home/qenya/vscode.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index 107c116..d259be6 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -25,6 +25,7 @@ in
         "editor.formatOnSave" = false;
       };
       "extensions.autoUpdate" = false;
+      "files.insertFinalNewline" = true;
       "git.autofetch" = true;
       "git.confirmSync" = false;
       "git.enableSmartCommit" = true;

From 2cad2dd61477e472967a6448fec7f3a702016ec9 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sun, 5 Jan 2025 15:42:57 +0000
Subject: [PATCH 2/3] qenya/vscode: reformat to separate golang config

---
 home/qenya/vscode.nix | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index d259be6..91e7897 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -20,10 +20,6 @@ in
     ];
     mutableExtensionsDir = false;
     userSettings = {
-      "[go]" = {
-        "editor.defaultFormatter" = "golang.go";
-        "editor.formatOnSave" = false;
-      };
       "extensions.autoUpdate" = false;
       "files.insertFinalNewline" = true;
       "git.autofetch" = true;
@@ -31,6 +27,22 @@ in
       "git.enableSmartCommit" = true;
       "git.inputValidation" = true;
       "git.inputValidationSubjectLength" = null;
+      "javascript.updateImportsOnFileMove.enabled" = "always";
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "${pkgs.nil}/bin/nil";
+      "nix.serverSettings".nil = {
+        diagnostics.ignored = [ "unused_binding" "unused_with" ];
+        formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
+        nix.flake.autoArchive = true;
+      };
+      "terminal.integrated.allowChords" = false;
+      "terminal.integrated.defaultProfile.linux" = "zsh";
+      "workbench.colorTheme" = "Gruvbox Dark Medium";
+
+      "[go]" = {
+        "editor.defaultFormatter" = "golang.go";
+        "editor.formatOnSave" = false;
+      };
       "go.alternateTools" = {
         "go" = "${pkgs.go}/bin/go";
         "golangci-lint" = "${pkgs.golangci-lint}/bin/golangci-lint";
@@ -44,17 +56,6 @@ in
         "formatting.gofumpt" = true;
         "ui.semanticTokens" = true;
       };
-      "javascript.updateImportsOnFileMove.enabled" = "always";
-      "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "${pkgs.nil}/bin/nil";
-      "nix.serverSettings".nil = {
-        diagnostics.ignored = [ "unused_binding" "unused_with" ];
-        formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
-        nix.flake.autoArchive = true;
-      };
-      "terminal.integrated.allowChords" = false;
-      "terminal.integrated.defaultProfile.linux" = "zsh";
-      "workbench.colorTheme" = "Gruvbox Dark Medium";
     };
   };
 }

From 08e09ce55bc9eb63f68a83ae81d62934cc503b43 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sun, 5 Jan 2025 15:43:49 +0000
Subject: [PATCH 3/3] tohru: re-enable nix gc (but not nix optimise)

---
 hosts/tohru/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index e4f9c8e..3bb4c52 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -26,9 +26,8 @@ in
   console.keyMap = "uk";
   services.xserver.xkb.layout = "gb";
 
-  # tohru does not have the resources to run these under other load and is generally powered off when not in use.
-  # instead, just run `nix-collect-garbage -d` and `nix-store --optimise` every so often.
-  nix.gc.automatic = mkForce false;
+  # tohru does not have the resources to run this under other load and is generally powered off when not in use.
+  # instead, just run `nix-store --optimise` every so often.
   nix.optimise.automatic = mkForce false;
 
   fountain.users.qenya.enable = true;