From 4891b2a358331553c3e8b53feacb195f51c37949 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Tue, 30 Apr 2024 17:05:33 -0400 Subject: [PATCH] Change editor from emacsclient back to emacs --- .bashrc | 2 +- .gitconfig | 2 +- .scripts/startup.sh | 2 -- .xinitrc | 4 ++-- README.org | 10 ++++------ 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.bashrc b/.bashrc index 1153927..f1fbdb2 100644 --- a/.bashrc +++ b/.bashrc @@ -117,7 +117,7 @@ if ! shopt -oq posix; then fi # ENVIRONMENT VARIABLES -export EDITOR="emacsclient -c" +export EDITOR="emacs" export TERM=xterm-256color export QT_STYLE_OVERRIDE=kvantum export XDG_CONFIG_HOME=$HOME/.config diff --git a/.gitconfig b/.gitconfig index 3084c93..2ef9d37 100644 --- a/.gitconfig +++ b/.gitconfig @@ -38,7 +38,7 @@ untrack = rm --cache -- [core] # Emacs - editor = "emacsclient -c" + editor = "emacs" # Don't consider trailing space change as a cause for merge conflicts whitespace = -trailing-space [diff] diff --git a/.scripts/startup.sh b/.scripts/startup.sh index 7396058..9811a2d 100755 --- a/.scripts/startup.sh +++ b/.scripts/startup.sh @@ -10,7 +10,6 @@ declare -a startup_array=(\ "/usr/bin/redshift -x" \ # Redshift Blue Light Filter "/usr/bin/unclutter" \ # Hide Mouse Cursor "/usr/bin/easyeffects --gapplication-service" \ # Easy Effects PipeWire Plugins - "/usr/bin/emacs --daemon" \ # Emacs Daemon ) declare -a kill_startup_array=(\ @@ -24,7 +23,6 @@ declare -a kill_startup_array=(\ "pkill redshift" \ # Redshift Blue Light Filter "pkill unclutter" \ # Hide Mouse Cursor "pkill easyeffects" \ # Easy Effects PipeWire Plugins - "pkill emacs" \ # Emacs Daemon ) declare -a delay_array=(\ diff --git a/.xinitrc b/.xinitrc index e0d7599..ee0ccd4 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,8 +1,8 @@ #!/usr/bin/env bash export TERM=xterm-256color # Sets the terminal type export SHELL=/usr/bin/fish # Preferred shell -export EDITOR="emacsclient -c" # Default editor -export GIT_EDITOR="emacsclient -c" # Default git editor +export EDITOR="emacs" # Default editor +export GIT_EDITOR="emacs" # Default git editor export BROWSER=vivaldi-stable # Web Browser export XDG_CONFIG_HOME=$HOME/.config # Set Config directory export QT_QPA_PLATFORMTHEME=qt5ct # QGtkStyle diff --git a/README.org b/README.org index 35211c4..14fc773 100644 --- a/README.org +++ b/README.org @@ -344,7 +344,7 @@ Things to ignore in dotfiles git repo. untrack = rm --cache -- [core] # Emacs - editor = "emacsclient -c" + editor = "emacs" # Don't consider trailing space change as a cause for merge conflicts whitespace = -trailing-space [diff] @@ -4941,7 +4941,7 @@ if ! shopt -oq posix; then fi # ENVIRONMENT VARIABLES -export EDITOR="emacsclient -c" +export EDITOR="emacs" export TERM=xterm-256color export QT_STYLE_OVERRIDE=kvantum export XDG_CONFIG_HOME=$HOME/.config @@ -9450,8 +9450,8 @@ Host gitea.sravanbalaji.com #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle .xinitrc export TERM=xterm-256color # Sets the terminal type export SHELL=/usr/bin/fish # Preferred shell -export EDITOR="emacsclient -c" # Default editor -export GIT_EDITOR="emacsclient -c" # Default git editor +export EDITOR="emacs" # Default editor +export GIT_EDITOR="emacs" # Default git editor export BROWSER=vivaldi-stable # Web Browser export XDG_CONFIG_HOME=$HOME/.config # Set Config directory export QT_QPA_PLATFORMTHEME=qt5ct # QGtkStyle @@ -9659,7 +9659,6 @@ declare -a startup_array=(\ "/usr/bin/redshift -x" \ # Redshift Blue Light Filter "/usr/bin/unclutter" \ # Hide Mouse Cursor "/usr/bin/easyeffects --gapplication-service" \ # Easy Effects PipeWire Plugins - "/usr/bin/emacs --daemon" \ # Emacs Daemon ) declare -a kill_startup_array=(\ @@ -9673,7 +9672,6 @@ declare -a kill_startup_array=(\ "pkill redshift" \ # Redshift Blue Light Filter "pkill unclutter" \ # Hide Mouse Cursor "pkill easyeffects" \ # Easy Effects PipeWire Plugins - "pkill emacs" \ # Emacs Daemon ) declare -a delay_array=(\