home/common/general.nix

@@ -77,10 +77,6 @@
     # i only use this as a login shell
     bash = {
       enable = true;
-      initExtra = ''
-        bind -x '"\C-r": __atuin_history'
-        export ATUIN_NOBIND=true
-      '';
     };
     git = {
       enable = true;

home/common/terminal.nix

@@ -71,8 +71,6 @@ in {
   };
   programs.urxvt = {
     # default shell can't be changed... I can create a wrapper, but fuck that
-    # symbols nerd font mono doesnt seem to work anyway, so theres no point
-    # in switching from bash to zsh in this case
     enable = supportTerminal "urxvt";
     package = pkgs.rxvt-unicode-emoji;
     keybindings = {
@@ -84,10 +82,7 @@ in {
       inheritPixmap = true;
     };
     scroll.bar.enable = false;
-    fonts = [
+    fonts = [ "xft:Noto Sans Mono:size=16" "xft:Symbols Nerd Font Mono:size=16" ];
-      "xft:Noto Sans Mono:size=16"
-      "xft:Symbols Nerd Font Mono:size=16"
-    ];
   };
   programs.foot = {
     enable = supportTerminal "foot";

home/common/zsh.nix

@@ -12,26 +12,6 @@
     history.path = "${config.xdg.dataHome}/zsh/zsh_history";
     shellAliases.s = "sudo -A";
     shellAliases.se = "sudo -AE";
-    # I dont want to remap the up key, so only map this, setting ATUIN_NOBIND to true
-    initExtra = ''
-      up-line-or-local-history() {
-        zle set-local-history 1
-        zle up-line-or-history
-        zle set-local-history 0
-      }
-      zle -N up-line-or-local-history
-      down-line-or-local-history() {
-        zle set-local-history 1
-        zle down-line-or-history
-        zle set-local-history 0
-      }
-      zle -N down-line-or-local-history
-      bindkey '^[[A' up-line-or-local-history
-      bindkey '^[OA' up-line-or-local-history
-      bindkey '^[[B' down-line-or-local-history
-      bindkey '^[OB' down-line-or-local-history
-      bindkey '^r' _atuin_search_widget
-    '';
     localVariables = {
       POWERLEVEL9K_LEFT_PROMPT_ELEMENTS = [
         # "os_icon"               # os identifier
@@ -121,9 +101,6 @@
       POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND = "3";
       POWERLEVEL9K_NIX_SHELL_FOREGROUND = "15";
       SHELL = "zsh";
-      ATUIN_NOBIND = "true";
-      # to allow rebinding ^r
-      ZVM_INIT_MODE = "sourcing";
     };
     plugins = with pkgs; [
       { name = "zsh-vi-mode";