From 14c42ec00e0cc48b292921acfa820aa4979c1da6 Mon Sep 17 00:00:00 2001 From: Thanos Apollo Date: Sun, 12 May 2024 19:18:34 +0300 Subject: emacs: Remove gentoo packages --- .config/emacs/init.el | 67 +++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) (limited to '.config/emacs') diff --git a/.config/emacs/init.el b/.config/emacs/init.el index a80febc..c9bb5b9 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -28,13 +28,25 @@ ;; ╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╰╯ ;;; Code: +;; Disable package.el +(setq package-enable-at-startup nil + package-archives nil) + (setf user-full-name "Thanos Apollo" user-mail-address "public@thanosapollo.org") + (defvar is-zeus (equal (system-name) "zeus")) (defvar is-hermes (equal (system-name) "hermes")) (defvar is-phone (equal (system-name) "localhost")) +;; Font +(custom-set-faces + (if is-hermes '(default ((t (:inherit nil :height 120 :family "Jetbrains Mono")))) + '(default ((t (:inherit nil :height 130 :family "Jetbrains Mono"))))) + '(variable-pitch ((t (:inherit t :family "Iosevka Aile")))) + '(org-modern-symbol ((t (:inherit t :family "Iosevka Aile"))))) + ;; Autoinsert (auto-insert-mode 1) @@ -74,8 +86,6 @@ (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) -(setq package-enable-at-startup nil) - (require 'straight) (setf straight-use-package-by-default t) @@ -88,7 +98,6 @@ (pcmpl-rc :type git :host nil :repo "git@thanosapollo.org:/var/git/pcmpl-rc.git"))) (use-package emacs - :straight nil :ensure t :config @@ -647,6 +656,7 @@ :commands emojify-mode) (use-package flycheck-package + :straight t :ensure t :after flycheck) @@ -691,13 +701,18 @@ (defalias (car alias) (cdr alias))) aliases)) +(defun thanos/eshell-clear () + "Interactive call for clear-scrollback." + (interactive) + (eshell/clear-scrollback)) + (use-package eshell :config (setf eshell-highlight-prompt t) (eshell-syntax-highlighting-global-mode 1) :bind (("C-c e" . eshell) :map eshell-mode-map - ("C-l" . eshell/clear-scrollback)) + ("C-l" . 'thanos/eshell-clear)) :hook ((eshell-mode . (lambda () (thanos/set-eshell-aliases thanos/aliases) (display-line-numbers-mode -1))))) @@ -818,16 +833,6 @@ By default, returns all jabber related buffers format." (setf xref-show-xrefs-function #'consult-xref xref-show-definitions-function #'consult-xref)) -(use-package moc-player - :defer t - :straight '(moc-player :local-repo "~/Dev/emacs-lisp/moc-player") - :init (define-prefix-command 'thanos/mocp) - :bind (("C-z" . thanos/mocp) - :map thanos/mocp - ("SPC" . 'mocp-toggle-pause) - ("n" . 'mocp-next) - ("p" . 'mocp-previous))) - ;; My packages (when (or is-zeus is-hermes) (use-package yeetube @@ -911,19 +916,7 @@ By default, returns all jabber related buffers format." ("t" . 'gnosis-test-start))) ;; Run vc-pull on startup - (gnosis-vc-pull) - - (use-package pcmpl-emerge - :defer t - :straight (pcmpl-emerge :local-repo "~/Dev/emacs-lisp/pcmpl-emerge")) - - (use-package pcmpl-rc - :straight (pcmpl-rc :local-repo "~/Dev/emacs-lisp/pcmpl-rc") - :defer t) - - (use-package pcmpl-tailscale - :straight (pcmpl-tailscale :local-repo "~/Dev/emacs-lisp/pcmpl-taiscale") - :defer t)) + (gnosis-vc-pull)) ;; Emacs dev @@ -936,8 +929,7 @@ By default, returns all jabber related buffers format." :config (setf gptel-api-key (password-store-get-field "openai/openai@thanosapollo.org" "api") gptel-default-mode 'org-mode) - (setq-default gptel-model "ChatGPT:gpt-4" - gptel-backend (gptel-make-ollama "Ollama" + (setq-default gptel-backend (gptel-make-ollama "Ollama" :host "zeus:11434" :stream t :models '("llama2:latest" "zephyr:latest" "codellama:latest" @@ -953,14 +945,6 @@ By default, returns all jabber related buffers format." :map gptel-mode-map ("C-c h" . 'gptel-menu))) -;; (use-package copilot -;; :straight (copilot :host github :repo "zerolfx/copilot.el" :files ("dist" "*.el")) -;; :bind (:map copilot-mode-map -;; ("M-TAB" . 'copilot-accept-completion-by-line) -;; ("C-M-" . 'copilot-accept-completion-by-word) -;; ("C-M-n" . 'copilot-next-completion) -;; ("C-M-p" . 'copilot-previous-completion))) - ;; Password-store (use-package password-store @@ -1207,7 +1191,7 @@ By default, returns all jabber related buffers format." (defun thanos/wallpaper-set (image) "Set IMAGE as wallpaper, using feh." - (let ((command (if is-zeus "swaybg -o '*' -i" "feh --bg-scale"))) + (let ((command "swaybg -o '*' -i")) ;; Kill previous swaybg (call-process-shell-command "kill -15 $(pgrep swaybg | tail -n 1)") ;; Set wallpaper @@ -1265,11 +1249,4 @@ By default, returns all jabber related buffers format." :group 'iimage :lighter " iImg" (thanos/iimage-mode-buffer thanos/iimage-mode)) -;; Font -(custom-set-faces - (if is-hermes '(default ((t (:inherit nil :height 120 :family "Jetbrains Mono")))) - '(default ((t (:inherit nil :height 130 :family "Jetbrains Mono"))))) - '(variable-pitch ((t (:inherit t :family "Iosevka Aile")))) - '(org-modern-symbol ((t (:inherit t :family "Iosevka Aile"))))) - ;;; init.el ends here -- cgit v1.2.3