feat(nix): bump flakes and add atuin

sbulav · Dec 4, 2023 · 29f4e8d · 29f4e8d
1 parent 793f7ec
commit 29f4e8d
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 18 deletions.
diff --git a/fish/config.fish b/fish/config.fish
@@ -3,6 +3,10 @@ set -a PATH "$HOME/bin/" "$HOME/.local/bin" "/opt/homebrew/bin" "$HOME/./go/bin/
 
 # Initialize FZF keybindings
 fzf_key_bindings
+if status --is-interactive;
+  atuin init fish --disable-up-arrow | source
+end
+
 
 # Set terminal
 set -g TERM screen-256color

diff --git a/fish/functions/fzf_key_bindings.fish b/fish/functions/fzf_key_bindings.fish
@@ -111,12 +111,12 @@ function fzf_key_bindings
   end
 
   bind \ct fzf-file-widget
-  bind \cr fzf-history-widget
+  # bind \cr fzf-history-widget
   bind \ec fzf-cd-widget
 
   if bind -M insert > /dev/null 2>&1
     bind -M insert \ct fzf-file-widget
-    bind -M insert \cr fzf-history-widget
+    # bind -M insert \cr fzf-history-widget
     bind -M insert \ec fzf-cd-widget
   end
 

diff --git a/nix/darwin/home-manager.nix b/nix/darwin/home-manager.nix
@@ -33,7 +33,7 @@ in {
       home.packages = pkgs.callPackage ./packages.nix {};
 
       home.stateVersion = "23.05";
-      # programs = {} // import ../shared/home-manager.nix {inherit config pkgs lib;};
+      programs = import ../shared/home-manager.nix {inherit config pkgs lib;};
     };
   };
 }
diff --git a/nix/flake.lock b/nix/flake.lock
diff --git a/nix/shared/home-manager.nix b/nix/shared/home-manager.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  name = "Sergei Bulavintsev";
+  user = "sab";
+in {
+  # atuin = {
+  #   enable = true;
+  #   # Doesn't work for me right now, explicitly do it via fish
+  #   enableFishIntegration = false;
+  # };
+}
diff --git a/nix/shared/packages.nix b/nix/shared/packages.nix
@@ -1,6 +1,7 @@
 {pkgs}:
 with pkgs; [
   alejandra
+  atuin
   bat
   cmake
   ctags