From 5e771a9c2c4c2c9739c9baf6eb0a85fdff0ea8a2 Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Tue, 29 Apr 2025 21:57:03 +0100
Subject: [PATCH] always pull before updating; commit lock file if changed; add
 inputs to gaming dev; change vscode repo names

---
 home-manager/base/terminal.nix      | 6 +++++-
 home-manager/development/games.nix  | 2 +-
 home-manager/development/vscode.nix | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix
index 569c781..d5e13f2 100644
--- a/home-manager/base/terminal.nix
+++ b/home-manager/base/terminal.nix
@@ -169,7 +169,11 @@ with lib;
           })
           (mkIf (flakeUpdateLocation != null) {
             pre_commands = {
-              nix-flake-update = "sudo nix flake update --flake ${flakeUpdateLocation}";
+              nix-flake-update = "${(pkgs.writeShellScriptBin "nix-flake-update" ''
+                git -C ${flakeUpdateLocation} pull --quiet 
+                sudo nix flake update --flake ${flakeUpdateLocation}
+                git -C ${flakeUpdateLocation} diff-index --quiet HEAD flake.lock || git -C ${flakeUpdateLocation} commit --quiet flake.lock -m "update flake.lock"
+              '')}/bin/nix-flake-update";
             };
           })];
       };
diff --git a/home-manager/development/games.nix b/home-manager/development/games.nix
index 10ff7fa..425a69a 100644
--- a/home-manager/development/games.nix
+++ b/home-manager/development/games.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   home.packages = with pkgs;[
diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix
index 58a9639..8f70bb8 100644
--- a/home-manager/development/vscode.nix
+++ b/home-manager/development/vscode.nix
@@ -1,8 +1,8 @@
 { inputs, pkgs, ... }:
 
 let
-  openvsx-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
-  vscode-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
+  openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
+  vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
 in
 {
   home.packages = with pkgs;[
@@ -16,7 +16,7 @@ in
       mutableExtensionsDir = false;
       enableUpdateCheck = false;
       enableExtensionUpdateCheck = false;
-      extensions = with vscode-extensions;[
+      extensions = with openvsx;[
         biomejs.biome
         mkhl.direnv
         dracula-theme.theme-dracula
@@ -34,7 +34,7 @@ in
         rust-lang.rust-analyzer
         tamasfe.even-better-toml
         mikestead.dotenv
-      ] ++ [ vscode-extensions.bradlc.vscode-tailwindcss ];
+      ] ++ [ vscode-marketplace.bradlc.vscode-tailwindcss ];
       userSettings = with pkgs;{
         "workbench.iconTheme" = "material-icon-theme";
         "window.titleBarStyle" = "custom";