From 51c2a6b58b6db83fd3e570c2e82db6bfdfcc34ae Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 15 Nov 2025 08:36:45 +0100
Subject: Desktop changes

---
 modules/software-templates/devenv/dotnet.nix     | 12 ++++++------
 modules/software-templates/devenv/javascript.nix |  4 ++--
 modules/users/Rory.nix                           |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/software-templates/devenv/dotnet.nix b/modules/software-templates/devenv/dotnet.nix
index 20c7d34..8e1ee0c 100644
--- a/modules/software-templates/devenv/dotnet.nix
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -8,18 +8,18 @@
 let
   # We have to specify config to set allowUnfree, as nixpkgs-stable.legacyPackages doesn't pass through config.
   # See: https://slab.midna.dev/public/posts/where-does-pkgs-come-from-xw6epo0t
-  stablePkgs = import nixpkgs-stable {
-    config = config.nixpkgs.config;
-    system = pkgs.stdenv.hostPlatform.system;
-  };
+  #stablePkgs = import nixpkgs-stable {
+  #  config = config.nixpkgs.config;
+  #  system = pkgs.stdenv.hostPlatform.system;
+  #};
 in
 {
   #imports = [ ./dotnet.nix ];
   environment.systemPackages = with pkgs; [
     #`jetbrains.rider
     (jetbrains.plugins.addPlugins jetbrains.rider [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
+#      jetbrains.plugins.github-copilot-fixed
+      "github-copilot"
       "nixidea"
     ])
     dotnetCorePackages.sdk_10_0
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
index 66a98c9..ff28dbb 100644
--- a/modules/software-templates/devenv/javascript.nix
+++ b/modules/software-templates/devenv/javascript.nix
@@ -3,8 +3,8 @@
 {
   environment.systemPackages = with pkgs; [
     (jetbrains.plugins.addPlugins jetbrains.webstorm [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
+#      jetbrains.plugins.github-copilot-fixed
+      "github-copilot"
     ])
     nodejs_24
   ];
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index cac733f..c56c3ed 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -75,6 +75,7 @@
           user.name = "Rory&";
           user.email = "root@rory.gay";
           safe.directory = "/";
+          advice.defaultBranchName = false;
         };
       };
       zsh = {
-- 
cgit 1.5.1