From 4a4ea38e72e6e24d0f436254d58aa4ad250d2125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Thu, 16 Oct 2025 12:35:47 +0200 Subject: [PATCH 1/4] install nix-index --- home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home.nix b/home.nix index df3c105..62f0d4b 100644 --- a/home.nix +++ b/home.nix @@ -96,6 +96,7 @@ in { nh nix-output-monitor alejandra + nix-index # archiving archivebox # games From a364ac7be33dd7be6a59bc477b8599115ae9b422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Thu, 16 Oct 2025 12:41:12 +0200 Subject: [PATCH 2/4] remove fingerpint stuff --- flake.lock | 48 +++++++----------------------------------------- flake.nix | 7 ------- t470.nix | 6 ------ 3 files changed, 7 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 588a8af..d9aed9a 100644 --- a/flake.lock +++ b/flake.lock @@ -631,7 +631,7 @@ "nix-options-doc": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -649,24 +649,6 @@ "type": "github" } }, - "nixos-06cb-009a-fingerprint-sensor": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1734692513, - "narHash": "sha256-3QEzFFrkXLj/JgZGoLaxq/pPkflSXfBOP10bXL8/Niw=", - "owner": "ahbnr", - "repo": "nixos-06cb-009a-fingerprint-sensor", - "rev": "3678b193efa1e06aab86058aecee18ddaa8878d2", - "type": "github" - }, - "original": { - "owner": "ahbnr", - "repo": "nixos-06cb-009a-fingerprint-sensor", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1748162331, @@ -759,21 +741,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1759735786, "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", @@ -789,7 +756,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1721924956, "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", @@ -805,7 +772,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1740695751, "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", @@ -821,7 +788,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -840,7 +807,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2" }, "locked": { @@ -939,7 +906,7 @@ "inputs": { "flake-compat": "flake-compat_3", "nix-options-doc": "nix-options-doc", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1759503843, @@ -1004,8 +971,7 @@ "home-manager": "home-manager", "mms": "mms", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", - "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "optnix": "optnix", diff --git a/flake.nix b/flake.nix index 9ac0070..cf975e8 100644 --- a/flake.nix +++ b/flake.nix @@ -42,10 +42,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-06cb-009a-fingerprint-sensor = { - url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor"; - }; - mms.url = "github:mkaito/nixos-modded-minecraft-servers"; copyparty.url = "github:9001/copyparty"; @@ -62,7 +58,6 @@ breezex-cursor, other-transcode, nix-doom-emacs-unstraightened, - nixos-06cb-009a-fingerprint-sensor, cassowary, mms, copyparty, @@ -128,8 +123,6 @@ stylix.nixosModules.stylix ./stylix.nix - - nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor" ]; specialArgs = { pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; diff --git a/t470.nix b/t470.nix index 6f893c8..113b13d 100644 --- a/t470.nix +++ b/t470.nix @@ -75,10 +75,4 @@ }; wantedBy = ["multi-user.target"]; }; - - # fingerprint sensor setup - services."06cb-009a-fingerprint-sensor" = { - enable = true; - backend = "python-validity"; - }; } From 9f9350fe0bb3264e0e729774552c344ed7bcfa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Thu, 16 Oct 2025 12:46:51 +0200 Subject: [PATCH 3/4] only show jj repo status, not git --- flake.lock | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 5 ++- home.nix | 35 +++++++--------- 3 files changed, 132 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index d9aed9a..7373b1c 100644 --- a/flake.lock +++ b/flake.lock @@ -187,6 +187,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "starship-jj", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1755412999, + "narHash": "sha256-qD+X0KuAp0iiqElrlouXM43fmW7VCg7fGQzr6oal318=", + "owner": "nix-community", + "repo": "fenix", + "rev": "fe8535d8c9afe780d5344d28db7fe1de3df736a0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -394,6 +416,27 @@ "type": "github" } }, + "flake-utils_6": { + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -804,6 +847,22 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -977,9 +1036,27 @@ "optnix": "optnix", "other-transcode": "other-transcode", "river-shifttags": "river-shifttags", + "starship-jj": "starship-jj", "stylix": "stylix" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1755004716, + "narHash": "sha256-TbhPR5Fqw5LjAeI3/FOPhNNFQCF3cieKCJWWupeZmiA=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "b2a58b8c6eff3c3a2c8b5c70dbf69ead78284194", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1002,6 +1079,27 @@ "type": "github" } }, + "starship-jj": { + "inputs": { + "fenix": "fenix", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_8", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1757479801, + "narHash": "sha256-HTkDZQJnlbv2LlBybpBTNh1Y3/M8RNeQuiked3JaLgI=", + "owner": "lanastara_foss", + "repo": "starship-jj", + "rev": "04557921210b770faefb9ea7ee60152d61b03755", + "type": "gitlab" + }, + "original": { + "owner": "lanastara_foss", + "repo": "starship-jj", + "type": "gitlab" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1015,7 +1113,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1112,6 +1210,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index cf975e8..6312937 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,8 @@ copyparty.url = "github:9001/copyparty"; optnix.url = "github:water-sucks/optnix"; + + starship-jj.url = "gitlab:lanastara_foss/starship-jj"; }; outputs = { nixpkgs, @@ -59,9 +61,9 @@ other-transcode, nix-doom-emacs-unstraightened, cassowary, - mms, copyparty, optnix, + starship-jj, ... }: let system = "x86_64-linux"; @@ -74,6 +76,7 @@ nix-doom-emacs-unstraightened = nix-doom-emacs-unstraightened.hmModule; cassowary = cassowary.packages.${system}.default; pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; + starship-jj = starship-jj.packages.${system}.default; }; in { nixosConfigurations.void = nixpkgs.lib.nixosSystem { diff --git a/home.nix b/home.nix index 62f0d4b..df7b04f 100644 --- a/home.nix +++ b/home.nix @@ -8,6 +8,7 @@ kitty-unstable, nix-doom-emacs-unstraightened, cassowary, + starship-jj, ... }: let username = "khais"; @@ -39,6 +40,8 @@ in { fd file rclone + # jj info in shell prompt + starship-jj # used for yazi epub previews epub-thumbnailer # remote working @@ -498,31 +501,21 @@ in { settings = { # short prompt timeout command_timeout = 30; - # custom.jj = { - # command = '' - # jj log -r@ -n1 --ignore-working-copy --no-graph --color always -T ' - # separate(" ", - # bookmarks.map(|x| truncate_end(10, x.name(), "…")).join(" "), - # tags.map(|x| truncate_end(10, x.name(), "…")).join(" "), - # surround("\"", "\"", truncate_end(24, description.first_line(), "…")), - # if(conflict, "conflict"), - # if(divergent, "divergent"), - # if(hidden, "hidden"), ) - # ' - # ''; - # when = "jj root --ignore-working-copy"; - # symbol = "jj"; - # }; - # custom.jjstate = { - # command = '' - # jj log -r@ -n1 --ignore-working-copy --no-graph --stat | tail -n1 | ${pkgs.sd}/bin/sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | ${pkgs.sd}/bin/sd " 0." "" - # ''; - # when = "jj root"; - # }; + git_state.disabled = true; + git_status.disabled = true; git_commit.disabled = true; git_metrics.disabled = true; git_branch.disabled = true; + + custom.jj = { + command = "prompt"; + format = "$output"; + ignore_timeout = true; + shell = ["starship-jj" "--ignore-working-copy" "starship"]; + use_stdin = false; + when = true; + }; }; }; From b8c21378644e574755313dd617438592cc9c4b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Thu, 16 Oct 2025 13:34:04 +0200 Subject: [PATCH 4/4] helix: set formatter for nix --- home.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home.nix b/home.nix index df7b04f..c9f4eca 100644 --- a/home.nix +++ b/home.nix @@ -481,6 +481,15 @@ in { end-of-line-diagnostics = "hint"; }; }; + languages = { + language = [ + { + name = "nix"; + auto-format = true; + formatter = {command = "alejandra";}; + } + ]; + }; }; programs.bat = {