From 61a3d056ec7bf1dde5427a177c42fb71844e9f6a Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Fri, 15 Dec 2023 13:41:21 +0100 Subject: [PATCH] . --- emacs/emacs.nix | 7 +++++-- emacs/init.el | 17 ++++++++++------- home.nix | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/emacs/emacs.nix b/emacs/emacs.nix index d2ce50c..52f8325 100644 --- a/emacs/emacs.nix +++ b/emacs/emacs.nix @@ -3,7 +3,10 @@ { home.file.".emacs.d/early-init.el" = { enable = true; - text = "(setq package-enable-at-startup nil)"; + text = '' + (setq package-enable-at-startup nil) + (setq package-install-upgrade-built-in t) + ''; }; home.file.".emacs.d/init.el" = { enable = true; @@ -27,7 +30,7 @@ }; programs.emacs = { enable = true; - package = pkgs.emacs29-gtk3; + package = pkgs.emacs29-pgtk; extraConfig = builtins.readFile ./init.el; }; } diff --git a/emacs/init.el b/emacs/init.el index 36b9c5c..22abfda 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -250,8 +250,8 @@ )) (global-ligature-mode t)) -(set-frame-parameter nil 'alpha-background 80) -(add-to-list 'default-frame-alist '(alpha-background . 80)) +(set-frame-parameter nil 'alpha-background 90) +(add-to-list 'default-frame-alist '(alpha-background . 90)) (use-package lambda-line ;;:straight (:type git :host github :repo "lambda-emacs/lambda-line") @@ -729,8 +729,10 @@ Point must be at the beginning of balanced expression (sexp)." (sesman-install-menu clojure-mode-map) :hook ((clojure-ts-mode . eglot-ensure) + (clojure-ts-mode . prettify-symbols-mode) (clojure-ts-mode . (lambda () - (setq-local sesman-system 'CIDER))) + (setq-local sesman-system 'CIDER) + (setq-local prettify-symbols-alist '(("fn" . "λ"))))) (clojure-ts-mode . (lambda () (sesman-install-menu clojure-mode-map))) (clojurec-ts-mode . (lambda () @@ -792,11 +794,12 @@ Point must be at the beginning of balanced expression (sexp)." ;;;;;; Chicken Scheme (use-package scheme :elpaca nil - :config - (setq prettify-symbols-alist - '(("lambda" . "λ"))) :hook - (scheme-mode . eglot-ensure)) + (scheme-mode . eglot-ensure) + (scheme-mode . prettify-symbols-mode) + (scheme-mode . (lambda () + (setq-local prettify-symbols-alist + '(("lambda" . "λ")))))) (defun flymake-chicken-init () (add-hook 'flymake-diagnostic-functions diff --git a/home.nix b/home.nix index 0f9695c..28d63ad 100644 --- a/home.nix +++ b/home.nix @@ -44,7 +44,8 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }: libuuid lm_sensors gnumake - (nerdfonts.override { fonts = [ "VictorMono" "MPlus" ]; }) + # (nerdfonts.override { fonts = [ "VictorMono" "MPlus" ]; }) + nerdfonts nil nixfmt nodejs_20