Compare commits
	
		
			2 commits
		
	
	
		
			e2467646d8
			...
			67904896a2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 67904896a2 | |||
| ba88e46046 | 
					 2 changed files with 11 additions and 1 deletions
				
			
		| 
						 | 
					@ -44,6 +44,7 @@
 | 
				
			||||||
    extraConfig = {
 | 
					    extraConfig = {
 | 
				
			||||||
      credential.helper = "cache";
 | 
					      credential.helper = "cache";
 | 
				
			||||||
      push.default = "simple";
 | 
					      push.default = "simple";
 | 
				
			||||||
 | 
					      push.forceIfIncludes = true;  # avoid accidental force overrides when remote is autofetched in background
 | 
				
			||||||
      init.defaultBranch = "mainline";
 | 
					      init.defaultBranch = "mainline";
 | 
				
			||||||
      diff.tool = "vimdiff";
 | 
					      diff.tool = "vimdiff";
 | 
				
			||||||
      merge.tool = "vimdiff";
 | 
					      merge.tool = "vimdiff";
 | 
				
			||||||
| 
						 | 
					@ -75,6 +76,16 @@
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					  programs.lazygit = {
 | 
				
			||||||
 | 
					    enable = true;
 | 
				
			||||||
 | 
					    settings = {
 | 
				
			||||||
 | 
					      git = {
 | 
				
			||||||
 | 
					        autoFetch = false;
 | 
				
			||||||
 | 
					        mainBranches = ["main" "master" "mainline"];
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
 | 
					      update.method = "never";
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # shell config
 | 
					  # shell config
 | 
				
			||||||
  programs.zsh = {
 | 
					  programs.zsh = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -106,7 +106,6 @@ let
 | 
				
			||||||
      ripgrep
 | 
					      ripgrep
 | 
				
			||||||
      fd
 | 
					      fd
 | 
				
			||||||
      gitui
 | 
					      gitui
 | 
				
			||||||
      lazygit
 | 
					 | 
				
			||||||
      pre-commit
 | 
					      pre-commit
 | 
				
			||||||
      scriv
 | 
					      scriv
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue