Merge branch 'master' of gitlab.com:marcuskammer/emacs.d

bundle/custom.el

@@ -14,12 +14,8 @@
  '(delete-selection-mode t)
  '(desktop-save-mode nil)
  '(diary-file "~/Documents/Diary/diary")
- '(display-battery-mode t)
- '(display-line-numbers nil)
- '(display-line-numbers-grow-only t)
- '(display-line-numbers-type (quote relative))
- '(display-line-numbers-widen nil)
- '(display-time-mode t)
+
+
  '(display-time-world-list
    (quote
     (("America/Los_Angeles" "Seattle")
@@ -28,17 +24,17 @@
      ("Europe/Paris" "Paris")
      ("Asia/Calcutta" "Bangalore")
      ("Asia/Tokyo" "Tokyo"))))
- '(fill-column 79)
- '(font-lock-maximum-decoration t)
+
+
  '(global-auto-revert-mode t)
- '(global-display-line-numbers-mode nil)
+
  '(history-delete-duplicates t)
  '(icomplete-mode t)
  '(indent-tabs-mode nil)
  '(inferior-lisp-program (executable-find "sbcl") t)
  '(inhibit-startup-screen t)
  '(kill-read-only-ok t)
- '(line-number-mode t)
+
  '(linum-relative-backend (quote display-line-numbers-mode))
  '(load-prefer-newer t)
  '(major-mode (quote text-mode))

bundle/display.el

@@ -1,33 +1,38 @@
-(add-to-list 'default-frame-alist '(fullscreen . maximized))
-(add-to-list 'default-frame-alist '(width . 82))
-(add-to-list 'default-frame-alist '(height . 42))
-(add-to-list 'default-frame-alist '(vertical-scroll-bars))
-(add-to-list 'default-frame-alist '(horizontal-scroll-bars))
-(add-to-list 'default-frame-alist '(menu-bar-lines . 0))
+;; General userinterface and appearance
+(tool-bar-mode -1)                     ; No toolbar
+(menu-bar-mode -1)                     ; No Menubar
+(set-scroll-bar-mode 'right)           ; Scrollbar on the right
+(scroll-bar-mode -1)                   ; No scrollbar
+(global-font-lock-mode t)              ; Color enabled
+(global-prettify-symbols-mode t)       ; Prettify symbols
+(global-hl-line-mode 1)                ; Highlight cursor line
+(global-whitespace-mode 1)             ; Show whitespace globally
+(show-paren-mode 1)                    ; Visual matching parens
+(global-display-line-numbers-mode -1)   ; Display line numbers
+;; Mode line specific
+(column-number-mode 1)                 ; Display column number in the mode line
+(size-indication-mode -1)              ; Display buffer size in the mode line
+(line-number-mode 1)                   ; Display line number in the mode line
+(display-battery-mode 1)               ; Display battery status in the mode line
+(display-time-mode 1)                  ; Display time in the mode line
+
+(add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window
 (add-to-list 'default-frame-alist '(font . "Iosevka Term-14"))
-(add-to-list 'default-frame-alist '(undecorated . t))
 
-(setq-default echo-keystrokes 0.02
-              column-number-indicator-zero-based nil
-              prettify-symbols-unprettify-at-point 'right-edge
-              show-paren-delay 0
-              show-paren-style 'expression
-              whitespace-style '(tab-mark)
-              indicate-buffer-boundaries 'left)
-
-(global-font-lock-mode)
-(global-prettify-symbols-mode)
-(global-hl-line-mode)
-(global-whitespace-mode)
-(size-indication-mode)
-(column-number-mode)
-(show-paren-mode)
-
-(when (eq system-type 'windows-nt)
-  (add-to-list 'default-frame-alist '(undecorated . nil)))
-
-(when (eq system-type 'gnu/linux)
-  (when (display-graphic-p)))
+(setq-default
+  echo-keystrokes 0.02
+  column-number-indicator-zero-based nil
+  prettify-symbols-unprettify-at-point 'right-edge
+  show-paren-delay 0
+  show-paren-style 'expression
+  whitespace-style '(tab-mark)
+  font-lock-maximum-decoration t
+  fill-column 72
+  indicate-buffer-boundaries 'left
+  display-line-numbers-grow-only t
+  display-line-numbers-type (quote relative)
+  display-line-numbers-widen nil
+)
 
 (provide 'display)
 

bundle/hooks.el

@@ -1,16 +1,26 @@
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
 (add-hook 'write-file-hooks 'delete-trailing-whitespace)
-(add-hook 'markdown-mode-hook 'turn-on-font-lock)
-(add-hook 'python-mode-hook 'turn-on-font-lock)
-(add-hook 'org-mode-hook 'turn-on-font-lock)
 (add-hook 'org-mode-hook 'turn-on-auto-fill)
-(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1)))
+(add-hook 'elpy-mode-hook
+  (lambda ()
+    (highlight-indentation-mode -1)))
 (elpy-enable)
 
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
 
+;; (add-hook 'newsticker-plainview-hooks (lambda () (display-line-numbers-mode -1)))
+;; (add-hook 'python-mode-hook (lambda () (display-line-numbers-mode 1)))
+
+(setq my-hooks '(python-mode-hook emacs-lisp-mode-hook))
+(while my-hooks (add-hook (car my-hooks)
+                  (lambda ()
+                    (display-line-numbers-mode 1)))
+  (setq my-hooks (cdr my-hooks)))
+
+(add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)
+
 (provide 'hooks)
 
 ;; Local Variables:

eww-bookmarks

@@ -1,2 +1,4 @@
 ;; Auto-generated file; don't edit
-((:url "https://htdp.org/2018-01-06/Book/" :title "How to Design Programs, Second Edition" :time "Sat Feb 15 10:57:02 2020"))
+((:url "https://www.emacswiki.org/emacs/EmacsCrashCode" :title "EmacsWiki: Emacs Crash Code" :time "Sun Feb 16 14:42:11 2020")
+ (:url "https://www.emacswiki.org/emacs/EmacsCrashShortcuts" :title "EmacsWiki: Emacs Crash Shortcuts" :time "Sun Feb 16 13:02:34 2020")
+ (:url "https://htdp.org/2018-01-06/Book/" :title "How to Design Programs, Second Edition" :time "Sat Feb 15 10:57:02 2020"))

init.el

@@ -49,11 +49,11 @@ There are two things you can do about this warning:
 ;; Load my custom bundles
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle"))
 (require 'os)
+(require 'display)
 (require 'fill-column-indicator)
 (require 'calendar-settings)
 (require 'org-mode-settings)
 (require 'sbcl-settings)
-(require 'display)
 (require 'hooks)
 
 ;; UTF-8 FTW