From 13f9da00abbb081b492da00c8123b39ccf2e23a5 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 10 Aug 2023 21:58:22 +0900 Subject: [PATCH 1/2] Integrate atuin without server sync --- home-manager/bash.nix | 1 + home-manager/fish.nix | 1 + home-manager/home.nix | 9 +++++++++ home-manager/packages.nix | 1 + home-manager/zsh.nix | 1 + 5 files changed, 13 insertions(+) diff --git a/home-manager/bash.nix b/home-manager/bash.nix index 3ade0038..b71f7a2a 100644 --- a/home-manager/bash.nix +++ b/home-manager/bash.nix @@ -6,6 +6,7 @@ programs.zoxide.enableBashIntegration = true; programs.fzf.enableBashIntegration = true; programs.rtx.enableBashIntegration = true; + programs.atuin.enableBashIntegration = true; # Used only in bash - https://unix.stackexchange.com/a/689403 # https://github.com/nix-community/home-manager/blob/master/modules/programs/readline.nix diff --git a/home-manager/fish.nix b/home-manager/fish.nix index 7dedb798..dcbc8499 100644 --- a/home-manager/fish.nix +++ b/home-manager/fish.nix @@ -7,6 +7,7 @@ programs.zoxide.enableFishIntegration = true; programs.fzf.enableFishIntegration = true; programs.rtx.enableFishIntegration = true; + programs.atuin.enableFishIntegration = true; xdg.configFile."fish/fish_variables".source = ../home/.config/fish/fish_variables; xdg.configFile."fish/functions/fish_prompt.fish".source = ../home/.config/fish/functions/fish_prompt.fish; diff --git a/home-manager/home.nix b/home-manager/home.nix index 170e6fe7..3231f0c7 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -150,4 +150,13 @@ # https://github.com/nix-community/home-manager/blob/master/modules/programs/rtx.nix programs.rtx.enable = true; + + # https://github.com/nix-community/home-manager/blob/master/modules/programs/atuin.nix + programs.atuin = { + enable = true; + + settings = { + sync_address = "https://127.0.0.1"; + }; + }; } diff --git a/home-manager/packages.nix b/home-manager/packages.nix index c04e3a8e..d8de44f0 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -13,6 +13,7 @@ direnv zoxide fzf + atuin # Used in anywhere coreutils diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 730f1e2c..18be6879 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -6,6 +6,7 @@ programs.zoxide.enableZshIntegration = true; programs.fzf.enableZshIntegration = true; programs.rtx.enableZshIntegration = true; + programs.atuin.enableZshIntegration = true; # https://nixos.wiki/wiki/Zsh # https://github.com/nix-community/home-manager/blob/master/modules/programs/zsh.nix From 2e9f6160cf0758373dda6c12ee13df5e325a6f3a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 10 Aug 2023 22:17:10 +0900 Subject: [PATCH 2/2] Disable hijacking up-arrow by atuin --- home-manager/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 3231f0c7..91295a08 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -155,6 +155,11 @@ programs.atuin = { enable = true; + flags = [ + # https://github.com/atuinsh/atuin/issues/51 + "--disable-up-arrow" + ]; + settings = { sync_address = "https://127.0.0.1"; };