Back to use package.el

.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)
+(setq package-archives '(("melpa" . "https://melpa.org/packages/")
-(let ((bootstrap-file
+                         ("gnu" . "https://elpa.gnu.org/packages/")))
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+
-      (bootstrap-version 6))
+(eval-when-compile
-  (unless (file-exists-p bootstrap-file)
+  (unless (package-installed-p 'use-package)
-    (with-current-buffer
+	(unless package-archive-contents
-        (url-retrieve-synchronously
+      (package-refresh-contents))
-         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+	(package-install 'use-package))
-         'silent 'inhibit-cookies)
+  (require 'use-package))
-      (goto-char (point-max))
+
-      (eval-print-last-sexp)))
+(require 'use-package)
-  (load bootstrap-file nil 'nomessage))
+(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 ansi-color
-
+;;   :config
-(use-package straight
+;;   (defun atu/colorize-compilation-buffer ()
-  :custom
+;;     (when (eq major-mode 'compilation-mode)
-  (straight-use-package-by-default t))
+;;       (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