From b12f44b5483cdb027c62dd9204f785cc15e146bf Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 19 Jan 2022 18:43:44 +0100 Subject: [PATCH] Edit for Darwin: - nixpkgs `allowUnfree` - disabled Emacs as service - Increased font size --- hosts/mbp/configuration.nix | 5 ++++- users/andreaciceri/default.nix | 8 ++++++++ users/profiles/emacs/default.nix | 2 +- users/profiles/emacs/emacs.d/config/aesthetics.el | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/hosts/mbp/configuration.nix b/hosts/mbp/configuration.nix index d65ec92..03ef2e1 100644 --- a/hosts/mbp/configuration.nix +++ b/hosts/mbp/configuration.nix @@ -14,7 +14,10 @@ enableSSHSupport = true; }; - nixpkgs.overlays = [ (import ../../pkgs) emacs-overlay.overlay ]; + nixpkgs = { + overlays = [ (import ../../pkgs) emacs-overlay.overlay ]; + config.allowUnfree = true; + }; nix = { package = pkgs.nixUnstable; diff --git a/users/andreaciceri/default.nix b/users/andreaciceri/default.nix index e96697c..385ed68 100644 --- a/users/andreaciceri/default.nix +++ b/users/andreaciceri/default.nix @@ -12,6 +12,14 @@ home.packages = with pkgs; [ yarn pinentry_mac + openscad + nodejs + + yabai + skhd + spacebar + xquartz + xterm ]; programs.gpg = { diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix index de9b63f..9f99716 100644 --- a/users/profiles/emacs/default.nix +++ b/users/profiles/emacs/default.nix @@ -12,7 +12,7 @@ }; services.emacs = { - enable = true; + enable = !pkgs.stdenv.hostPlatform.isDarwin; }; # For some reason Hunspell dictionaries paths must be specified on Darwin diff --git a/users/profiles/emacs/emacs.d/config/aesthetics.el b/users/profiles/emacs/emacs.d/config/aesthetics.el index ee6c982..4f3bde9 100644 --- a/users/profiles/emacs/emacs.d/config/aesthetics.el +++ b/users/profiles/emacs/emacs.d/config/aesthetics.el @@ -31,12 +31,16 @@ (use-package minimap) + + (use-package rainbow-identifiers :hook ((prog-mode . rainbow-identifiers-mode))) ;; To move in a different config file (when (string-equal system-type "darwin") + (set-face-attribute 'default nil :height 150) (setq mac-command-modifier 'ctrl)) + (use-package doom-modeline :ensure t :init (doom-modeline-mode 1))