emacs: remove guix, change theme, adjust for diff machines

Remove guix configuration, change theme to gruvbox-dark, adjust font
sizes for hermes

2 files changed, 20 insertions, 47 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cbb05a8..b71310a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,25 +1,9 @@
 (defvar is-zeus (equal (system-name) "zeus"))
-(defvar is-hephaestus (equal (system-name) "hephaestus"))
+(defvar is-hermes (equal (system-name) "hermes"))
 
 (setq browse-url-browser-function 'browse-url-generic
       browse-url-generic-program "mullvad-browser")
 
-;; When guix t, load emacs packages
-(when (or is-zeus
-	  is-hephaestus
-  (add-to-list 'load-path "~/.guix-profile/share/emacs/site-lisp")
-  (guix-emacs-autoload-packages)))
-
-(with-eval-after-load 'geiser-guile
-  (add-to-list 'geiser-guile-load-path "~/dotfiles/.config/guix"))
-
-;; Personal Information
-(setq user-full-name "Thanos Apollo"
-      user-mail-address "[email protected]")
-
-(setq copyright-names-regexp
-      (format "%s <%s>" user-full-name user-mail-address))
-
 (defconst my-package-list '(org-snooze
 			      all-the-icons
 			      all-the-icons-dired
@@ -29,6 +13,7 @@
 			      emojify
 			      general
 			      doom-themes
+			      gruvbox-theme
 			      doom-modeline
 			      counsel
 			      which-key
@@ -109,7 +94,10 @@ Contains the list of packages that need to be installed.")
 (add-to-list 'default-frame-alist '(alpha 90 90))
 
 (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
-(when is-hephaestus
+
+
+(if is-zeus
+    (display-battery-mode 0)
   (display-battery-mode 1))
 
 (scroll-bar-mode -1)
@@ -142,7 +130,7 @@ Contains the list of packages that need to be installed.")
   (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
 (defvar apollo/default-font-size 140)
-(when (equal (system-name) "hermes")
+(when is-hermes 
   (setq apollo/default-font-size 110))
 
 (set-face-attribute 'default nil
@@ -187,7 +175,7 @@ Contains the list of packages that need to be installed.")
 						   :v-adjust -0.05
 						   :face 'font-lock-keyword-face))
 
-(load-theme 'doom-ayu-dark t)
+(load-theme 'gruvbox-dark-hard t)
 (doom-modeline-mode 1)
 
 (setq doom-modeline-height 35)
diff --git a/org/emacs.org b/org/emacs.org
index 8b79e4c..18ddd86 100755
--- a/org/emacs.org
+++ b/org/emacs.org
@@ -2,12 +2,11 @@
 #+PROPERTY: header-args :tangle ../.emacs.d/init.el
 #+auto_tangle: t
 #+STARTUP: overview
-
 * System information
 Check the ~$HOSTNAME~, if it's one of my devices running GuixSD.
 #+begin_src emacs-lisp
   (defvar is-zeus (equal (system-name) "zeus"))
-  (defvar is-hephaestus (equal (system-name) "hephaestus"))
+  (defvar is-hermes (equal (system-name) "hermes"))
 #+end_src
 Setup default browser as ~mullvad-browser~
 #+begin_src emacs-lisp
@@ -15,26 +14,8 @@ Setup default browser as ~mullvad-browser~
 	browse-url-generic-program "mullvad-browser")
 #+end_src
 * Setting up Packages
-** Setup for GuixSD machines
-#+begin_src emacs-lisp
-  ;; When guix t, load emacs packages
-  (when (or is-zeus
-	    is-hephaestus
-    (add-to-list 'load-path "~/.guix-profile/share/emacs/site-lisp")
-    (guix-emacs-autoload-packages)))
-
-  (with-eval-after-load 'geiser-guile
-    (add-to-list 'geiser-guile-load-path "~/dotfiles/.config/guix"))
-
-  ;; Personal Information
-  (setq user-full-name "Thanos Apollo"
-	user-mail-address "[email protected]")
-
-  (setq copyright-names-regexp
-	(format "%s <%s>" user-full-name user-mail-address))
-#+end_src
 ** Define and install packages
-*** List of required packages
+** List of required packages
 Request the following packages:
 #+begin_src emacs-lisp
     (defconst my-package-list '(org-snooze
@@ -46,6 +27,7 @@ Request the following packages:
 				emojify
 				general
 				doom-themes
+				gruvbox-theme
 				doom-modeline
 				counsel
 				which-key
@@ -88,7 +70,7 @@ Request the following packages:
 				dashboard
 				org-auto-tangle))
 #+end_src
-*** Installation & activation
+** Installation & activation
 Set our ~package-archives~, and install our packages
 #+begin_src emacs-lisp
   (setq package-archives '(("melpa" . "https://melpa.org/packages/")
@@ -134,7 +116,10 @@ Fonts and basic appearance settings
   (add-to-list 'default-frame-alist '(alpha 90 90))
 
   (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
-  (when is-hephaestus
+
+
+  (if is-zeus
+      (display-battery-mode 0)
     (display-battery-mode 1))
 
   (scroll-bar-mode -1)
@@ -167,7 +152,7 @@ Fonts and basic appearance settings
     (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
   (defvar apollo/default-font-size 140)
-  (when (equal (system-name) "hermes")
+  (when is-hermes 
     (setq apollo/default-font-size 110))
 
   (set-face-attribute 'default nil
@@ -217,10 +202,10 @@ Fonts and basic appearance settings
 #+end_src
 ** Theme & modeline
 #+begin_src emacs-lisp
-(load-theme 'doom-ayu-dark t)
-(doom-modeline-mode 1)
+  (load-theme 'gruvbox-dark-hard t)
+  (doom-modeline-mode 1)
 
-(setq doom-modeline-height 35)
+  (setq doom-modeline-height 35)
 #+end_src
 ** Ivy
 #+begin_src emacs-lisp