diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index 223fc99f..aa9aab1b 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -723,6 +723,7 @@ The current directory is assumed to be the project's root otherwise." (setq tramp-default-method "scp")) (use-package shackle + :disabled t :config (progn (diminish 'shackle-mode) @@ -2467,13 +2468,25 @@ items follow a style that is consistent with other prog-modes." (let ((new-height (read-face-attribute 'default :height (selected-frame)))) (set-face-attribute 'default nil :height new-height))) +(defvar imalison:linum-format) + +(make-variable-buffer-local 'imalison:linum-format) +(defun imalison:linum-before-numbering-hook () + (setq imalison:linum-format + (concat "%" (number-to-string + (max (length (number-to-string (count-lines (point-min) (point-max)))) 3)) "d"))) + +(defun imalison:format-linum (line-text) + (propertize (format imalison:linum-format line-text) 'face 'linum)) + (defun imalison:remove-fringe-and-hl-line-mode (&rest stuff) (interactive) (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1)) (if (fboundp 'tool-bar-mode) (tool-bar-mode -1)) (if (fboundp 'menu-bar-mode) (menu-bar-mode -1)) ;; (set-fringe-mode 0) ;; Lets reenable fringes. They seem useful - (defvar-setq linum-format 'dynamic) + (defvar-setq linum-format 'imalison:format-linum) + (add-hook 'linum-before-numbering-hook 'imalison:linum-before-numbering-hook) (setq left-margin-width 0) (defvar-setq hl-line-mode nil)) diff --git a/dotfiles/lib/shellenv.sh b/dotfiles/lib/shellenv.sh index 452ff14e..d6117805 100644 --- a/dotfiles/lib/shellenv.sh +++ b/dotfiles/lib/shellenv.sh @@ -15,7 +15,7 @@ function _setup_env { hash brew 2>/dev/null && idem_add_to_front_of_path "$(brew --prefix coreutils)/libexec/gnubin" idem_add_to_front_of_path "/usr/local/bin" - idem_add_to_front_of_path `python -c 'import sysconfig; print sysconfig.get_path("scripts")'` + idem_add_to_back_of_path `python -c 'import sysconfig; print sysconfig.get_path("scripts")'` if is_osx; then export CFLAGS=-Qunused-arguments diff --git a/dotfiles/lib/shellenv/functions.sh b/dotfiles/lib/shellenv/functions.sh index 293c74fa..bbaa8a37 100644 --- a/dotfiles/lib/shellenv/functions.sh +++ b/dotfiles/lib/shellenv/functions.sh @@ -369,7 +369,7 @@ function timestamp { } function parse_timestamp { - date -d "@$(echo $1 | cut -c -10)" + date -d "@$(echo $1 | cut -c -10)" -Iseconds } function clear_path {