From 29ea6b9408446f0c033726fd7bb07449ab37d1ee Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Wed, 25 Nov 2020 09:59:11 -0500 Subject: feat(glittershark): Get everything working on Darwin Update everything in home-manager to properly work on darwin (including adding dobharchu as a top-level attribute from //users/glittershark/home) and also fix font faces and sizes in emacs config Change-Id: Ica889dd212876030d5c2a916a71d8b614e6964f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2147 Reviewed-by: glittershark Tested-by: BuildkiteCI --- users/glittershark/emacs.d/config.el | 17 +++++++++-------- users/glittershark/emacs.d/packages.el | 5 ----- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'users/glittershark/emacs.d') diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el index e06f6a5d6db0..29d46e24e0c0 100644 --- a/users/glittershark/emacs.d/config.el +++ b/users/glittershark/emacs.d/config.el @@ -4,14 +4,17 @@ (setq x-super-keysym 'alt x-alt-keysym 'meta) -(setq user-mail-address "griffin@urbint.com" +(setq user-mail-address "root@gws.fyi" user-full-name "Griffin Smith") -(setq doom-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 14) - doom-big-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 24) - doom-big-font-increment 5 - doom-variable-pitch-font (font-spec :family "DejaVu Sans") - doom-unicode-font (font-spec :family "Meslo LGSDZ Nerd Font")) +(let ((font-family (pcase system-type + ('darwin "MesloLGSDZ NF") + ('gnu/linux "Meslo LGSDZ Nerd Font")))) + (setq doom-font (font-spec :family font-family :size 14) + doom-big-font (font-spec :family font-family :size 24) + doom-big-font-increment 5 + doom-variable-pitch-font (font-spec :family "DejaVu Sans") + doom-unicode-font (font-spec :family font-family))) (require 's) @@ -57,8 +60,6 @@ (flycheck-mode)) -(setq exec-path (append exec-path '("/home/grfn/.cargo/bin"))) - (after! cargo (setq cargo-process--custom-path-to-bin "/home/grfn/.cargo/bin/cargo")) diff --git a/users/glittershark/emacs.d/packages.el b/users/glittershark/emacs.d/packages.el index ac6897170918..011d8d41d1cb 100644 --- a/users/glittershark/emacs.d/packages.el +++ b/users/glittershark/emacs.d/packages.el @@ -74,11 +74,6 @@ (package! racer :disable t) (package! cargo) -;; Elixir -(package! flycheck-credo) -(package! flycheck-mix) -(package! flycheck-dialyxir) - ;; Lisp (package! paxedit) -- cgit 1.4.1