From e8254358c4c278562c81322ee2562830fd856fb1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 7 Sep 2024 10:33:43 +0200 Subject: common/git: move git-branchless and gitoxide to development those are unstable packages, so not really suited for prod --- common/commandline/git.nix | 13 ------------- usecases/desktop/development.nix | 14 ++++++++++---- 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 @@ _inputs: { config, pkgs, ... }: { - environment = { - systemPackages = with pkgs; [ - unstable.git-branchless - unstable.gitoxide - watchman - ]; - shellAliases.git = "git-branchless wrap --"; - }; - - programs.zsh.interactiveShellInit = '' - source ${../../dotfiles/git-branchless.zsh} - ''; - home-manager.sharedModules = [ { 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 { xh git-absorb + git-branchless + gitoxide + watchman shfmt taplo @@ -111,6 +114,13 @@ in { python3 ]; + environment.shellAliases.git = "git-branchless wrap --"; + + programs.zsh.interactiveShellInit = '' + (( $+commands[rustc] )) && fpath+="$(rustc --print sysroot)/share/zsh/site-functions" + source ${../../dotfiles/git-branchless.zsh} + ''; + vim = { extraPlugins = with vimPlugins; [ actions-preview-nvim @@ -203,10 +213,6 @@ in { ''; }; - programs.zsh.interactiveShellInit = '' - (( $+commands[rustc] )) && fpath+="$(rustc --print sysroot)/share/zsh/site-functions" - ''; - programs.liboping.enable = true; documentation.dev.enable = true; -- cgit v1.2.3