diff options
| author | David Morgan <djm_uk@protonmail.com> | 2026-07-27 08:32:30 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2026-07-27 08:32:30 +0100 |
| commit | 5ed9c72f66960020d47458285b2b45d3a5b48ea6 (patch) | |
| tree | 537058627fc87059644e1e483ef5471a2373269c /nix-conf/overlays | |
| parent | c2cefd07f144db1bdd0e84384fb575a861c0a1cd (diff) | |
| download | dotfiles-5ed9c72f66960020d47458285b2b45d3a5b48ea6.tar.gz | |
Update atuin patches
Diffstat (limited to 'nix-conf/overlays')
| -rw-r--r-- | nix-conf/overlays/atuin-session-host-filter-unstable.patch | 6 | ||||
| -rw-r--r-- | nix-conf/overlays/atuin-session-host-filter.patch | 36 | ||||
| -rw-r--r-- | nix-conf/overlays/modifications.nix | 2 |
3 files changed, 28 insertions, 16 deletions
diff --git a/nix-conf/overlays/atuin-session-host-filter-unstable.patch b/nix-conf/overlays/atuin-session-host-filter-unstable.patch index 9606f6b..0ab9949 100644 --- a/nix-conf/overlays/atuin-session-host-filter-unstable.patch +++ b/nix-conf/overlays/atuin-session-host-filter-unstable.patch @@ -114,11 +114,11 @@ index 7d9feb4..01a2c15 100644 + } + + let Ok(uuid) = uuid::Uuid::parse_str(&context.session) else { -+ log::warn!("failed to parse session id '{}'", context.session); ++ tracing::warn!("failed to parse session id '{}'", context.session); + continue; + }; + let Some(timestamp) = uuid.get_timestamp() else { -+ log::warn!( ++ tracing::warn!( + "failed to get timestamp from uuid '{}'", + uuid.as_hyphenated() + ); @@ -128,7 +128,7 @@ index 7d9feb4..01a2c15 100644 + let Ok(session_start) = time::OffsetDateTime::from_unix_timestamp_nanos( + i128::from(seconds) * 1_000_000_000 + i128::from(nanos), + ) else { -+ log::warn!( ++ tracing::warn!( + "failed to create OffsetDateTime from second: {seconds}, nanosecond: {nanos}" + ); + continue; diff --git a/nix-conf/overlays/atuin-session-host-filter.patch b/nix-conf/overlays/atuin-session-host-filter.patch index 4861dd8..9606f6b 100644 --- a/nix-conf/overlays/atuin-session-host-filter.patch +++ b/nix-conf/overlays/atuin-session-host-filter.patch @@ -1,8 +1,8 @@ diff --git a/crates/atuin-client/src/database.rs b/crates/atuin-client/src/database.rs -index 7aa095f7..fb8e4615 100644 +index 7c63368..338e107 100644 --- a/crates/atuin-client/src/database.rs +++ b/crates/atuin-client/src/database.rs -@@ -350,6 +350,16 @@ impl Database for Sqlite { +@@ -367,6 +367,16 @@ impl Database for Sqlite { } &mut query } @@ -19,7 +19,7 @@ index 7aa095f7..fb8e4615 100644 FilterMode::Directory => query.and_where_eq("cwd", quote(&context.cwd)), FilterMode::Workspace => query.and_where_like_left("cwd", &git_root), }; -@@ -481,6 +491,16 @@ impl Database for Sqlite { +@@ -498,6 +508,16 @@ impl Database for Sqlite { } &mut sql } @@ -37,20 +37,20 @@ index 7aa095f7..fb8e4615 100644 FilterMode::Workspace => sql.and_where_like_left("cwd", git_root), }; diff --git a/crates/atuin-client/src/settings.rs b/crates/atuin-client/src/settings.rs -index 1c35e6eb..45a5c170 100644 +index 745bd2f..4580db3 100644 --- a/crates/atuin-client/src/settings.rs +++ b/crates/atuin-client/src/settings.rs -@@ -84,6 +84,9 @@ pub enum FilterMode { - +@@ -114,6 +114,9 @@ pub enum FilterMode { + #[serde(rename = "session-preload")] SessionPreload = 5, + + #[serde(rename = "session-host")] + SessionHost = 6, } - + impl FilterMode { -@@ -95,6 +98,7 @@ impl FilterMode { +@@ -125,6 +128,7 @@ impl FilterMode { FilterMode::Directory => "DIRECTORY", FilterMode::Workspace => "WORKSPACE", FilterMode::SessionPreload => "SESSION+", @@ -58,7 +58,7 @@ index 1c35e6eb..45a5c170 100644 } } } -@@ -517,6 +521,7 @@ impl Default for Search { +@@ -774,6 +778,7 @@ impl Default for Search { FilterMode::Host, FilterMode::Session, FilterMode::SessionPreload, @@ -66,7 +66,7 @@ index 1c35e6eb..45a5c170 100644 FilterMode::Workspace, FilterMode::Directory, ], -@@ -1096,6 +1101,7 @@ impl Settings { +@@ -1461,6 +1466,7 @@ impl Settings { "workspace", "directory", "session-preload", @@ -74,11 +74,23 @@ index 1c35e6eb..45a5c170 100644 ], )? .set_default("theme.name", "default")? +diff --git a/crates/atuin-daemon/src/client.rs b/crates/atuin-daemon/src/client.rs +index 2f492f6..2fbb5d0 100644 +--- a/crates/atuin-daemon/src/client.rs ++++ b/crates/atuin-daemon/src/client.rs +@@ -229,6 +229,7 @@ impl From<FilterMode> for RpcFilterMode { + FilterMode::Directory => RpcFilterMode::Directory, + FilterMode::Workspace => RpcFilterMode::Workspace, + FilterMode::SessionPreload => RpcFilterMode::SessionPreload, ++ FilterMode::SessionHost => RpcFilterMode::Session, + } + } + } diff --git a/crates/atuin/src/command/client/search/engines/skim.rs b/crates/atuin/src/command/client/search/engines/skim.rs -index cb7ce24f..2a436be4 100644 +index 7d9feb4..01a2c15 100644 --- a/crates/atuin/src/command/client/search/engines/skim.rs +++ b/crates/atuin/src/command/client/search/engines/skim.rs -@@ -122,6 +122,51 @@ async fn fuzzy_search( +@@ -131,6 +131,51 @@ async fn fuzzy_search( } } } diff --git a/nix-conf/overlays/modifications.nix b/nix-conf/overlays/modifications.nix index 053722e..e6df8db 100644 --- a/nix-conf/overlays/modifications.nix +++ b/nix-conf/overlays/modifications.nix @@ -7,7 +7,7 @@ in atuin = prev.atuin.overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or [ ]) ++ [ ( - if prev.lib.versionAtLeast prev.atuin.version "18.13.0" then + if prev.lib.versionAtLeast prev.atuin.version "18.17.1" then ./atuin-session-host-filter-unstable.patch else ./atuin-session-host-filter.patch |