Several changes

Modify dotfiles/.bash_profile, dotfiles/.emacs, dotfiles/.emacs.d/.gitignore, dotfiles/.emacs.d/places, dotfiles/.emacs.d/tramp, elisp/set-variables.el Remove dotfiles/.emacs.d/.emacs.desktop, dotfiles/.emacs.d/.emacs.desktop.lock
rec · Jul 19, 2024 · d31713d · d31713d
1 parent 49360a3
commit d31713d
Show file tree

Hide file tree

Showing 8 changed files with 236 additions and 292 deletions.
diff --git a/dotfiles/.bash_profile b/dotfiles/.bash_profile
@@ -1 +1,22 @@
 . ~/.bashrc
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then
+        . "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh"
+    else
+        export PATH="/opt/homebrew/Caskroom/miniconda/base/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
+
+# Setting PATH for Python 3.13
+# The original version is saved in .bash_profile.pysave
+PATH="/Library/Frameworks/Python.framework/Versions/3.13/bin:${PATH}"
+export PATH
diff --git a/dotfiles/.emacs b/dotfiles/.emacs
@@ -49,7 +49,7 @@
  '(global-mark-ring-max 256)
  '(global-whitespace-mode t)
  '(grep-command
-   "egrep -nHIR * --include \\*.py --include \\*.h --include \\*.cpp --include \\*.yaml -e ")
+   "egrep -nHIR * --include \\*.py --include \\*.h --include \\*.cpp --include \\*.yaml --exclude-dir=build -e ")
  '(grep-find-command
    '("find . -type f -exec egrep --exclude-dir={build,htmlcov} -nHIR * --include \\*.py -e  \\{\\} +" . 85))
  '(grep-find-template
@@ -63,6 +63,7 @@
  '(indicate-buffer-boundaries 'left)
  '(kill-ring-max 1024)
  '(large-file-warning-threshold nil)
+ '(magit-auto-revert-mode nil)
  '(mark-ring-max 256)
  '(package-selected-packages
    '(saveplace git-gutter git-gutter+ yaml-mode template shell-here s realgud python-mode pylint protobuf-mode markdown-mode magit-filenotify live-preview google-c-style golden-ratio-scroll-screen electric-operator dash-functional dash-at-point cython-mode counsel blacken))
@@ -87,6 +88,7 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(default ((t (:family "Monaco" :foundry "nil" :slant normal :weight medium :height 130 :width normal))))
  '(custom-variable-tag ((t (:foreground "light blue3" :weight bold))))
  '(diff-added ((t (:inherit diff-changed :extend t :background "#bbffbb"))))
  '(diff-file-header ((t (:extend t :background "grey80" :weight bold))))

diff --git a/dotfiles/.emacs.d/.emacs.desktop b/dotfiles/.emacs.d/.emacs.desktop
diff --git a/dotfiles/.emacs.d/.emacs.desktop.lock b/dotfiles/.emacs.d/.emacs.desktop.lock
diff --git a/dotfiles/.emacs.d/.gitignore b/dotfiles/.emacs.d/.gitignore
@@ -8,3 +8,4 @@ auto-save-list/
 junk/
 desktops/
 lisp/step-elisp
+url/
diff --git a/dotfiles/.emacs.d/places b/dotfiles/.emacs.d/places
diff --git a/dotfiles/.emacs.d/tramp b/dotfiles/.emacs.d/tramp
@@ -1,4 +1,4 @@
-;; -*- emacs-lisp -*- <24/06/14 16:53:00 ~/.emacs.d/tramp>
+;; -*- emacs-lisp -*- <24/07/16 19:25:48 ~/.emacs.d/tramp>
 ;; Tramp connection history.  Don't change this file.
 ;; Run `M-x tramp-cleanup-all-connections' instead.
 
@@ -13,12 +13,10 @@
    ("/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin"))
   ("pipe-buf" 4096)
   ("remote-shell" "/bin/sh")
-  ("~" "/home/rec")
   ("file-exists" "test -e")
   ("case-insensitive" nil)
-  ("perl-file-spec" t)
-  ("perl-cwd-realpath" t)
-  ("perl" "\\perl")
+  ("~" "/home/rec")
+  ("dev-tty" t)
   ("readlink" "\\readlink")
   ("stat" "env QUOTING_STYLE=locale \\stat")
   ("id" "/bin/id")
@@ -33,10 +31,14 @@
   ("bzr" nil)
   ("git" "\\git")
   ("hg" nil)
-  ("dev-tty" t)
   ("ln" "\\ln")
+  ("perl-file-spec" t)
+  ("perl-cwd-realpath" t)
+  ("perl" "\\perl")
   ("ls" "/bin/ls --color=never")
   ("ls--quoting-style=literal --show-control-chars" "--quoting-style=literal --show-control-chars")
   ("ls--dired" "--dired")
   ("df-blocksize" 1)
-  ("df" "\\df --block-size=1 --output=size,used,avail")))
+  ("df" "\\df --block-size=1 --output=size,used,avail")
+  ("touch-t" t)
+  ("touch" "\\touch")))
diff --git a/elisp/set-variables.el b/elisp/set-variables.el
@@ -26,8 +26,9 @@
 ;; (global-whitespace-mode t)
 
 (put 'dired-find-alternate-file 'disabled nil)
-
 (setq
+  auto-revert-use-notify nil
+  auto-revert-interval 20
   backup-by-copying-when-linked t   ; handle links correctly
   backup-by-copying-when-mismatch t
   backup-directory-alist (list (cons "." backup-dir))