From 73f8184b0587adff7dd59fac406cf8982ad70948 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Tue, 20 Jan 2026 16:50:44 +0000 Subject: [PATCH] jj-starship --- flake.lock | 99 ++++++++++++++++++++++++++++++++++++------- flake.nix | 5 ++- profiles/jujutsu.nix | 4 +- profiles/packages.nix | 2 + 4 files changed, 90 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 9219bd6..7911182 100644 --- a/flake.lock +++ b/flake.lock @@ -6,7 +6,7 @@ "llm-agents", "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1767386128, @@ -213,7 +213,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -231,7 +231,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -315,10 +333,29 @@ "type": "github" } }, + "jj-starship": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1768065230, + "narHash": "sha256-FCkDSxGJAge86r5xMzr2lV0pjslS8ZQ7vBNId0VDDi0=", + "owner": "dmmulroy", + "repo": "jj-starship", + "rev": "0fe6d62a83b6964f33cff2658b39a7563e42dd09", + "type": "github" + }, + "original": { + "owner": "dmmulroy", + "repo": "jj-starship", + "type": "github" + } + }, "llm-agents": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -338,7 +375,7 @@ "lumen": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -398,11 +435,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "type": "github" }, "original": { @@ -428,6 +465,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1768896952, "narHash": "sha256-cglpDO7t38CYHH76LCchDAOjZC08Cy+k+aM7S4C1NDM=", @@ -443,7 +496,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -459,7 +512,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1765934234, "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", @@ -478,8 +531,8 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" }, "locked": { "lastModified": 1768795384, @@ -505,10 +558,11 @@ "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "jj-ryu": "jj-ryu", + "jj-starship": "jj-starship", "llm-agents": "llm-agents", "lumen": "lumen", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "sops-nix": "sops-nix", "zjstatus": "zjstatus" @@ -648,6 +702,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -672,8 +741,8 @@ "zjstatus": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index b21ba54..1f678cd 100644 --- a/flake.nix +++ b/flake.nix @@ -44,9 +44,10 @@ url = "github:dmmulroy/jj-ryu"; flake = false; }; + jj-starship.url = "github:dmmulroy/jj-starship"; }; - outputs = inputs @ {flake-parts, ...}: + outputs = inputs @ {flake-parts, jj-starship, ...}: flake-parts.lib.mkFlake {inherit inputs;} ( let inherit (inputs.nixpkgs) lib; @@ -56,7 +57,7 @@ darwinHosts = ["chidi" "jason"]; nixosHosts = ["michael" "tahani"]; - overlays = import ./overlays {inherit inputs;}; + overlays = import ./overlays {inherit inputs;} ++ [jj-starship.overlays.default]; nixpkgsConfig = hostPlatform: { nixpkgs = {inherit hostPlatform overlays;}; }; diff --git a/profiles/jujutsu.nix b/profiles/jujutsu.nix index 1875f37..2dd6b28 100644 --- a/profiles/jujutsu.nix +++ b/profiles/jujutsu.nix @@ -1,6 +1,4 @@ -{pkgs, ...}: { - home.packages = [pkgs.jj-ryu]; - +{ programs.jujutsu = { enable = true; settings = { diff --git a/profiles/packages.nix b/profiles/packages.nix index d60a476..9c17445 100644 --- a/profiles/packages.nix +++ b/profiles/packages.nix @@ -27,6 +27,8 @@ with pkgs; hledger htop hyperfine + jj-ryu + jj-starship jq killall lsof