diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a513a43..75f3f2a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -31,11 +31,7 @@ if test -d /home/linuxbrew/.linuxbrew eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv fish)" end -if [ -n "$EAT_SHELL_INTEGRATION_DIR" ] - - source ~/.config/fish/eat.fish - -else if [ -n "$INSIDE_EMACS" ] +if [ -n "$INSIDE_EMACS" ] # This is here to make emacs and ansi-term work properly; I'm not *quite* # sure what it does but it's probably cool. function fish_title diff --git a/.config/fish/eat.fish b/.config/fish/eat.fish deleted file mode 100644 index cd0df82..0000000 --- a/.config/fish/eat.fish +++ /dev/null @@ -1,95 +0,0 @@ -# integration/fish --- Fish integration - -# Copyright (C) 2022-2024 Akib Azmain Turja. - -# This file is not part of GNU Emacs. - -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# For a full copy of the GNU General Public License -# see . - - -# Features missing compared to the bash/zsh integrations: -# - Fish history import into Emacs. -# - The PS2 prompt support (line continuation). - -function eat_enable_integration - set -g __eat_integration_enabled yes - - function __eat_chpwd --on-variable PWD - # Send the current working directory, for directory tracking. - printf '\e]51;e;A;%s;%s\e\\\\' \ - "$(echo -n -- $hostname | base64)" \ - "$(echo -n -- $PWD | base64)" - end - - function __eat_preexec --on-event fish_preexec - set current_command $argv[1] - # Send current command. - printf '\e]51;e;F;%s\e\\\\' \ - "$(echo -n -- $current_command | base64)" - - # Send pre-exec sequence. - printf '\e]51;e;G\e\\\\' - - # Update title to include the command running. - # "${PWD/$HOME/'~'}" converts "/home/akib/foo/" to "~/foo/". - # The next one is substituted with '$', or '#' if we're "root". - printf '\e]2;%s@%s:%s%s\e\\\\' "$USER" "$hostname" \ - "$(string replace $HOME '~' $PWD)" \ - "$(fish_is_root_user && echo '#' || echo '$')" \ - "$current_command" - end - - function __eat_postexec --on-event fish_postexec - set exit_status $status - # Send exit status. - printf '\e]51;e;H;%i\e\\\\' $exit_status - - # Inform that a new prompt is going to be printed. - printf '\e]51;e;J\e\\\\' - - # Update title. - # "${PWD/$HOME/'~'}" converts "/home/akib/org/" to "~/org/". - # The next one is substituted with '$', or '#' if we're "root". - printf '\e]2;%s@%s:%s%s\e\\\\' "$USER" "$hostname" \ - "$(string replace $HOME '~' $PWD)" \ - "$(fish_is_root_user && echo '#' || echo '$')" - end - - functions --copy fish_prompt __eat_original_fish_prompt - function fish_prompt - printf '\e]51;e;B\e\\\\' - __eat_original_fish_prompt $argv - printf '\e]51;e;C\e\\\\' - end -end - -function _eat_msg - set msg (printf '\e]51;e;M') - for arg in $argv - set msg $msg "$(echo -n -- $arg | base64)" - end - printf "%s\e\\\\" (string join ";" $msg) -end - -if status is-interactive - and test -z $__eat_integration_enabled - and set -q EAT_SHELL_INTEGRATION_DIR - and string match -q "eat-*" $TERM - - eat_enable_integration -end - -# Local Variables: -# mode: fish -# End: diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 32d0c41..a3d801c 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -66,11 +66,11 @@ '(package-selected-packages '(adaptive-wrap add-node-modules-path bazel blacken claudemacs clipetty clojure-mode company dap-mode deadgrep doom-themes - earthfile-mode eat eglot-java filladapt fish-mode - flycheck-elm go-mode howm ink-mode jsonnet-mode magit - poly-markdown prettier-js protobuf-mode ron-mode rust-mode - scala-ts-mode sql-indent swift-mode terraform-mode - typescript-mode wgsl-mode xterm-color zig-mode)) + earthfile-mode eglot-java filladapt fish-mode flycheck-elm + go-mode howm ink-mode jsonnet-mode magit poly-markdown + prettier-js protobuf-mode ron-mode rust-mode scala-ts-mode + sql-indent swift-mode terraform-mode typescript-mode + wgsl-mode xterm-color zig-mode)) '(package-vc-selected-packages '((claudemacs :url "https://github.com/cpoile/claudemacs"))) '(reb-re-syntax 'string) '(rmail-mail-new-frame t) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index cf9d655..356cc23 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1501,8 +1501,7 @@ Do this when you edit your project view." ;; ================================================================= ;; Terminal ;; ================================================================= -(use-package eat :ensure t - :bind (("C-c T" . eat-project))) +(use-package eat :ensure t) ;; ================================================================= ;; ron-mode