diff --git a/flake.lock b/flake.lock index aca2194..c6a12f8 100644 --- a/flake.lock +++ b/flake.lock @@ -50,28 +50,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "starship-jj", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1768113825, - "narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=", - "owner": "nix-community", - "repo": "fenix", - "rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -124,27 +102,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "starship-jj", - "systems" - ] - }, - "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" - } - }, "ghostty": { "inputs": { "flake-compat": "flake-compat", @@ -154,11 +111,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1773642602, - "narHash": "sha256-WX66DS0cs6sRutHhJqSGYHrffpszsgmJsl+O7kl4Hjs=", + "lastModified": 1773684397, + "narHash": "sha256-ZrK7IhL7VjR2iwWbAAalieM+ZlDxWjdncxkjaMSzuvQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "600f59ae313adf377c0bf0d754fa258257f5f65f", + "rev": "2318e18df3577151f8c1fd130bd6b698e8ffde21", "type": "github" }, "original": { @@ -217,11 +174,11 @@ ] }, "locked": { - "lastModified": 1773608492, - "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", + "lastModified": 1773681856, + "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", + "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce", "type": "github" }, "original": { @@ -283,11 +240,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773646853, - "narHash": "sha256-9xzEP9ExGPYOg9Oa4CCQo3kGCwxVQ9oSjmB897XWiF0=", + "lastModified": 1773675540, + "narHash": "sha256-P4S7I15rxuJ+Iq7F4Z1OrMAcZaJEiIasYNioiJjc4/s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7b3fd75b0a117bc247cb5183ed22cf7d5e3e135a", + "rev": "9061fa226d41fceec5bcec72e0e7ee2282b5645e", "type": "github" }, "original": { @@ -366,11 +323,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1773524153, - "narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", + "lastModified": 1773610124, + "narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", + "rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5", "type": "github" }, "original": { @@ -382,11 +339,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773579282, - "narHash": "sha256-LWvZj9Bvm1EuoO6zbX4yjZebwnZNfeTbmCJGS7RGQ3Y=", + "lastModified": 1773646010, + "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a88de74db0e948139be4b46f9a94d64aa11391c", + "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", "type": "github" }, "original": { @@ -425,22 +382,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -449,11 +390,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773628930, - "narHash": "sha256-30B1aEHVLdrsiGZOj8X2riKhb7i6p92+DTTNNdWMJsg=", + "lastModified": 1773670009, + "narHash": "sha256-LEiA7ntxR6Biep4fgD2Jh9bB1g2olRNAToFUS51szDs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1b2ec2e4a289bf71dc48b95d3c2ba04a8b50a717", + "rev": "9511f1fce45ffe763d7954f3207e3dfd644c97f2", "type": "github" }, "original": { @@ -522,25 +463,7 @@ "nixpkgs": "nixpkgs_3", "noctalia": "noctalia", "sops-nix": "sops-nix", - "ssh-keys": "ssh-keys", - "starship-jj": "starship-jj" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1768083390, - "narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" + "ssh-keys": "ssh-keys" } }, "rust-overlay": { @@ -596,27 +519,6 @@ "url": "https://github.com/karitham.keys" } }, - "starship-jj": { - "inputs": { - "fenix": "fenix", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1771062192, - "narHash": "sha256-gOGLVeKtoWJrcaESPfULDnohntqBe+hzBhvDiF935Cs=", - "owner": "lanastara_foss", - "repo": "starship-jj", - "rev": "e2fe1544fe92198427a1fcc1dfad9dbccf93ce79", - "type": "gitlab" - }, - "original": { - "owner": "lanastara_foss", - "repo": "starship-jj", - "type": "gitlab" - } - }, "systems": { "flake": false, "locked": { @@ -648,21 +550,6 @@ "type": "github" } }, - "systems_3": { - "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": "nixpkgs_4" diff --git a/flake.nix b/flake.nix index decd445..2807fc1 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,6 @@ url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; - starship-jj.url = "gitlab:lanastara_foss/starship-jj"; ssh-keys = { url = "https://github.com/karitham.keys"; flake = false; diff --git a/modules/dev/shell/starship.nix b/modules/dev/shell/starship.nix index 365c752..44bd4ae 100644 --- a/modules/dev/shell/starship.nix +++ b/modules/dev/shell/starship.nix @@ -1,80 +1,12 @@ { config, - inputs', + pkgs, lib, ... }: { config = lib.mkIf config.dev.shell.enable { - xdg.configFile."starship-jj/starship-jj.toml".text = '' - "$schema"="https://gitlab.com/Lanastara/lanastara_foss/-/raw/v0.3.0/schema.json?ref_type=tags" - module_separator = " " - timeout = 1000 - [bookmarks] - search_depth = 100 - exclude = [] - - [[module]] - type = "Commit" - empty_text = "" - [module.change] - fg = "magenta" - - [[module]] - type = "Bookmarks" - separator = " " - color = "Magenta" - behind_symbol = "⇡" - - [[module]] - type = "State" - separator = " " - - [module.conflict] - disabled = true - text = "(CONFLICT)" - color = "Red" - - [module.divergent] - disabled = true - text = "(DIVERGENT)" - color = "Cyan" - - [module.empty] - disabled = false - text = "(EMPTY)" - color = "Yellow" - - [module.immutable] - disabled = false - text = "(IMMUTABLE)" - color = "Yellow" - - [module.hidden] - disabled = false - text = "(HIDDEN)" - color = "Yellow" - - [[module]] - type = "Metrics" - template = "[{changed} {added}{removed}]" - color = "Magenta" - - [module.changed_files] - prefix = "" - suffix = "" - color = "Cyan" - - [module.added_lines] - prefix = "+" - suffix = "" - color = "Green" - - [module.removed_lines] - prefix = "-" - suffix = "" - color = "Red" - ''; + home.packages = [ pkgs.jj-starship ]; programs.starship = { enable = true; settings = { @@ -91,17 +23,17 @@ }; custom = { jj = { - command = "${lib.getExe' inputs'.starship-jj.packages.default "starship-jj"} --ignore-working-copy starship prompt"; - format = "[$symbol](blue bold) $output"; - symbol = "󱗆"; - when = "jj root --ignore-working-copy"; - }; - git_branch = { - when = true; - command = "jj root >/dev/null 2>&1 || starship module git_branch"; - description = "Only show git_branch if we're not in a jj repo"; + when = "jj-starship detect"; + shell = [ "jj-starship" ]; + format = "$output "; }; }; + git_branch = { + disabled = true; + }; + git_status = { + disabled = true; + }; }; }; };