Fix: hostname issue and turn off some [ui] elements

2 files changed, 21 insertions, 18 deletions

diff --git a/shoshimacs.el b/shoshimacs.el
index 43d3da9..6f34371 100644
--- a/shoshimacs.el
+++ b/shoshimacs.el
@@ -7,6 +7,11 @@
   (setq custom-file my-custom-file)
   (load custom-file))
 
+
+(defun my-hostname ()
+  "Helper function to determine on which host Emacs is starting."
+  (string-trim (with-temp-buffer (shell-command "hostname" t ) (buffer-string))))
+
 (defvar my-themes-to-install
   '(cyberpunk-theme dracula-theme nano-theme)
   "List of themes to install when loading shoshimacs config.")
@@ -201,14 +206,13 @@
 ;;; User Interface
 (when (display-graphic-p)
   (scroll-bar-mode -1)
-  (fringe-mode '(8 . 0)))
-
-(tab-bar-mode t)
-(display-battery-mode t)
+  (fringe-mode '(8 . 0))
+  (menu-bar-mode -1)
+  (tool-bar-mode -1))
 
 (package-install 'darkroom)
 
-(let ((size (if (equal hostname "zebes") 18 12)))
+(let ((size (if (or (equal (my-hostname) "zebes") (equal (my-hostname) "ridley")) 16 12)))
  (set-frame-font (format "Victor Mono-%s" size)))
 
 (global-hl-line-mode t)
diff --git a/shoshimacs.org b/shoshimacs.org
index 05c6e37..8f0528a 100644
--- a/shoshimacs.org
+++ b/shoshimacs.org
@@ -80,6 +80,11 @@ set and load a separate file to keep it clean:
       (make-empty-file my-custom-file))
     (setq custom-file my-custom-file)
     (load custom-file))
+
+
+  (defun my-hostname ()
+    "Helper function to determine on which host Emacs is starting."
+    (string-trim (with-temp-buffer (shell-command "hostname" t ) (buffer-string))))
 #+end_src
 
 * Package Management
@@ -730,12 +735,11 @@ an API token is stored in my ~.authinfo~ file.
 ** basic Emacs UI tweaks
 
 #+begin_src emacs-lisp
-  (when (display-graphic-p)
-    (scroll-bar-mode -1)
-    (fringe-mode '(8 . 0)))
-
-  (tab-bar-mode t)
-  (display-battery-mode t)
+    (when (display-graphic-p)
+      (scroll-bar-mode -1)
+      (fringe-mode '(8 . 0))
+      (menu-bar-mode -1)
+      (tool-bar-mode -1))
 #+end_src
 
 ** darkroom - distraction free writing
@@ -750,13 +754,8 @@ depending on the window layout currently in use.
 ** Fonts 
 For code, I've grown fond of Victor Mono.
 
-#+name: host
-#+begin_src shell :tangle no
-  hostname
-#+end_src
-
-#+begin_src emacs-lisp :var hostname=host()
-  (let ((size (if (equal hostname "zebes") 18 12)))
+#+begin_src emacs-lisp
+  (let ((size (if (or (equal (my-hostname) "zebes") (equal (my-hostname) "ridley")) 16 12)))
    (set-frame-font (format "Victor Mono-%s" size)))
 #+end_src