diff --git a/.emacs b/.emacs index e53bf6a..92f32b8 100644 --- a/.emacs +++ b/.emacs @@ -23,9 +23,6 @@ '(gofmt-command "goimports") '(inhibit-startup-screen t) '(org-agenda-files '("~/org/1.TODO.org")) - '(package-archives - '(("gnu" . "https://elpa.gnu.org/packages/") - ("melpa" . "https://melpa.org/packages/"))) '(package-enable-at-startup nil) '(package-selected-packages '(company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode markdown-mode srefactor irony cmake-mode company magit use-package)) @@ -55,37 +52,41 @@ (add-hook 'before-save-hook 'delete-trailing-whitespace) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Straight and use package +;; package.el and use-package bootstrap ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defvar bootstrap-version) -(let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 6)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage)) +(setq package-archives '(("melpa" . "https://melpa.org/packages/") + ("gnu" . "https://elpa.gnu.org/packages/"))) + +(eval-when-compile + (unless (package-installed-p 'use-package) + (unless package-archive-contents + (package-refresh-contents)) + (package-install 'use-package)) + (require 'use-package)) + +(require 'use-package) +(require 'use-package-ensure) +(setq use-package-always-ensure t) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; window separator +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun atu/change-window-divider () + (let ((display-table (or buffer-display-table standard-display-table))) + (set-display-table-slot display-table 5 ?│) + (set-window-display-table (selected-window) display-table))) + +(add-hook 'window-configuration-change-hook 'atu/change-window-divider) -(straight-use-package 'use-package) - -(use-package straight - :custom - (straight-use-package-by-default t)) - - -(use-package ansi-color - :config - (defun atu/colorize-compilation-buffer () - (when (eq major-mode 'compilation-mode) - (ansi-color-apply-on-region compilation-filter-start (point-max)))) - :hook - (compilation-filter . atu/colorize-compilation-buffer)) +;; (use-package ansi-color +;; :config +;; (defun atu/colorize-compilation-buffer () +;; (when (eq major-mode 'compilation-mode) +;; (ansi-color-apply-on-region compilation-filter-start (point-max)))) +;; :hook +;; (compilation-filter . atu/colorize-compilation-buffer)) (use-package smart-tabs-mode :config