From 96be0211f3d21866ed00dae2ee12b9b5022ff71d Mon Sep 17 00:00:00 2001
From: Abhinav Sarkar <abhinav@abhinavsarkar.net>
Date: Sat, 14 Sep 2024 09:23:05 +0530
Subject: [PATCH] Minor additions

---
 homebrew.nix     | 1 +
 nix.nix          | 7 +++++++
 programs/git.nix | 4 ++++
 system.nix       | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/homebrew.nix b/homebrew.nix
index ac24834..358cf64 100644
--- a/homebrew.nix
+++ b/homebrew.nix
@@ -28,6 +28,7 @@
       "telegram"
       "utm"
       "vlc"
+      "zed"
     ];
     masApps = {
       Amphetamine = 937984704;
diff --git a/nix.nix b/nix.nix
index d0ae236..5b5a8c6 100644
--- a/nix.nix
+++ b/nix.nix
@@ -33,6 +33,13 @@ in {
       min-free = 128000000;
       warn-dirty = false;
       trusted-users = [ "@admin" ];
+      trusted-substituters =
+        [ "https://cache.nixos.org" "https://nix-community.cachix.org" ];
+
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
     };
     distributedBuilds = true;
     linux-builder = {
diff --git a/programs/git.nix b/programs/git.nix
index 1241cf2..0de540d 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -50,6 +50,10 @@
         ff = "only";
         rebase = true;
       };
+      rebase.autoStash = true;
+      core = {
+        editor = "micro";
+	    };
       merge.conflictstyle = "diff3";
     };
 
diff --git a/system.nix b/system.nix
index 2faef74..75fdd1b 100644
--- a/system.nix
+++ b/system.nix
@@ -3,6 +3,10 @@
   system = {
     checks.verifyNixChannels = true;
     defaults = {
+      loginwindow = {
+        GuestEnabled = false;
+        DisableConsoleAccess = true;
+      };
       dock = {
         appswitcher-all-displays = false;
         autohide = true;