diff --git a/files/config/fish/config.fish b/files/config/fish/config.fish
index 6572a0c..4bb823b 100644
--- a/files/config/fish/config.fish
+++ b/files/config/fish/config.fish
@@ -36,7 +36,7 @@ set fish_color_redirection
set fish_color_search_match -r
set fish_color_selection -r
set fish_color_status normal
-set fish_color_string --italics
+set fish_color_string normal
set fish_color_user normal
set fish_color_valid_path
set fish_pager_color_background
diff --git a/flake.lock b/flake.lock
index 5b2ffda..1f292d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -134,11 +134,11 @@
"zig": "zig"
},
"locked": {
- "lastModified": 1738275804,
- "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=",
+ "lastModified": 1738619868,
+ "narHash": "sha256-q4h4SY1kVkZG4t/59CmJvaKjlx+xjojhdU1HqxiQhrQ=",
"owner": "ghostty-org",
"repo": "ghostty",
- "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3",
+ "rev": "f0d276062b78658fc1f3857e9ea104788f1f4e58",
"type": "github"
},
"original": {
@@ -221,11 +221,11 @@
]
},
"locked": {
- "lastModified": 1738448366,
- "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
+ "lastModified": 1738667255,
+ "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
+ "rev": "7abcf59a365430b36f84eaa452a466b11e469e33",
"type": "github"
},
"original": {
@@ -241,16 +241,16 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1735928141,
- "narHash": "sha256-KN5rfdDj3vB/GNVw4YZU4tJv2BnUQiQdOz1kEQyketI=",
- "owner": "dln",
+ "lastModified": 1738692980,
+ "narHash": "sha256-Gngd9HFmROtjUE+LfN724gYbH5wgDH2fD9rHfR+MFKY=",
+ "owner": "jj-vcs",
"repo": "jj",
- "rev": "cb103fb4692c4e2b90c4663804b81a5ff1e49c06",
+ "rev": "227eccefdb220491bd25e9e51a316a85e6e6a0a1",
"type": "github"
},
"original": {
- "owner": "dln",
- "ref": "openssh",
+ "owner": "jj-vcs",
+ "ref": "main",
"repo": "jj",
"type": "github"
}
@@ -266,11 +266,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1738479528,
- "narHash": "sha256-VmO/CQEQjIpfYot//PHDQuUm68r27zNuBiuANi6c5E4=",
+ "lastModified": 1738652022,
+ "narHash": "sha256-gKPFP/hWRwR+rkpXMoDnXZDZMqKnUwIBDnYH8FpgNNU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "1b82dbcbbcba812ad19f5c0601d1731731bf4ebe",
+ "rev": "9a95d2aa820df2b596af18f2a5ca37873a3d2695",
"type": "github"
},
"original": {
@@ -282,11 +282,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1738450845,
- "narHash": "sha256-yK2ZOtTTT6BjNi98PZi0NpEbidY12JMjgkqqggjoyD8=",
+ "lastModified": 1738626281,
+ "narHash": "sha256-aZUwhRP5jBEZ1AaafBQ7FjV8XicyAkWh6Vhx94j53Ik=",
"owner": "neovim",
"repo": "neovim",
- "rev": "0985e784d8dce58748343207e176bf61303b7d68",
+ "rev": "5a7cf85c2c7e452563a4bce9195e9a3426ca3050",
"type": "github"
},
"original": {
@@ -317,11 +317,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1731890469,
- "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+ "lastModified": 1737557748,
+ "narHash": "sha256-BaMuhctP1x00+8cBE2cJveJQb70/tWHI50MHj/ZrtOY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5083ec887760adfe12af64830a66807423a859a7",
+ "rev": "606996d74f6e2a12635d41c1bf58bfc7ea3bb5ec",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1738277201,
- "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
+ "lastModified": 1738574474,
+ "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
+ "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
"type": "github"
},
"original": {
@@ -381,11 +381,11 @@
},
"nixpkgs-unstable_2": {
"locked": {
- "lastModified": 1738297584,
- "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
+ "lastModified": 1738678663,
+ "narHash": "sha256-uPdqVr8gN3oYYcueL/Rh7wM4Y8/D6p9IvRmoBf+uQa8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
+ "rev": "00769b0532199db4e1bda59865f00f3a86232c75",
"type": "github"
},
"original": {
@@ -397,11 +397,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1738297584,
- "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
+ "lastModified": 1738553537,
+ "narHash": "sha256-HrrsuYIOl14dreCDUsXQGrWxdiU8LPKxcIo759jUk6Q=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
+ "rev": "2d31b9476b7c6f5b029e595586b0b112a7ad130b",
"type": "github"
},
"original": {
@@ -413,11 +413,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1738410390,
- "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+ "lastModified": 1738546358,
+ "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+ "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
"type": "github"
},
"original": {
@@ -447,11 +447,11 @@
]
},
"locked": {
- "lastModified": 1732242723,
- "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=",
+ "lastModified": 1737685583,
+ "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a",
+ "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index f72d553..d4de165 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
inputs = {
ghostty.url = "github:ghostty-org/ghostty";
- jujutsu.url = "github:dln/jj/openssh";
+ jujutsu.url = "github:jj-vcs/jj/main";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix
index 5e11086..c4f8493 100644
--- a/home/common/ghostty.nix
+++ b/home/common/ghostty.nix
@@ -30,7 +30,6 @@
unfocused-split-opacity = 0.85;
unfocused-split-fill = "#14151a";
-
shell-integration = "fish";
gtk-tabs-location = "hidden";
diff --git a/home/common/utils.nix b/home/common/utils.nix
index 1ae7cf9..91b6130 100644
--- a/home/common/utils.nix
+++ b/home/common/utils.nix
@@ -60,16 +60,16 @@
};
programs.eza = {
- enable = true;
- enableFishIntegration = true;
+ enable = true;
+ enableFishIntegration = true;
};
- home.sessionVariables.EZA_COLORS = "reset:oc=0:ur=0:uw=0:ux=0:ue=0:gr=0:gw=0:gx=0:tr=0:tw=0:tx=0:su=0:sf=0:xa=0:sn=0:nb=0:nk=0:nm=0:ng=0:nt=0:sb=0:ub=0:uk=0:um=0:ug=0:ut=0:df=0:ds=0:uu=0:uR=0:un=0:gu=0:gR=0:gn=0:lc=0:lm=0:ga=0:gm=0:gd=0:gv=0:gt=0:gi=0:gc=0:Gm=0:Go=0:Gc=0:Gd=0:xx=0:da=0:in=0:bl=0:hd=0:lp=3:cc=0:bO=0:sp=0:mp=0:im=0:vi=0:mu=0:lo=0:cr=0:do=0:co=0:tm=0:cm=0:bu=0:sc=0:ic=0:Sn=0:Su=0:Sr=0:St=0:Sl=0:ff=0:di=1:ex=0:fi=0:pi=0:so=0:bd=0:cd=0:ln=3:or=3";
+ home.sessionVariables.EZA_COLORS = "reset:oc=0:ur=0:uw=0:ux=0:ue=0:gr=0:gw=0:gx=0:tr=0:tw=0:tx=0:su=0:sf=0:xa=0:sn=0:nb=0:nk=0:nm=0:ng=0:nt=0:sb=0:ub=0:uk=0:um=0:ug=0:ut=0:df=0:ds=0:uu=0:uR=0:un=0:gu=0:gR=0:gn=0:lc=0:lm=0:ga=0:gm=0:gd=0:gv=0:gt=0:gi=0:gc=0:Gm=0:Go=0:Gc=0:Gd=0:xx=0:da=0:in=0:bl=0:hd=0:lp=4:cc=0:bO=0:sp=0:mp=0:im=0:vi=0:mu=0:lo=0:cr=0:do=0:co=0:tm=0:cm=0:bu=0:sc=0:ic=0:Sn=0:Su=0:Sr=0:St=0:Sl=0:ff=0:di=1:ex=0:fi=0:pi=0:so=0:bd=0:cd=0:ln=4:or=4";
programs.zoxide = {
enable = true;
enableFishIntegration = true;
options = [ "--cmd=cd" ];
};
- home.sessionVariables._ZO_FZF_OPTS="--reverse --height=10 --border=rounded --no-info --no-separator --no-scrollbar --no-color --no-sort";
+ home.sessionVariables._ZO_FZF_OPTS = "--reverse --height=10 --border=rounded --no-info --no-separator --no-scrollbar --no-color --no-sort";
}
diff --git a/home/common/vcs.nix b/home/common/vcs.nix
index 956612a..4e3d18a 100644
--- a/home/common/vcs.nix
+++ b/home/common/vcs.nix
@@ -1,4 +1,9 @@
-{ config, inputs, pkgs, ... }:
+{
+ config,
+ inputs,
+ pkgs,
+ ...
+}:
{
home.packages = with pkgs; [
diff --git a/home/dln/home.nix b/home/dln/home.nix
index 8288f2c..b78fe99 100644
--- a/home/dln/home.nix
+++ b/home/dln/home.nix
@@ -43,7 +43,6 @@ in
programs.helix = {
enable = true;
- # extraPackages = [];
};
programs.jujutsu = {
@@ -62,6 +61,7 @@ in
git = {
push-bookmark-prefix = "dln/push-";
+ subprocess = true;
};
ui = {