noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-26 16:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use git safe mechanic to fix doas git issue

Browse Source
This commit is contained in:
Noah Masur 2022-05-05 07:33:07 -04:00
parent f2d01ec575
commit 01c5f09f41
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -41,5 +41,4 @@ python: brews
nix: nix:
git add -A git add -A
nixos-rebuild build --flake ".#desktop" doas nixos-rebuild build --flake ".#desktop"
doas ./result/bin/switch-to-configuration switch

2
modules/desktop/i3.nix
View File

@ -81,7 +81,7 @@
}; };
floating.modifier = modifier; floating.modifier = modifier;
focus = { focus = {
mouseWarping = true; mouseWarping = false;
newWindow = "urgent"; newWindow = "urgent";
}; };
fonts = { fonts = {

1
modules/desktop/polybar.nix
View File

@ -32,6 +32,7 @@
width = "100%"; width = "100%";
height = "22pt"; height = "22pt";
radius = 0; radius = 0;
# offset-y = -5;
# offset-y = "5%"; # offset-y = "5%";
# dpi = 96; # dpi = 96;
background = config.theme.colors.primary.background; background = config.theme.colors.primary.background;

7
modules/shell/git.nix
View File

@ -4,6 +4,11 @@ let home-packages = config.home-manager.users.${identity.user}.home.packages;
in { in {
home-manager.users.root.programs.git = {
enable = true;
extraConfig.safe.directory = "/home/${identity.user}/dev/personal/dotfiles";
};
home-manager.users.${identity.user} = { home-manager.users.${identity.user} = {
programs.git = { programs.git = {
enable = true; enable = true;
@ -11,7 +16,7 @@ in {
userEmail = identity.gitEmail; userEmail = identity.gitEmail;
extraConfig = { extraConfig = {
pager = { branch = "false"; }; pager = { branch = "false"; };
safe = { directory = builtins.toString ../../.; }; safe = { directory = "/home/${identity.user}/dev/personal/dotfiles"; };
pull = { ff = "only"; }; pull = { ff = "only"; };
}; };
}; };