diff --git a/config/doom/config.el b/config/doom/config.el index ebf7e57..1b9041c 100644 --- a/config/doom/config.el +++ b/config/doom/config.el @@ -12,6 +12,7 @@ ;; Fonts (setq doom-font (font-spec :family "Iosevka Nerd Font" :size 18)) (setq doom-symbol-font (font-spec :family "Iosevka Nerd Font" :size 18)) +(setq doom-emoji-font (font-spec :family "Noto Color Emoji" :size 18)) ;; Themeing (use-package base16-theme @@ -48,13 +49,25 @@ (setq-default tab-width 4) +;; ----------------------------------------------------------------------------- +;; Emojify +;; ----------------------------------------------------------------------------- +(use-package! emojify + :config + (when (member "Noto Color Emoji" (font-family-list)) + (set-fontset-font + t 'emoji (font-spec :family "Noto Color Emoji") nil 'prepend)) + (setq emojify-display-style 'image) + (setq emojify-emoji-styles '(unicode))) + + ;; ----------------------------------------------------------------------------- ;; Projectile ;; ----------------------------------------------------------------------------- (use-package projectile :config (setq projectile-project-search-path '("~/projects"))) - + ;; ----------------------------------------------------------------------------- ;; vterm @@ -62,7 +75,7 @@ (use-package vterm :config (setq vterm-shell "zsh")) - + ;; ----------------------------------------------------------------------------- ;; elisp @@ -94,13 +107,13 @@ ;; accept underscore as part of a word (superword-mode 1) (modify-syntax-entry ?_ "w" python-mode-syntax-table)) - + (add-hook 'python-mode-hook 'my-python-mode-hook) (use-package py-autopep8 :config (setq py-autopep8-options '("--max-line-length=120"))) - + (use-package pipenv :config (setq pipenv-with-projectile t) @@ -138,8 +151,8 @@ ("lambda" "λ") ("not in" "∉") ("in" "∈")) - - + + (pretty-hook emacs-lisp-mode) ;; ("defun" "𝙛") diff --git a/config/doom/init.el b/config/doom/init.el index 568c802..21ce8a5 100644 --- a/config/doom/init.el +++ b/config/doom/init.el @@ -30,7 +30,7 @@ doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs ;; doom-quit ; DOOM quit-message prompts when you quit Emacs - ;;(emoji +unicode) ; 🙂 + (emoji +unicode) ; 🙂 ;; fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 1f33992..1bdf022 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -3,7 +3,7 @@ with lib; let nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; }; - wallpaper = ../../data/wallpapers/wallhaven/canyon.jpg; + wallpaper = ../../data/wallpapers/globus.jpg; in { imports = [ diff --git a/modules/dev/git.nix b/modules/dev/git.nix index bcbb740..be55fb4 100644 --- a/modules/dev/git.nix +++ b/modules/dev/git.nix @@ -19,6 +19,11 @@ in userName = cfg.userName; userEmail = cfg.userEmail; + ignores = [ + ".direnv" + ".project" + ]; + extraConfig = { init.defaultBranch = "main"; }; diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix index 4615ad5..62aacc5 100644 --- a/modules/editors/emacs.nix +++ b/modules/editors/emacs.nix @@ -53,6 +53,7 @@ in { fonts.packages = with pkgs; [ iosevka emacs-all-the-icons-fonts + noto-fonts-color-emoji ]; env.PATH = [ "$HOME/.config/emacs/bin" ];