diff options
| -rw-r--r-- | .emacs.d/init.el | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 578be8d..0d22ad3 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -4,7 +4,7 @@ (require 'package) (add-to-list 'load-path "~/dotfiles/.emacs.d/snippets") -(add-to-list 'load-path "~/.guix-profile/share/emacs/site-lisp") + (add-to-list 'load-path "~/dotfiles") @@ -12,17 +12,13 @@ - - -;;Check if system name is one of my guix systems -;;Change this strings your machines $HOSTNAME -;;if you are using guix -(if (or (string= (system-name) "fsociety") - (string= (system-name) "heisenberg")) - (guix-emacs-autoload-packages) - nil) - -;(guix-emacs-autoload-packages) +;; Check if system-name is one of my guix systems +;; Change this strings to your machines $HOSTNAME +;; if you are using guix +(when (or (string= (system-name) "fsociety") + (string= (system-name) "heisenberg")) + (add-to-list 'load-path "~/.guix-profile/share/emacs/site-lisp") + (guix-emacs-autoload-packages)) @@ -104,20 +100,23 @@ to be installed.") (require 'use-package) (setq use-package-always-ensure t) (load "functions") +(load "email-module") (load "keys.el") (load "all-the-icons-dired.el") -;(load "secret") -(load "exwm-holyK-firefox") +;;(load "secret") (load "org-config") -(load "email-module") ;(load "email-module") (load-file custom-file) ;; Load custom.el ;; if you are using guix, emacs-exwm will look for ~/.exwm.el -;; in case we are not using guix we are gonna load it anyway here, just to get the -;; transperancy and other modifications -(load ".exwm") -(start-polybar) +;; here we check if system is GNU/Linux, if not we won't load +;; EXWM settings and configuration +(when (equal system-type 'gnu/linux) + (progn + (load ".exwm") + (load "exwm-holy-firefox") + (start-polybar))) + (setq inhibit-startup-message nil) (defvar apollo/default-font-size 140) @@ -137,7 +136,17 @@ to be installed.") (setq visible-bell t) -(setq vterm-shell "~/.guix-profile/bin/zsh") + +(use-package vterm + :ensure nil + :config + (if + (or (string= (system-name) "fsociety") + (string= (system-name) "heisenberg")) + (setq vterm-shell "~/.guix-profile/bin/zsh") + (setq vterm-shell "/bin/zsh"))) + + (column-number-mode) (global-display-line-numbers-mode 0) @@ -198,7 +207,7 @@ to be installed.") (defvar eshell-path-env (getenv "~/.local/bin")) -(load-theme 'ef-apollon t) +(load-theme 'doom-ayu-dark t) (doom-modeline-mode 1) (setq doom-modeline-height 35) |