From 99dddafe63c103f2fe89c1e8f71ace8b779f50c0 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 26 Aug 2017 00:00:11 +0300 Subject: [PATCH] Remove fringe bothersome borders, add desktop save --- .emacs.desktop | 43 ----------------- .emacs.desktop.lock | 1 - behaviour.el | 2 +- desktops/.emacs.desktop | 94 +++++++++++++++++++++++++++--------- desktops/.emacs.desktop.lock | 1 + key-bindings.el | 13 +---- themes.el | 11 ++++- windows.el | 2 - 8 files changed, 84 insertions(+), 83 deletions(-) delete mode 100644 .emacs.desktop delete mode 100644 .emacs.desktop.lock create mode 100644 desktops/.emacs.desktop.lock diff --git a/.emacs.desktop b/.emacs.desktop deleted file mode 100644 index e53c589..0000000 --- a/.emacs.desktop +++ /dev/null @@ -1,43 +0,0 @@ -;; -*- mode: emacs-lisp; coding: emacs-mule; -*- -;; -------------------------------------------------------------------------- -;; Desktop File for Emacs -;; -------------------------------------------------------------------------- -;; Created Fri Aug 25 23:09:02 2017 -;; Desktop file format version 208 -;; Emacs version 25.2.1 - -;; Global section: -(setq desktop-saved-frameset [frameset 1 (22944 33758 121905 0) (desktop . "208") "maciej@INBNOT022.local" nil nil ((((font-backend mac-ct) (fontsize . 0) (font . "-*-Hasklig-normal-normal-normal-*-15-*-*-*-m-0-iso10646-1") (border-width . 0) (internal-border-width . 2) (vertical-scroll-bars) (horizontal-scroll-bars) (foreground-color . "#383838") (background-color . "#f8f8f8") (line-spacing) (left-fringe . 8) (right-fringe . 8) (menu-bar-lines . 0) (tool-bar-lines . 0) (title) (icon-type) (auto-raise) (auto-lower) (cursor-type . box) (scroll-bar-width . 0) (scroll-bar-height . 0) (alpha) (fullscreen . fullboth) (display-type . color) (background-mode . light) (cursor-color . "#ab4642") (environment) (border-color . "#b8b8b8") (frameset--id . "832B-AC8B-938A-1FAC") (frameset--mini t . t) (modeline . t) (minibuffer . t) (unsplittable) (right-divider-width . 0) (bottom-divider-width . 0) (icon-name) (display . "INBNOT022.local") (explicit-name) (tool-bar-position . top) (visibility . t) (height . 75) (width . 282) (left . 1) (top . 6)) ((min-height . 8) (min-width . 20) (min-height-ignore . 4) (min-width-ignore . 11) (min-height-safe . 2) (min-width-safe . 4) (min-pixel-height . 152) (min-pixel-width . 180) (min-pixel-height-ignore . 76) (min-pixel-width-ignore . 99) (min-pixel-height-safe . 38) (min-pixel-width-safe . 36)) vc (pixel-width . 2554) (pixel-height . 1406) (total-width . 284) (total-height . 74) (normal-height . 1.0) (normal-width . 1.0) (combination-limit) (hc (pixel-width . 2554) (pixel-height . 1159) (total-width . 284) (total-height . 61) (normal-height . 0.8285714285714285) (normal-width . 1.0) (combination-limit) (leaf (pixel-width . 1683) (pixel-height . 1159) (total-width . 187) (total-height . 61) (normal-height . 1.0) (normal-width . 0.6603260869565217) (parameters (purpose-dedicated . t)) (buffer "functions.el" (selected) (hscroll . 0) (fringes 8 8 nil) (margins 2 . 1) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 1453) (start . 1))) (leaf (last . t) (pixel-width . 871) (pixel-height . 1159) (total-width . 97) (total-height . 61) (normal-height . 1.0) (normal-width . 0.33967391304347827) (parameters (purpose-dedicated . t)) (buffer "*pu-dummy-test*" (selected) (hscroll . 0) (fringes 8 8 nil) (margins nil) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 1) (start . 1)))) (leaf (last . t) (pixel-width . 2554) (pixel-height . 247) (total-width . 284) (total-height . 13) (normal-height . 0.17142857142857143) (normal-width . 1.0) (parameters (purpose-dedicated . t)) (buffer "*magit: .emacs.d" (selected . t) (hscroll . 0) (fringes 8 8 nil) (margins nil) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 188) (start . 1)))))]) -(setq desktop-missing-file-warning nil) -(setq tags-file-name nil) -(setq tags-table-list nil) -(setq search-ring nil) -(setq regexp-search-ring nil) -(setq register-alist nil) -(setq file-name-history nil) - -;; Buffer section -- buffers listed in same order as in buffer list: -(desktop-create-buffer 208 - "/Users/maciej/.emacs.d/windows.el" - "windows.el" - 'emacs-lisp-mode - '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) - 307 - '(301 nil) - nil - nil - '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) - '((mark-ring (242 165)))) - -(desktop-create-buffer 208 - "/Users/maciej/.emacs.d/functions.el" - "functions.el" - 'emacs-lisp-mode - '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) - 1453 - '(1453 nil) - nil - nil - '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) - '((mark-ring nil))) - diff --git a/.emacs.desktop.lock b/.emacs.desktop.lock deleted file mode 100644 index 57e9f4c..0000000 --- a/.emacs.desktop.lock +++ /dev/null @@ -1 +0,0 @@ -98515 \ No newline at end of file diff --git a/behaviour.el b/behaviour.el index 1bc2c5d..df48bf4 100644 --- a/behaviour.el +++ b/behaviour.el @@ -49,7 +49,7 @@ (fset 'yes-or-no-p 'y-or-n-p) ;; Trim trailing whitespace on save -(add-hook 'before-save-hook 'delete-trailing-whitespace) +(add-hook 'before-save-hook 'whitespace-cleanup) ;; Save desktop session on exit (desktop-save-mode 1) diff --git a/desktops/.emacs.desktop b/desktops/.emacs.desktop index 4d8bb7e..d31e378 100644 --- a/desktops/.emacs.desktop +++ b/desktops/.emacs.desktop @@ -2,54 +2,102 @@ ;; -------------------------------------------------------------------------- ;; Desktop File for Emacs ;; -------------------------------------------------------------------------- -;; Created Fri Aug 25 23:06:00 2017 +;; Created Fri Aug 25 23:50:20 2017 ;; Desktop file format version 208 ;; Emacs version 25.2.1 ;; Global section: -(setq desktop-saved-frameset [frameset 1 (22944 33576 846692 0) (desktop . "208") "maciej@INBNOT022.local" nil nil ((((font-backend mac-ct) (fontsize . 0) (font . "-*-Hasklig-normal-normal-normal-*-15-*-*-*-m-0-iso10646-1") (border-width . 0) (internal-border-width . 2) (vertical-scroll-bars) (horizontal-scroll-bars) (foreground-color . "#383838") (background-color . "#f8f8f8") (line-spacing) (left-fringe . 8) (right-fringe . 8) (menu-bar-lines . 0) (tool-bar-lines . 0) (title) (icon-type) (auto-raise) (auto-lower) (cursor-type . box) (scroll-bar-width . 0) (scroll-bar-height . 0) (alpha) (fullscreen . fullboth) (display-type . color) (background-mode . light) (cursor-color . "#ab4642") (environment) (border-color . "#b8b8b8") (frameset--id . "89A7-C3ED-3B20-205D") (frameset--mini t . t) (height . 75) (width . 282) (modeline . t) (minibuffer . t) (unsplittable) (left . 1) (top . 6) (right-divider-width . 0) (bottom-divider-width . 0) (icon-name) (visibility . t) (display . "INBNOT022.local") (explicit-name) (tool-bar-position . top)) ((min-height . 8) (min-width . 20) (min-height-ignore . 4) (min-width-ignore . 11) (min-height-safe . 2) (min-width-safe . 4) (min-pixel-height . 152) (min-pixel-width . 180) (min-pixel-height-ignore . 76) (min-pixel-width-ignore . 99) (min-pixel-height-safe . 38) (min-pixel-width-safe . 36)) vc (pixel-width . 2554) (pixel-height . 1406) (total-width . 284) (total-height . 74) (normal-height . 1.0) (normal-width . 1.0) (combination-limit) (hc (pixel-width . 2554) (pixel-height . 1159) (total-width . 284) (total-height . 61) (normal-height . 0.8285714285714286) (normal-width . 1.0) (combination-limit) (leaf (pixel-width . 1681) (pixel-height . 1159) (total-width . 187) (total-height . 61) (normal-height . 1.0) (normal-width . 0.6576086956521738) (parameters (purpose-dedicated . t)) (buffer "functions.el" (selected . t) (hscroll . 0) (fringes 8 8 nil) (margins 2 . 1) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 1451) (start . 1))) (leaf (last . t) (pixel-width . 873) (pixel-height . 1159) (total-width . 97) (total-height . 61) (normal-height . 1.0) (normal-width . 0.3423913043478261) (parameters (purpose-dedicated . t)) (buffer "*pu-dummy-test*" (selected) (hscroll . 0) (fringes 8 8 nil) (margins nil) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 1) (start . 1)))) (leaf (last . t) (pixel-width . 2554) (pixel-height . 247) (total-width . 284) (total-height . 13) (normal-height . 0.17142857142857143) (normal-width . 1.0) (parameters (purpose-dedicated . t)) (buffer "*Compile-Log*" (selected) (hscroll . 0) (fringes 8 8 nil) (margins 3) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 11070) (start . 10855)))))]) +(setq desktop-saved-frameset [frameset 1 (22944 36236 520173 0) (desktop . "208") "maciej@INBNOT022.local" nil nil ((((font-backend mac-ct) (fontsize . 0) (font . "-*-Hasklig-normal-normal-normal-*-15-*-*-*-m-0-iso10646-1") (border-width . 0) (internal-border-width . 2) (vertical-scroll-bars) (horizontal-scroll-bars) (foreground-color . "#383838") (background-color . "#f8f8f8") (line-spacing) (left-fringe . 8) (right-fringe . 8) (menu-bar-lines . 0) (tool-bar-lines . 0) (title) (icon-type) (auto-raise) (auto-lower) (cursor-type . box) (scroll-bar-width . 0) (scroll-bar-height . 0) (alpha) (fullscreen . fullboth) (display-type . color) (background-mode . light) (cursor-color . "#ab4642") (environment) (border-color . "#b8b8b8") (frameset--id . "832B-AC8B-938A-1FAC") (frameset--mini t . t) (modeline . t) (minibuffer . t) (unsplittable) (right-divider-width . 0) (bottom-divider-width . 0) (icon-name) (display . "INBNOT022.local") (explicit-name) (tool-bar-position . top) (visibility . t) (height . 75) (width . 282) (left . 1) (top . 6)) ((min-height . 8) (min-width . 20) (min-height-ignore . 4) (min-width-ignore . 12) (min-height-safe . 2) (min-width-safe . 4) (min-pixel-height . 152) (min-pixel-width . 180) (min-pixel-height-ignore . 76) (min-pixel-width-ignore . 108) (min-pixel-height-safe . 38) (min-pixel-width-safe . 36)) vc (pixel-width . 2554) (pixel-height . 1406) (total-width . 284) (total-height . 74) (normal-height . 1.0) (normal-width . 1.0) (combination-limit) (hc (pixel-width . 2554) (pixel-height . 1178) (total-width . 284) (total-height . 62) (normal-height . 0.8378378378378378) (normal-width . 1.0) (combination-limit) (leaf (pixel-width . 1681) (pixel-height . 1178) (total-width . 187) (total-height . 62) (normal-height . 1.0) (normal-width . 0.6581832419733751) (parameters (purpose-dedicated . t)) (buffer "*scratch*" (selected . t) (hscroll . 0) (fringes 8 8 nil) (margins 1) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 145) (start . 1))) (leaf (last . t) (pixel-width . 873) (pixel-height . 1178) (total-width . 97) (total-height . 62) (normal-height . 1.0) (normal-width . 0.3418167580266249) (parameters (purpose-dedicated . t)) (buffer "user_test.exs" (selected) (hscroll . 0) (fringes 8 8 nil) (margins 2 . 1) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 627) (start . 1)))) (leaf (last . t) (pixel-width . 2554) (pixel-height . 228) (total-width . 284) (total-height . 12) (normal-height . 0.16216216216216217) (normal-width . 1.0) (parameters (purpose-dedicated . t)) (buffer "*pu-dummy-tools*" (selected) (hscroll . 0) (fringes 8 8 nil) (margins nil) (scroll-bars nil 0 t nil 0 nil) (vscroll . 0) (dedicated) (point . 1) (start . 1)))))]) (setq desktop-missing-file-warning nil) (setq tags-file-name nil) (setq tags-table-list nil) (setq search-ring nil) (setq regexp-search-ring nil) -(setq register-alist nil) -(setq file-name-history '("~/.emacs.d/desktops")) +(setq register-alist '((113) (48 . "(evil-leader/set-key \"Jh\" 'dumb-jump-back); Jump back from declariation\n"))) +(setq file-name-history '("~/.emacs.d/desktops/")) ;; Buffer section -- buffers listed in same order as in buffer list: (desktop-create-buffer 208 - "/Users/maciej/.emacs.d/functions.el" - "functions.el" + "/Users/maciej/.emacs.d/key-bindings.el" + "key-bindings.el" 'emacs-lisp-mode '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) - 1451 - '(1400 nil) + 1895 + '(1895 nil) nil nil '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) - '((mark-ring (1400 1400 1400 1400 1400 1400 1400 1400 1400 1400 1505 1506 1529 1400 1533 1400)))) - -(desktop-create-buffer 208 - "/Users/maciej/.emacs.d/behaviour.el" - "behaviour.el" - 'emacs-lisp-mode - '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) - 3641 - '(3641 nil) - nil - nil - '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode) (truncate-lines . t)) - '((mark-ring (1346 1289 1234 1234 1234)))) + '((mark-ring (1895 1895 1895 1894 1865 1759 1759)))) (desktop-create-buffer 208 "/Users/maciej/.emacs.d/windows.el" "windows.el" 'emacs-lisp-mode '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) - 1 - '(nil nil) + 1042 + '(1042 nil) + nil + nil + '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) + '((mark-ring (1042 1125 1137)))) + +(desktop-create-buffer 208 + "/Users/maciej/.emacs.d/themes.el" + "themes.el" + 'emacs-lisp-mode + '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) + 1626 + '(1626 nil) + nil + nil + '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) + '((mark-ring (1763 1763 1763 1763 1706 1765 1763 1763 1653)))) + +(desktop-create-buffer 208 + "/Users/maciej/.emacs.d/behaviour.el" + "behaviour.el" + 'emacs-lisp-mode + '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) + 1128 + '(1128 nil) nil nil '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) '((mark-ring nil))) +(desktop-create-buffer 208 + "/Users/maciej/Development/elixir/showcase01/apps/http_fetcher/lib/http_fetcher/verb/verb.ex" + "verb.ex" + 'elixir-mode + '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode alchemist-mode purpose-mode ruby-end-mode) + 547 + '(547 nil) + nil + nil + '((buffer-file-coding-system . undecided-unix) (overwrite-mode)) + '((mark-ring nil))) + +(desktop-create-buffer 208 + "/Users/maciej/Development/elixir/showcase01/apps/domain/test/user/user_test.exs" + "user_test.exs" + 'elixir-mode + '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode alchemist-test-mode alchemist-mode purpose-mode ruby-end-mode) + 627 + '(nil nil) + nil + nil + '((buffer-file-coding-system . undecided-unix) (overwrite-mode)) + '((mark-ring nil))) + +(desktop-create-buffer 208 + "/Users/maciej/.emacs.d/functions.el" + "functions.el" + 'emacs-lisp-mode + '(diff-hl-mode diff-hl-flydiff-mode diff-hl-margin-mode diff-hl-margin-minor-mode linum-mode column-enforce-mode whitespace-mode yas-minor-mode rainbow-delimiters-mode rainbow-mode company-mode projectile-mode undo-tree-mode auto-revert-mode purpose-mode flycheck-mode) + 1339 + '(1339 nil) + nil + nil + '((tab-width . 2) (buffer-file-coding-system . prefer-utf-8-unix) (overwrite-mode)) + '((mark-ring (1339)))) + diff --git a/desktops/.emacs.desktop.lock b/desktops/.emacs.desktop.lock new file mode 100644 index 0000000..40be42e --- /dev/null +++ b/desktops/.emacs.desktop.lock @@ -0,0 +1 @@ +3170 \ No newline at end of file diff --git a/key-bindings.el b/key-bindings.el index d93ef81..0b452d1 100644 --- a/key-bindings.el +++ b/key-bindings.el @@ -12,6 +12,7 @@ (global-set-key (kbd "s-") 'scroll-down) ; WTF is this reverse, I dunno (global-set-key (kbd "s-") 'scroll-up) +(require 'evil-leader) ;;;;;;;;; EVIL Leader ;;;;;;;;;;;;;;;;;;;;;;;; (evil-leader/set-leader "") @@ -53,17 +54,7 @@ (evil-leader/set-key "Jl" 'dumb-jump-go); Jump to declaration (evil-leader/set-key "Jh" 'dumb-jump-back); Jump back from declariation -(evil-leader/set-key "nt" 'neotree-toggle) - +(require 'evil) ;;; VIM insert mode things (define-key evil-insert-state-map "\C-a" 'company-yasnippet) - -;;; Neotree conflict resolution -(add-hook 'neotree-mode-hook - (lambda () - (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter) - (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter) - (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide) - (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter))) - ;;; key-bindings.el ends here diff --git a/themes.el b/themes.el index 9b8dcd5..9eab310 100644 --- a/themes.el +++ b/themes.el @@ -47,12 +47,19 @@ (color-theme-approximate-on) (enable-theme 'flatui))) -;; (color-theme-approximate-on) - ;; Set font face (set-face-attribute 'default nil :font "Hasklig 15") (set-face-attribute 'helm-selection nil :font "Hasklig 15") (set-face-attribute 'helm-header nil :font "Hasklig 17") +;; Remove ugly black line +(set-face-attribute 'vertical-border nil :foreground + (face-attribute 'fringe :background)) + +;; Set fringe colors to default, so it does not bother you. +(set-face-attribute 'fringe nil + :foreground (face-foreground 'default) + :background (face-background 'default)) + (provide 'themes) ;;; themes.el ends here diff --git a/windows.el b/windows.el index 19c3d86..2144fc2 100644 --- a/windows.el +++ b/windows.el @@ -30,6 +30,4 @@ (setq purpose-use-default-configuration nil) (purpose-compile-user-configuration) -(purpose-load-window-layout 'coding_with_magit) - ;;; windows.el ends here