Merge branch 'master' of matthewkosarek.xyz:/srv/git/emacs_config

1 files changed, 0 insertions, 59 deletions

diff --git a/lisp/general.el~ b/lisp/general.el~
deleted file mode 100644
index b06836a..0000000
--- a/lisp/general.el~
+++ /dev/null
@@ -1,59 +0,0 @@
-(defun setup-general()
-  ;; menu bars
-  (menu-bar-mode -1)
-  (toggle-scroll-bar -1)
-  (tool-bar-mode -1)
-  (setq mac-shift-modifier 'meta)
-
-  ;; Default Values
-  ;(setq-default indent-tabs-mode t)  ; use spaces only if nil
-  (setq-default tab-width 4) ; Assuming you want your tabs to be four spaces wide
-  (set-face-attribute 'default nil :font "Droid Sans Mono-12")
-  (set-fontset-font t nil "Courier New" nil 'append)
-  (set-fontset-font t '(?😊 . ?😎) "Segoe UI Emoji")
-
-  ;;(set-face-attribute 'default nil :height 110 :family  "Consolas")
-  (set-language-environment "UTF-8")
-  (set-default-coding-systems 'utf-8)
-
-  ;; Cursor
-  (setq-default cursor-type 'bar)
-  (blink-cursor-mode 1)
-
-  ;; Margin
-  (global-linum-mode 1)
-  ;; (require 'minimap)
-  ;; (minimap-mode 1)
-  (require 'perfect-margin)
-  (perfect-margin-mode 1)
-
-  ;; Highlight line
-  (require 'hl-line)
-  (global-hl-line-mode 1)
-  (set-face-background hl-line-face "#EFEFEF")
-
-  ;; Initialization screen
-  (setq inhibit-splash-screen t)
-  (setq initial-scratch-message "")
-  (setq initial-major-mode 'text-mode)
-  (org-agenda-list)
-  (delete-other-windows)
-
-  ;; Projectile for projects
-  (require 'projectile)
-  (projectile-mode +1)
-  (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
-
-  ;; Tree
-  (require 'neotree)
-  (global-set-key [f8] 'neotree-toggle)
-  (setq neo-smart-open t)
-  (setq projectile-switch-project-action 'neotree-projectile-action)
-  (setq neo-theme (if (display-graphic-p) 'icons 'arrow))
-
-  ;; Smooth scroll
-  (require 'smooth-scrolling)
-  (smooth-scrolling-mode 1)
-)
-
-(provide 'general)