summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/commandline/git.nix13
-rw-r--r--usecases/desktop/development.nix14
2 files changed, 10 insertions, 17 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 9cb07df..ca8a745 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -1,19 +1,6 @@
1_inputs: 1_inputs:
2{ config, pkgs, ... }: 2{ config, pkgs, ... }:
3{ 3{
4 environment = {
5 systemPackages = with pkgs; [
6 unstable.git-branchless
7 unstable.gitoxide
8 watchman
9 ];
10 shellAliases.git = "git-branchless wrap --";
11 };
12
13 programs.zsh.interactiveShellInit = ''
14 source ${../../dotfiles/git-branchless.zsh}
15 '';
16
17 home-manager.sharedModules = [ 4 home-manager.sharedModules = [
18 { 5 {
19 programs.git = { 6 programs.git = {
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 88e7491..4a524f5 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -82,6 +82,9 @@ in {
82 xh 82 xh
83 83
84 git-absorb 84 git-absorb
85 git-branchless
86 gitoxide
87 watchman
85 88
86 shfmt 89 shfmt
87 taplo 90 taplo
@@ -111,6 +114,13 @@ in {
111 python3 114 python3
112 ]; 115 ];
113 116
117 environment.shellAliases.git = "git-branchless wrap --";
118
119 programs.zsh.interactiveShellInit = ''
120 (( $+commands[rustc] )) && fpath+="$(rustc --print sysroot)/share/zsh/site-functions"
121 source ${../../dotfiles/git-branchless.zsh}
122 '';
123
114 vim = { 124 vim = {
115 extraPlugins = with vimPlugins; [ 125 extraPlugins = with vimPlugins; [
116 actions-preview-nvim 126 actions-preview-nvim
@@ -203,10 +213,6 @@ in {
203 ''; 213 '';
204 }; 214 };
205 215
206 programs.zsh.interactiveShellInit = ''
207 (( $+commands[rustc] )) && fpath+="$(rustc --print sysroot)/share/zsh/site-functions"
208 '';
209
210 programs.liboping.enable = true; 216 programs.liboping.enable = true;
211 217
212 documentation.dev.enable = true; 218 documentation.dev.enable = true;