Updated Emacs Config

2 files changed, 20 insertions, 31 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 1bf3490..ba51831 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,46 +1,35 @@
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
 (load-theme 'naysayer t)
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(display-line-numbers-type 'relative)
- '(indent-tabs-mode t)
- '(indent-tabs-mode-hook nil)
- '(package-selected-packages '(evil))
- '(standard-indent 4)
- '(tool-bar-mode nil)
- '(tool-bar-style nil))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
 
 ;; window
 (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
 (add-to-list 'default-frame-alist '(ns-appearance . dark))
+(add-to-list 'default-frame-alist (cons 'width 120))
+(add-to-list 'default-frame-alist (cons 'height 200))
+(tool-bar-mode -1)
 
 ;; Prevent Extraneous Tabs
 (setq-default indent-tabs-mode t)
+(setq-default tab-width 4)
+(defvaralias 'c-basic-offset 'tab-width)
 
 ;; Relative Line Numbers
 (display-line-numbers-mode)
-(setq display-line-numbers 'relative)
+(setq-default display-line-numbers 'relative)
 
 ;; Set up package.el to work with MELPA
 (require 'package)
 (add-to-list 'package-archives
-             '("melpa" . "https://melpa.org/packages/"))
+			 '("melpa" . "https://melpa.org/packages/"))
 (package-initialize)
-(package-refresh-contents)
+(unless package-archive-contents
+	(package-refresh-contents))
 
 ;; Download Evil
 (unless (package-installed-p 'evil)
-  (package-install 'evil))
+	(package-install 'evil))
 
 ;; Enable Evil
 (require 'evil)
 (evil-mode 1)
+
diff --git a/.emacs.d/themes/naysayer-theme.el b/.emacs.d/themes/naysayer-theme.el
index 5af5de3..023cd57 100644
--- a/.emacs.d/themes/naysayer-theme.el
+++ b/.emacs.d/themes/naysayer-theme.el
@@ -58,11 +58,11 @@
    ;; *****************************************************************************
 
    `(default                          ((t (:foreground ,text :background ,background, :weight normal))))
-   `(region                           ((t (:foreground nil :background ,selection))))
+   `(region                           ((t (:foreground unspecified :background ,selection))))
    `(cursor                           ((t (:background ,white                        ))))
    `(fringe                           ((t (:background ,background   :foreground ,white))))
    `(linum                            ((t (:background ,background :foreground ,gutter-fg))))
-   `(highlight ((t (:foreground nil :background ,selection))))
+   `(highlight ((t (:foreground unspecified :background ,selection))))
 
    ;; Font lock faces
    ;; *****************************************************************************
@@ -83,8 +83,8 @@
 
    ;; Plugins
    ;; *****************************************************************************
-   `(trailing-whitespace ((t (:foreground nil :background ,warning))))
-   `(whitespace-trailing ((t (:background nil :foreground ,warning :inverse-video t))))
+   `(trailing-whitespace ((t (:foreground unspecified :background ,warning))))
+   `(whitespace-trailing ((t (:background unspecified :foreground ,warning :inverse-video t))))
 
    `(linum ((t (:foreground ,line-fg :background ,background))))
    `(linum-relative-current-face ((t (:foreground ,white :background ,background))))
@@ -114,7 +114,7 @@
                                     :underline unspecified
                                     :foreground ,background
                                     :weight bold
-                                    :box nil))))
+                                    :box unspecified))))
 
    ;; mode-line and powerline
    `(mode-line-buffer-id ((t (:foreground ,background :distant-foreground ,text :text ,text :weight bold))))
@@ -122,7 +122,7 @@
                                    :underline unspecified
                                    :foreground ,background
                                    :background ,text
-                                   :box nil))))
+                                   :box unspecified))))
    `(powerline-active1 ((t (:background ,text :foreground ,background))))
    `(powerline-active2 ((t (:background ,text :foreground ,background))))
 
@@ -130,13 +130,13 @@
                                             :underline unspecified
                                             :foreground ,text
                                             :background ,background
-                                            :box nil))))
+                                            :box unspecified))))
    `(powerline-inactive1 ((t (:background ,background :foreground ,text))))
    `(powerline-inactive2 ((t (:background ,background :foreground ,text))))
 
     ;; better compatibility with default DOOM mode-line
-   `(error ((t (:foreground nil :weight normal))))
-   `(doom-modeline-project-dir ((t (:foreground nil :weight bold))))
+   `(error ((t (:foreground unspecified :weight normal))))
+   `(doom-modeline-project-dir ((t (:foreground unspecified :weight bold))))
    
    ;; js2-mode
    `(js2-function-call ((t (:inherit (font-lock-function-name-face)))))