diff --git a/Cargo.lock b/Cargo.lock index 8037efa..ecdc65c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -76,7 +76,7 @@ dependencies = [ "atuin-client", "atuin-common", "atuin-server", - "base64 0.20.0", + "base64 0.21.0", "bitflags", "cassowary", "chrono", @@ -114,7 +114,7 @@ version = "14.0.0" dependencies = [ "async-trait", "atuin-common", - "base64 0.20.0", + "base64 0.21.0", "chrono", "clap", "config", @@ -247,12 +247,6 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" - [[package]] name = "base64" version = "0.21.0" @@ -343,49 +337,54 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.18" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" +checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" +dependencies = [ + "bitflags", + "clap_lex", + "is-terminal", "strsim", "termcolor", ] [[package]] name = "clap_complete" -version = "4.0.3" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe581a2035db4174cdbdc91265e1aba50f381577f0510d0ad36c7bc59cc84a3" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.0.18" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" +checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.14", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "colored" @@ -414,16 +413,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -468,9 +466,9 @@ checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -498,9 +496,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f67c7faacd4db07a939f55d66a983a5355358a1f17d32cc9a8d01d1266b9ce" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", @@ -626,13 +624,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -681,7 +679,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project", - "spin 0.9.4", + "spin 0.9.8", ] [[package]] @@ -751,7 +749,7 @@ checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -868,12 +866,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -1024,12 +1019,13 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" dependencies = [ "console", "number_prefix", + "portable-atomic", "unicode-width", ] @@ -1054,12 +1050,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1070,14 +1067,14 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1112,9 +1109,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libsodium-sys" @@ -1141,9 +1138,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -1184,7 +1181,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax", - "syn", + "syn 1.0.99", ] [[package]] @@ -1372,12 +1369,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - [[package]] name = "overload" version = "0.1.1" @@ -1487,7 +1478,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1508,50 +1499,32 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +[[package]] +name = "portable-atomic" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" + [[package]] name = "ppv-lite86" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -1710,9 +1683,20 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", "winapi", @@ -1735,16 +1719,16 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.5" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1873,7 +1857,7 @@ checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1960,9 +1944,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -2039,9 +2023,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -2149,7 +2133,7 @@ dependencies = [ "sha2", "sqlx-core", "sqlx-rt", - "syn", + "syn 1.0.99", "url", ] @@ -2197,24 +2181,23 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -2224,16 +2207,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "thiserror" version = "1.0.38" @@ -2251,15 +2224,16 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -2336,7 +2310,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2453,7 +2427,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2526,12 +2500,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unicode_categories" version = "0.1.1" @@ -2636,7 +2604,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-shared", ] @@ -2670,7 +2638,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2771,21 +2739,51 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.0", "windows_aarch64_msvc 0.42.0", "windows_i686_gnu 0.42.0", "windows_i686_msvc 0.42.0", "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.0", "windows_x86_64_msvc 0.42.0", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -2798,6 +2796,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.36.1" @@ -2810,6 +2814,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.36.1" @@ -2822,6 +2832,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -2834,12 +2850,24 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -2852,6 +2880,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winreg" version = "0.10.1" @@ -2863,21 +2897,20 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.14", ] diff --git a/Cargo.toml b/Cargo.toml index b517a41..cb86975 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,88 +1,53 @@ -[package] -name = "atuin" +[workspace] +members = [ + "atuin", + "atuin-client", + "atuin-server", + "atuin-common", +] + +[workspace.package] version = "14.0.0" authors = ["Ellie Huxtable "] -edition = "2021" rust-version = "1.59" license = "MIT" -description = "atuin - magical shell history" homepage = "https://atuin.sh" repository = "https://github.com/ellie/atuin" readme = "README.md" -[package.metadata.binstall] -pkg-url = "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }.tar.gz" -bin-dir = "{ name }-v{ version }-{ target }/{ bin }{ binary-ext }" -pkg-fmt = "tgz" - -[package.metadata.deb] -maintainer = "Ellie Huxtable " -copyright = "2021, Ellie Huxtable " -license-file = ["LICENSE"] -depends = "$auto" -section = "utility" - -[package.metadata.rpm] -package = "atuin" - -[package.metadata.rpm.cargo] -buildflags = ["--release"] - -[package.metadata.rpm.targets] -atuin = { path = "/usr/bin/atuin" } - -[workspace] -members = ["./atuin-client", "./atuin-server", "./atuin-common"] - -[features] -# TODO(conradludgate) -# Currently, this keeps the same default built behaviour for v0.8 -# We should rethink this by the time we hit a new breaking change -default = ["client", "sync", "server"] -client = ["atuin-client"] -sync = ["atuin-client/sync"] -server = ["atuin-server", "tracing-subscriber"] - -[dependencies] -atuin-server = { path = "atuin-server", version = "14.0.0", optional = true } -atuin-client = { path = "atuin-client", version = "14.0.0", optional = true, default-features = false } -atuin-common = { path = "atuin-common", version = "14.0.0" } - +[workspace.dependencies] +async-trait = "0.1.58" +base64 = "0.21" log = "0.4" -env_logger = "0.10.0" chrono = { version = "0.4", features = ["serde"] } -eyre = "0.6" +clap = { version = "4.0.18", features = ["derive"] } +config = { version = "0.13", default-features = false, features = ["toml"] } directories = "4" -indicatif = "0.17.1" +eyre = "0.6" +fs-err = "2.9" +interim = { version = "0.1.0", features = ["chrono"] } +itertools = "0.10.5" +rand = { version = "0.8.5", features = ["std"] } +semver = "1.0.14" serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.86" -crossterm = { version = "0.26", features = ["use-dev-tty"] } -unicode-width = "0.1" -itertools = "0.10.5" +sodiumoxide = "0.2.6" tokio = { version = "1", features = ["full"] } -async-trait = "0.1.58" -interim = { version = "0.1.0", features = ["chrono"] } -base64 = "0.20.0" -crossbeam-channel = "0.5.1" -clap = { version = "4.0.18", features = ["derive"] } -clap_complete = "4.0.3" -fs-err = "2.9" +uuid = { version = "1.2", features = ["v4"] } whoami = "1.1.2" -rpassword = "7.0" -semver = "1.0.14" -runtime-format = "0.1.2" -tiny-bip39 = "1" -futures-util = "0.3" -fuzzy-matcher = "0.3.7" -colored = "2.0.0" -# ratatui -bitflags = "1.3" -cassowary = "0.3" -unicode-segmentation = "1.2" - -[dependencies.tracing-subscriber] -version = "0.3" +[workspace.dependencies.reqwest] +version = "0.11" +features = [ + "json", + "rustls-tls-native-roots", +] default-features = false -features = ["ansi", "fmt", "registry", "env-filter"] -optional = true + +[workspace.dependencies.sqlx] +version = "0.6" +features = [ + "runtime-tokio-rustls", + "chrono", + "postgres", +] diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml index 1eda2c2..0f498d3 100644 --- a/atuin-client/Cargo.toml +++ b/atuin-client/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "atuin-client" -version = "14.0.0" -authors = ["Ellie Huxtable "] edition = "2018" -license = "MIT" description = "client library for atuin" -homepage = "https://atuin.sh" -repository = "https://github.com/ellie/atuin" + +version = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -25,47 +26,40 @@ sync = [ [dependencies] atuin-common = { path = "../atuin-common", version = "14.0.0" } -log = "0.4" -chrono = { version = "0.4", features = ["serde"] } -clap = { version = "4.0.18", features = ["derive"] } -eyre = "0.6" -directories = "4" -uuid = { version = "1.2", features = ["v4"] } -whoami = "1.1.2" -interim = { version = "0.1.0", features = ["chrono"] } -config = { version = "0.13", default-features = false, features = ["toml"] } -serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.86" +log = { workspace = true } +chrono = { workspace = true } +clap = { workspace = true } +eyre = { workspace = true } +directories = { workspace = true } +uuid = { workspace = true } +whoami = { workspace = true } +interim = { workspace = true } +config = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } parse_duration = "2.1.1" -async-trait = "0.1.58" -itertools = "0.10.5" +async-trait = { workspace = true } +itertools = { workspace = true } shellexpand = "2" -sqlx = { version = "0.6", features = [ - "runtime-tokio-rustls", - "chrono", - "sqlite", -] } +sqlx = { workspace = true, features = ["sqlite"] } minspan = "0.1.1" regex = "1.5.4" serde_regex = "1.1.0" -fs-err = "2.9" +fs-err = { workspace = true } sql-builder = "3" lazy_static = "1" memchr = "2.5" # sync urlencoding = { version = "2.1.0", optional = true } -sodiumoxide = { version = "0.2.6", optional = true } -reqwest = { version = "0.11", features = [ - "json", - "rustls-tls-native-roots", -], default-features = false, optional = true } +sodiumoxide = { workspace = true, optional = true } +reqwest = { workspace = true, optional = true } hex = { version = "0.4", optional = true } sha2 = { version = "0.10", optional = true } rmp-serde = { version = "1.1.1", optional = true } -base64 = { version = "0.20.0", optional = true } -tokio = { version = "1", features = ["full"] } -semver = "1.0.14" +base64 = { workspace = true, optional = true } +tokio = { workspace = true } +semver = { workspace = true } [dev-dependencies] tokio = { version = "1", features = ["full"] } diff --git a/atuin-client/src/encryption.rs b/atuin-client/src/encryption.rs index 40badb5..fe19ce9 100644 --- a/atuin-client/src/encryption.rs +++ b/atuin-client/src/encryption.rs @@ -10,6 +10,7 @@ use std::{io::prelude::*, path::PathBuf}; +use base64::prelude::{Engine, BASE64_STANDARD}; use eyre::{eyre, Context, Result}; use fs_err as fs; use serde::{Deserialize, Serialize}; @@ -72,14 +73,15 @@ pub fn load_encoded_key(settings: &Settings) -> Result { pub type Key = secretbox::Key; pub fn encode_key(key: secretbox::Key) -> Result { let buf = rmp_serde::to_vec(&key).wrap_err("could not encode key to message pack")?; - let buf = base64::encode(buf); + let buf = BASE64_STANDARD.encode(buf); Ok(buf) } pub fn decode_key(key: String) -> Result { - let buf = - base64::decode(key.trim_end()).wrap_err("encryption key is not a valid base64 encoding")?; + let buf = BASE64_STANDARD + .decode(key.trim_end()) + .wrap_err("encryption key is not a valid base64 encoding")?; let buf: secretbox::Key = rmp_serde::from_slice(&buf) .wrap_err("encryption key is not a valid message pack encoding")?; diff --git a/atuin-common/Cargo.toml b/atuin-common/Cargo.toml index d065a32..94225e6 100644 --- a/atuin-common/Cargo.toml +++ b/atuin-common/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "atuin-common" -version = "14.0.0" -authors = ["Ellie Huxtable "] edition = "2018" -license = "MIT" description = "common library for atuin" -homepage = "https://atuin.sh" -repository = "https://github.com/ellie/atuin" + +version = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = { version = "0.4", features = ["serde"] } -serde = { version = "1.0.145", features = ["derive"] } -uuid = { version = "1.2", features = ["v4"] } -rand = { version = "0.8.5", features = ["std"] } +chrono = { workspace = true } +serde = { workspace = true } +uuid = { workspace = true } +rand = { workspace = true } diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml index 9b4df47..9a32f0d 100644 --- a/atuin-server/Cargo.toml +++ b/atuin-server/Cargo.toml @@ -1,41 +1,35 @@ [package] name = "atuin-server" -version = "14.0.0" -authors = ["Ellie Huxtable "] edition = "2018" -license = "MIT" description = "server library for atuin" -homepage = "https://atuin.sh" -repository = "https://github.com/ellie/atuin" + +version = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } [dependencies] atuin-common = { path = "../atuin-common", version = "14.0.0" } tracing = "0.1" -chrono = { version = "0.4", features = ["serde"] } -eyre = "0.6" -uuid = { version = "1.2", features = ["v4"] } -whoami = "1.1.2" -config = { version = "0.13", default-features = false, features = ["toml"] } -serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.86" -sodiumoxide = "0.2.6" -base64 = "0.21.0" -rand = "0.8.4" -tokio = { version = "1", features = ["full"] } -sqlx = { version = "0.6", features = [ - "runtime-tokio-rustls", - "chrono", - "postgres", -] } -async-trait = "0.1.58" +chrono = { workspace = true } +eyre = { workspace = true } +uuid = { workspace = true } +whoami = { workspace = true } +config = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +sodiumoxide = { workspace = true } +base64 = { workspace = true } +rand = { workspace = true } +tokio = { workspace = true } +sqlx = { workspace = true } +async-trait = { workspace = true } axum = "0.6.4" http = "0.2" -fs-err = "2.9" +fs-err = { workspace = true } chronoutil = "0.2.3" tower = "0.4" tower-http = { version = "0.3", features = ["trace"] } -reqwest = { version = "0.11", features = [ - "json", - "rustls-tls-native-roots", -], default-features = false } +reqwest = { workspace = true } diff --git a/atuin/Cargo.toml b/atuin/Cargo.toml new file mode 100644 index 0000000..d9cbfe6 --- /dev/null +++ b/atuin/Cargo.toml @@ -0,0 +1,86 @@ +[package] +name = "atuin" +edition = "2021" +rust-version = "1.59" +description = "atuin - magical shell history" +readme = "../README.md" + +version = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + +[package.metadata.binstall] +pkg-url = "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }.tar.gz" +bin-dir = "{ name }-v{ version }-{ target }/{ bin }{ binary-ext }" +pkg-fmt = "tgz" + +[package.metadata.deb] +maintainer = "Ellie Huxtable " +copyright = "2021, Ellie Huxtable " +license-file = ["LICENSE"] +depends = "$auto" +section = "utility" + +[package.metadata.rpm] +package = "atuin" + +[package.metadata.rpm.cargo] +buildflags = ["--release"] + +[package.metadata.rpm.targets] +atuin = { path = "/usr/bin/atuin" } + +[features] +# TODO(conradludgate) +# Currently, this keeps the same default built behaviour for v0.8 +# We should rethink this by the time we hit a new breaking change +default = ["client", "sync", "server"] +client = ["atuin-client"] +sync = ["atuin-client/sync"] +server = ["atuin-server", "tracing-subscriber"] + +[dependencies] +atuin-server = { path = "../atuin-server", version = "14.0.0", optional = true } +atuin-client = { path = "../atuin-client", version = "14.0.0", optional = true, default-features = false } +atuin-common = { path = "../atuin-common", version = "14.0.0" } + +log = { workspace = true } +env_logger = "0.10.0" +chrono = { version = "0.4", features = ["serde"] } +eyre = { workspace = true } +directories = { workspace = true } +indicatif = "0.17.1" +serde = { workspace = true } +serde_json = { workspace = true } +crossterm = { version = "0.26", features = ["use-dev-tty"] } +unicode-width = "0.1" +itertools = { workspace = true } +tokio = { workspace = true } +async-trait = { workspace = true } +interim = { workspace = true } +base64 = { workspace = true } +crossbeam-channel = "0.5.1" +clap = { workspace = true } +clap_complete = "4.0.3" +fs-err = { workspace = true } +whoami = { workspace = true } +rpassword = "7.0" +semver = { workspace = true } +runtime-format = "0.1.2" +tiny-bip39 = "1" +futures-util = "0.3" +fuzzy-matcher = "0.3.7" +colored = "2.0.0" + +# ratatui +bitflags = "1.3" +cassowary = "0.3" +unicode-segmentation = "1.2" + +[dependencies.tracing-subscriber] +version = "0.3" +default-features = false +features = ["ansi", "fmt", "registry", "env-filter"] +optional = true diff --git a/src/command/client.rs b/atuin/src/command/client.rs similarity index 100% rename from src/command/client.rs rename to atuin/src/command/client.rs diff --git a/src/command/client/history.rs b/atuin/src/command/client/history.rs similarity index 100% rename from src/command/client/history.rs rename to atuin/src/command/client/history.rs diff --git a/src/command/client/import.rs b/atuin/src/command/client/import.rs similarity index 100% rename from src/command/client/import.rs rename to atuin/src/command/client/import.rs diff --git a/src/command/client/search.rs b/atuin/src/command/client/search.rs similarity index 100% rename from src/command/client/search.rs rename to atuin/src/command/client/search.rs diff --git a/src/command/client/search/cursor.rs b/atuin/src/command/client/search/cursor.rs similarity index 100% rename from src/command/client/search/cursor.rs rename to atuin/src/command/client/search/cursor.rs diff --git a/src/command/client/search/duration.rs b/atuin/src/command/client/search/duration.rs similarity index 100% rename from src/command/client/search/duration.rs rename to atuin/src/command/client/search/duration.rs diff --git a/src/command/client/search/engines.rs b/atuin/src/command/client/search/engines.rs similarity index 100% rename from src/command/client/search/engines.rs rename to atuin/src/command/client/search/engines.rs diff --git a/src/command/client/search/engines/db.rs b/atuin/src/command/client/search/engines/db.rs similarity index 100% rename from src/command/client/search/engines/db.rs rename to atuin/src/command/client/search/engines/db.rs diff --git a/src/command/client/search/engines/skim.rs b/atuin/src/command/client/search/engines/skim.rs similarity index 100% rename from src/command/client/search/engines/skim.rs rename to atuin/src/command/client/search/engines/skim.rs diff --git a/src/command/client/search/history_list.rs b/atuin/src/command/client/search/history_list.rs similarity index 100% rename from src/command/client/search/history_list.rs rename to atuin/src/command/client/search/history_list.rs diff --git a/src/command/client/search/interactive.rs b/atuin/src/command/client/search/interactive.rs similarity index 100% rename from src/command/client/search/interactive.rs rename to atuin/src/command/client/search/interactive.rs diff --git a/src/command/client/stats.rs b/atuin/src/command/client/stats.rs similarity index 100% rename from src/command/client/stats.rs rename to atuin/src/command/client/stats.rs diff --git a/src/command/client/sync.rs b/atuin/src/command/client/sync.rs similarity index 100% rename from src/command/client/sync.rs rename to atuin/src/command/client/sync.rs diff --git a/src/command/client/sync/login.rs b/atuin/src/command/client/sync/login.rs similarity index 100% rename from src/command/client/sync/login.rs rename to atuin/src/command/client/sync/login.rs diff --git a/src/command/client/sync/logout.rs b/atuin/src/command/client/sync/logout.rs similarity index 100% rename from src/command/client/sync/logout.rs rename to atuin/src/command/client/sync/logout.rs diff --git a/src/command/client/sync/register.rs b/atuin/src/command/client/sync/register.rs similarity index 100% rename from src/command/client/sync/register.rs rename to atuin/src/command/client/sync/register.rs diff --git a/src/command/client/sync/status.rs b/atuin/src/command/client/sync/status.rs similarity index 100% rename from src/command/client/sync/status.rs rename to atuin/src/command/client/sync/status.rs diff --git a/src/command/contributors.rs b/atuin/src/command/contributors.rs similarity index 100% rename from src/command/contributors.rs rename to atuin/src/command/contributors.rs diff --git a/src/command/init.rs b/atuin/src/command/init.rs similarity index 100% rename from src/command/init.rs rename to atuin/src/command/init.rs diff --git a/src/command/mod.rs b/atuin/src/command/mod.rs similarity index 100% rename from src/command/mod.rs rename to atuin/src/command/mod.rs diff --git a/src/command/server.rs b/atuin/src/command/server.rs similarity index 100% rename from src/command/server.rs rename to atuin/src/command/server.rs diff --git a/src/main.rs b/atuin/src/main.rs similarity index 100% rename from src/main.rs rename to atuin/src/main.rs diff --git a/src/ratatui/.github/ISSUE_TEMPLATE/bug_report.md b/atuin/src/ratatui/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from src/ratatui/.github/ISSUE_TEMPLATE/bug_report.md rename to atuin/src/ratatui/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/src/ratatui/.github/ISSUE_TEMPLATE/config.yml b/atuin/src/ratatui/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from src/ratatui/.github/ISSUE_TEMPLATE/config.yml rename to atuin/src/ratatui/.github/ISSUE_TEMPLATE/config.yml diff --git a/src/ratatui/.github/ISSUE_TEMPLATE/feature_request.md b/atuin/src/ratatui/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from src/ratatui/.github/ISSUE_TEMPLATE/feature_request.md rename to atuin/src/ratatui/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/src/ratatui/.github/workflows/cd.yml b/atuin/src/ratatui/.github/workflows/cd.yml similarity index 100% rename from src/ratatui/.github/workflows/cd.yml rename to atuin/src/ratatui/.github/workflows/cd.yml diff --git a/src/ratatui/.github/workflows/ci.yml b/atuin/src/ratatui/.github/workflows/ci.yml similarity index 100% rename from src/ratatui/.github/workflows/ci.yml rename to atuin/src/ratatui/.github/workflows/ci.yml diff --git a/src/ratatui/.gitignore b/atuin/src/ratatui/.gitignore similarity index 100% rename from src/ratatui/.gitignore rename to atuin/src/ratatui/.gitignore diff --git a/src/ratatui/LICENSE b/atuin/src/ratatui/LICENSE similarity index 100% rename from src/ratatui/LICENSE rename to atuin/src/ratatui/LICENSE diff --git a/src/ratatui/README.md b/atuin/src/ratatui/README.md similarity index 100% rename from src/ratatui/README.md rename to atuin/src/ratatui/README.md diff --git a/src/ratatui/backend/crossterm.rs b/atuin/src/ratatui/backend/crossterm.rs similarity index 100% rename from src/ratatui/backend/crossterm.rs rename to atuin/src/ratatui/backend/crossterm.rs diff --git a/src/ratatui/backend/mod.rs b/atuin/src/ratatui/backend/mod.rs similarity index 100% rename from src/ratatui/backend/mod.rs rename to atuin/src/ratatui/backend/mod.rs diff --git a/src/ratatui/backend/termion.rs b/atuin/src/ratatui/backend/termion.rs similarity index 100% rename from src/ratatui/backend/termion.rs rename to atuin/src/ratatui/backend/termion.rs diff --git a/src/ratatui/buffer.rs b/atuin/src/ratatui/buffer.rs similarity index 100% rename from src/ratatui/buffer.rs rename to atuin/src/ratatui/buffer.rs diff --git a/src/ratatui/layout.rs b/atuin/src/ratatui/layout.rs similarity index 100% rename from src/ratatui/layout.rs rename to atuin/src/ratatui/layout.rs diff --git a/src/ratatui/mod.rs b/atuin/src/ratatui/mod.rs similarity index 100% rename from src/ratatui/mod.rs rename to atuin/src/ratatui/mod.rs diff --git a/src/ratatui/style.rs b/atuin/src/ratatui/style.rs similarity index 100% rename from src/ratatui/style.rs rename to atuin/src/ratatui/style.rs diff --git a/src/ratatui/symbols.rs b/atuin/src/ratatui/symbols.rs similarity index 100% rename from src/ratatui/symbols.rs rename to atuin/src/ratatui/symbols.rs diff --git a/src/ratatui/terminal.rs b/atuin/src/ratatui/terminal.rs similarity index 100% rename from src/ratatui/terminal.rs rename to atuin/src/ratatui/terminal.rs diff --git a/src/ratatui/text.rs b/atuin/src/ratatui/text.rs similarity index 100% rename from src/ratatui/text.rs rename to atuin/src/ratatui/text.rs diff --git a/src/ratatui/widgets/barchart.rs b/atuin/src/ratatui/widgets/barchart.rs similarity index 100% rename from src/ratatui/widgets/barchart.rs rename to atuin/src/ratatui/widgets/barchart.rs diff --git a/src/ratatui/widgets/block.rs b/atuin/src/ratatui/widgets/block.rs similarity index 100% rename from src/ratatui/widgets/block.rs rename to atuin/src/ratatui/widgets/block.rs diff --git a/src/ratatui/widgets/canvas/line.rs b/atuin/src/ratatui/widgets/canvas/line.rs similarity index 100% rename from src/ratatui/widgets/canvas/line.rs rename to atuin/src/ratatui/widgets/canvas/line.rs diff --git a/src/ratatui/widgets/canvas/map.rs b/atuin/src/ratatui/widgets/canvas/map.rs similarity index 100% rename from src/ratatui/widgets/canvas/map.rs rename to atuin/src/ratatui/widgets/canvas/map.rs diff --git a/src/ratatui/widgets/canvas/mod.rs b/atuin/src/ratatui/widgets/canvas/mod.rs similarity index 100% rename from src/ratatui/widgets/canvas/mod.rs rename to atuin/src/ratatui/widgets/canvas/mod.rs diff --git a/src/ratatui/widgets/canvas/points.rs b/atuin/src/ratatui/widgets/canvas/points.rs similarity index 100% rename from src/ratatui/widgets/canvas/points.rs rename to atuin/src/ratatui/widgets/canvas/points.rs diff --git a/src/ratatui/widgets/canvas/rectangle.rs b/atuin/src/ratatui/widgets/canvas/rectangle.rs similarity index 100% rename from src/ratatui/widgets/canvas/rectangle.rs rename to atuin/src/ratatui/widgets/canvas/rectangle.rs diff --git a/src/ratatui/widgets/canvas/world.rs b/atuin/src/ratatui/widgets/canvas/world.rs similarity index 100% rename from src/ratatui/widgets/canvas/world.rs rename to atuin/src/ratatui/widgets/canvas/world.rs diff --git a/src/ratatui/widgets/chart.rs b/atuin/src/ratatui/widgets/chart.rs similarity index 100% rename from src/ratatui/widgets/chart.rs rename to atuin/src/ratatui/widgets/chart.rs diff --git a/src/ratatui/widgets/clear.rs b/atuin/src/ratatui/widgets/clear.rs similarity index 100% rename from src/ratatui/widgets/clear.rs rename to atuin/src/ratatui/widgets/clear.rs diff --git a/src/ratatui/widgets/gauge.rs b/atuin/src/ratatui/widgets/gauge.rs similarity index 100% rename from src/ratatui/widgets/gauge.rs rename to atuin/src/ratatui/widgets/gauge.rs diff --git a/src/ratatui/widgets/list.rs b/atuin/src/ratatui/widgets/list.rs similarity index 100% rename from src/ratatui/widgets/list.rs rename to atuin/src/ratatui/widgets/list.rs diff --git a/src/ratatui/widgets/mod.rs b/atuin/src/ratatui/widgets/mod.rs similarity index 100% rename from src/ratatui/widgets/mod.rs rename to atuin/src/ratatui/widgets/mod.rs diff --git a/src/ratatui/widgets/paragraph.rs b/atuin/src/ratatui/widgets/paragraph.rs similarity index 100% rename from src/ratatui/widgets/paragraph.rs rename to atuin/src/ratatui/widgets/paragraph.rs diff --git a/src/ratatui/widgets/reflow.rs b/atuin/src/ratatui/widgets/reflow.rs similarity index 100% rename from src/ratatui/widgets/reflow.rs rename to atuin/src/ratatui/widgets/reflow.rs diff --git a/src/ratatui/widgets/sparkline.rs b/atuin/src/ratatui/widgets/sparkline.rs similarity index 100% rename from src/ratatui/widgets/sparkline.rs rename to atuin/src/ratatui/widgets/sparkline.rs diff --git a/src/ratatui/widgets/table.rs b/atuin/src/ratatui/widgets/table.rs similarity index 100% rename from src/ratatui/widgets/table.rs rename to atuin/src/ratatui/widgets/table.rs diff --git a/src/ratatui/widgets/tabs.rs b/atuin/src/ratatui/widgets/tabs.rs similarity index 100% rename from src/ratatui/widgets/tabs.rs rename to atuin/src/ratatui/widgets/tabs.rs diff --git a/src/shell/atuin.bash b/atuin/src/shell/atuin.bash similarity index 100% rename from src/shell/atuin.bash rename to atuin/src/shell/atuin.bash diff --git a/src/shell/atuin.fish b/atuin/src/shell/atuin.fish similarity index 100% rename from src/shell/atuin.fish rename to atuin/src/shell/atuin.fish diff --git a/src/shell/atuin.nu b/atuin/src/shell/atuin.nu similarity index 100% rename from src/shell/atuin.nu rename to atuin/src/shell/atuin.nu diff --git a/src/shell/atuin.zsh b/atuin/src/shell/atuin.zsh similarity index 100% rename from src/shell/atuin.zsh rename to atuin/src/shell/atuin.zsh