Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
containers.enable = true;
javascript.enable = true;
};
git.enableJujutsu = true;
graphite.enable = true;
jujutsu.enable = true;
utilities = {
file.enable = true;
media.enable = true;
Expand Down
1 change: 1 addition & 0 deletions modules/base/unfree-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"claude-code"
"daisydisk"
"fastscripts"
"graphite-cli"
"mochi"
"plexmediaserver"
"roon-server"
Expand Down
2 changes: 1 addition & 1 deletion modules/home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
./programs
./development.nix
./editor.nix
./git.nix
./scm.nix
./ssh.nix
./utilities.nix
];
Expand Down
47 changes: 36 additions & 11 deletions modules/home/git.nix → modules/home/scm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
}: let
inherit (lib) mkIf mkOption;

cfg = config.rc.git;
gitCfg = config.rc.git;
graphiteCfg = config.rc.graphite;
jjCfg = config.rc.jujutsu;
in {
options = {
rc.git = {
Expand All @@ -25,18 +27,19 @@ in {
description = "Whether to enable interactive rebase.";
type = lib.types.bool;
};
};

enableJujutsu = mkOption {
default = false;
example = true;
description = "Whether to enable jujutsu.";
type = lib.types.bool;
};
rc.graphite = {
enable = lib.mkEnableOption "Graphite CLI";
};

rc.jujutsu = {
enable = lib.mkEnableOption "Jujutsu version control";
};
};

config = lib.mkMerge [
(mkIf cfg.enable {
(mkIf gitCfg.enable {
home.packages = [
pkgs.onefetch
];
Expand Down Expand Up @@ -78,21 +81,43 @@ in {
};
})

(mkIf cfg.enableHubWrapper {
(mkIf gitCfg.enableHubWrapper {
home.packages = [pkgs.hub];

programs.zsh.shellAliases = {
git = "${lib.getExe' pkgs.hub "hub"}";
};
})

(mkIf cfg.enableInteractiveRebase {
(mkIf gitCfg.enableInteractiveRebase {
home.packages = [pkgs.git-interactive-rebase-tool];

programs.git.settings.sequence.editor = "interactive-rebase-tool";
})

(mkIf cfg.enableJujutsu {
(mkIf graphiteCfg.enable {
home.packages = [pkgs.graphite-cli];

home.activation.graphiteConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
config_dir="$HOME/.config/graphite"
config_file="$config_dir/user_config"
run mkdir -p "$config_dir"
if [ ! -f "$config_file" ]; then
run cp ${
pkgs.writeText "graphite-user-config" (builtins.toJSON {
branchPrefix = "corey/";
branchDate = false;
branchReplacement = "-";
skipApplyingPrefixToNonGeneratedBranchNames = true;
updateAutomatically = false;
})
} "$config_file"
run chmod u+w "$config_file"
fi
'';
})

(mkIf jjCfg.enable {
programs.jujutsu = {
enable = true;
};
Expand Down