From 01c5f09f4165ae11b09d86d046ead523fac40b84 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Thu, 5 May 2022 07:33:07 -0400
Subject: [PATCH] use git safe mechanic to fix doas git issue

---
 Makefile                    | 3 +--
 modules/desktop/i3.nix      | 2 +-
 modules/desktop/polybar.nix | 1 +
 modules/shell/git.nix       | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e426c26..2cfe100 100644
--- a/Makefile
+++ b/Makefile
@@ -41,5 +41,4 @@ python: brews
 
 nix:
 	git add -A
-	nixos-rebuild build --flake ".#desktop"
-	doas ./result/bin/switch-to-configuration switch
+	doas nixos-rebuild build --flake ".#desktop"
diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
index 5e504c9..833abcd 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/i3.nix
@@ -81,7 +81,7 @@
         };
         floating.modifier = modifier;
         focus = {
-          mouseWarping = true;
+          mouseWarping = false;
           newWindow = "urgent";
         };
         fonts = {
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index 1affba6..f3910ce 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -32,6 +32,7 @@
             width = "100%";
             height = "22pt";
             radius = 0;
+            # offset-y = -5;
             # offset-y = "5%";
             # dpi = 96;
             background = config.theme.colors.primary.background;
diff --git a/modules/shell/git.nix b/modules/shell/git.nix
index 9412cdd..5b68270 100644
--- a/modules/shell/git.nix
+++ b/modules/shell/git.nix
@@ -4,6 +4,11 @@ let home-packages = config.home-manager.users.${identity.user}.home.packages;
 
 in {
 
+  home-manager.users.root.programs.git = {
+    enable = true;
+    extraConfig.safe.directory = "/home/${identity.user}/dev/personal/dotfiles";
+  };
+
   home-manager.users.${identity.user} = {
     programs.git = {
       enable = true;
@@ -11,7 +16,7 @@ in {
       userEmail = identity.gitEmail;
       extraConfig = {
         pager = { branch = "false"; };
-        safe = { directory = builtins.toString ../../.; };
+        safe = { directory = "/home/${identity.user}/dev/personal/dotfiles"; };
         pull = { ff = "only"; };
       };
     };