From 854866a681a36fb45ab821ae2b91f2e5d5cd3c22 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Wed, 22 Nov 2023 23:27:09 +0100 Subject: [PATCH] . --- emacs/emacs.nix | 3 ++ emacs/init.el | 105 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 76 insertions(+), 32 deletions(-) diff --git a/emacs/emacs.nix b/emacs/emacs.nix index 2da8822..8cd187e 100644 --- a/emacs/emacs.nix +++ b/emacs/emacs.nix @@ -19,6 +19,7 @@ extraConfig = builtins.readFile ./init.el; extraPackages = epkgs: with epkgs; [ airline-themes + all-the-icons cape catppuccin-theme cider @@ -28,6 +29,7 @@ color-theme-modern consult consult-eglot + consult-notes corfu corfu-terminal delight @@ -63,6 +65,7 @@ org-rainbow-tags org-roam org-roam-ui + package-lint pass password-store password-store-otp diff --git a/emacs/init.el b/emacs/init.el index 14c94cc..f10e6e8 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -36,19 +36,19 @@ ;;;; Straight.el -;; (defvar bootstrap-version) -;; (let ((bootstrap-file -;; (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) -;; (bootstrap-version 6)) -;; (unless (file-exists-p bootstrap-file) -;; (with-current-buffer -;; (url-retrieve-synchronously -;; "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" -;; 'silent 'inhibit-cookies) -;; (goto-char (point-max)) -;; (eval-print-last-sexp))) -;; (load bootstrap-file nil 'nomessage)) -;; (setq straight-use-package-by-default t) +(defvar bootstrap-version) +(let ((bootstrap-file + (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) + (bootstrap-version 6)) + (unless (file-exists-p bootstrap-file) + (with-current-buffer + (url-retrieve-synchronously + "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage)) +;;(setq straight-use-package-by-default t) ;;;; Package Management Configuration ;; See: https://github.com/radian-software/el-patch @@ -68,19 +68,20 @@ :delight (eldoc-mode " 󰙎") :custom (completion-cycle-threshold 10) - (read-extended-command-predicate - #'command-completion-default-include-p) - (minibuffer-prompt-properties - (read-only t cursor-intangible t face minibuffer-prompt)) - (tab-always-indent 'complete) - (indent-tabs-mode nil) + (display-time-mode t) (enable-recursive-minibuffers t) (enable-remote-dir-locals t) (global-hl-line-mode t) + (indent-tabs-mode nil) (menu-bar-mode nil) - (scroll-bar-mode nil) - (tool-bar-mode nil) + (minibuffer-prompt-properties (read-only t cursor-intangible t face minibuffer-prompt)) + (read-extended-command-predicate #'command-completion-default-include-p) (recentf-mode t) + (scroll-bar-mode nil) + (tab-always-indent 'complete) + (tool-bar-mode nil) + :custom-face + (default ((t (:weight bold :height 113 :width normal :family "VictorMono Nerd Font")))) :hook (minibuffer-setup . cursor-intangible-mode) :config @@ -102,6 +103,8 @@ :config (progn (org-roam-db-autosync-mode))) +(use-package consult-notes) + (use-package websocket :ensure t :after org-roam) @@ -137,23 +140,61 @@ (font-lock-doc-face ((t (:inherit font-lock-comment-face :foreground "#fab387")))) :config - (load-theme 'catppuccin)) + ;;(load-theme 'catppuccin) + ) (set-frame-parameter nil 'alpha-background 80) (add-to-list 'default-frame-alist '(alpha-background . 80)) -(set-frame-font "Victor Mono Nerd Font-11:bold" nil t) -(use-package powerline - :init - (require 'powerline) - :config - (powerline-default-theme)) +;; (use-package powerline +;; :init +;; (require 'powerline) +;; :config +;; (powerline-default-theme)) -(use-package airline-themes - :after powerline - :init (require 'airline-themes) +;; (use-package airline-themes +;; :after powerline +;; :init (require 'airline-themes) +;; :config +;; (load-theme 'airline-badwolf t)) + +(use-package lambda-line + :straight (:type git :host github :repo "lambda-emacs/lambda-line") + :custom + (lambda-line-icon-time t) ;; requires ClockFace font (see below) + (lambda-line-clockface-update-fontset "ClockFace") ;; set clock icon + (lambda-line-position 'bottom) ;; Set position of status-line + (lambda-line-abbrev t) ;; abbreviate major modes + (lambda-line-hspace " ") ;; add some cushion + (lambda-line-prefix t) ;; use a prefix symbol + (lambda-line-prefix-padding nil) ;; no extra space for prefix + (lambda-line-status-invert nil) ;; no invert colors + (lambda-line-gui-ro-symbol " ⨂") ;; symbols + (lambda-line-gui-mod-symbol " ⬤") + (lambda-line-gui-rw-symbol " ◯") + (lambda-line-space-top +.50) ;; padding on top and bottom of line + (lambda-line-space-bottom -.50) + (lambda-line-symbol-position 0.1) ;; adjust the vertical placement of symbol :config - (load-theme 'airline-badwolf t)) + ;; activate lambda-line + (lambda-line-mode) + (lambda-line-clockface-update-fontset "ClockFace") + (customize-set-variable 'flymake-mode-line-counter-format '("" flymake-mode-line-error-counter flymake-mode-line-warning-counter flymake-mode-line-note-counter "")) + (customize-set-variable 'flymake-mode-line-format '(" " flymake-mode-line-exception flymake-mode-line-counters)) + ;; set divider line in footer + (when (eq lambda-line-position 'top) + (setq-default mode-line-format (list "%_")) + (setq mode-line-format (list "%_")))) + +(use-package lambda-themes + :straight (:type git :host github :repo "lambda-emacs/lambda-themes") + :custom + (lambda-themes-set-italic-comments t) + (lambda-themes-set-italic-keywords t) + (lambda-themes-set-variable-pitch t) + :config + ;; load preferred theme + (load-theme 'lambda-dark)) ;;;; Security (use-package keychain-environment