From fc2223f82b690f8d45493a093c9e3aeb2b4b23f0 Mon Sep 17 00:00:00 2001 From: bard Date: Sun, 5 Nov 2023 19:53:56 -0500 Subject: emacs everywhere and emms mpris --- bard-elisp/bard-editing.el | 2 +- bard-emacs-modules/bard-emacs-emms.el | 3 +++ bard-emacs-modules/bard-emacs-lang.el | 12 +++++------- bard-emacs-modules/bard-emacs-org.el | 4 ++-- bard-emacs-modules/bard-emacs-package.el | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bard-elisp/bard-editing.el b/bard-elisp/bard-editing.el index e2ba1bc..6118cb4 100644 --- a/bard-elisp/bard-editing.el +++ b/bard-elisp/bard-editing.el @@ -44,7 +44,7 @@ (kill-new line-text) (message "Copied current line"))) -(global-set-key (kbd "C-c l") 'bard/copy-current-line) +(global-set-key (kbd "C-x l") 'bard/copy-current-line) ;; Multiple cursors (global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines) diff --git a/bard-emacs-modules/bard-emacs-emms.el b/bard-emacs-modules/bard-emacs-emms.el index 5fe47e8..caa159d 100644 --- a/bard-emacs-modules/bard-emacs-emms.el +++ b/bard-emacs-modules/bard-emacs-emms.el @@ -3,8 +3,11 @@ ;; |------------------------------------| (require 'emms-setup) +(require 'emms-mpris) (emms-all) +(emms-default-players) +(emms-mpris-enable) (setq emms-player-list '(emms-player-mpv) emms-info-functions '(emms-info-native) emms-playlist-buffer-name "*Music*") diff --git a/bard-emacs-modules/bard-emacs-lang.el b/bard-emacs-modules/bard-emacs-lang.el index b8c11f3..3623718 100644 --- a/bard-emacs-modules/bard-emacs-lang.el +++ b/bard-emacs-modules/bard-emacs-lang.el @@ -24,13 +24,6 @@ ;;; Commentary: ;;; Code: - -(message "Hello World!") - -(provide 'bard-emacs-lang) - -;;; bard-emacs-lang.el ends here - (defun bard/common-modes-hook () "Commonly used modes, bundled in one hook." (display-line-numbers-mode 1) @@ -47,5 +40,10 @@ (add-hook 'c++-mode-hook 'bard/c++-mode-keybindings) (add-hook 'c++-mode 'bard/common-modes-hook) +;; Haskell +(setq exec-path (append exec-path '("/home/bard/.ghcup/bin/haskell-language-server-wrapper"))) +(setq exec-path (append exec-path '("/home/bard/.ghcup/bin/haskell-language-server-9.0.2"))) +(add-to-list 'exec-path "/home/bard/.ghcup/bin") + (provide 'bard-emacs-lang.el) ;;; bard-emacs-lang.el ends here diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index df5f9cb..b1f7e06 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -14,7 +14,7 @@ (setq org-startup-indented t org-hide-emphasis-markers t org-startup-with-inline-images t - org-image-actual-width '(300)) + org-image-actual-width '(600)) ;; Org todo keywords (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "KILLED(k)")) @@ -29,7 +29,7 @@ (define-key org-mode-map (kbd "C-x p i") 'org-cliplink)) (add-hook 'org-mode-hook 'bard/org-mode-keybindings) -(add-hook 'org-mode-hook 'fly-spell-mode) +;; (add-hook 'org-mode-hook 'fly-spell-mode) ;; Org Agenda Faces (custom-set-faces '(org-agenda-structure ((t (:inherit bold :foreground "#70a89f" :height 1.5 :family "Iosevka Comfy Motion Duo"))))) diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el index 16f1972..cf6e52a 100644 --- a/bard-emacs-modules/bard-emacs-package.el +++ b/bard-emacs-modules/bard-emacs-package.el @@ -22,7 +22,7 @@ ;; :url "https://github.com/quelpa/quelpa-use-package.git")) ;; (require 'quelpa-use-package) -;; (package-initialize) +(package-initialize) (unless package-archive-contents (package-refresh-contents)) @@ -272,7 +272,7 @@ (define-key helm-gtags-mode-map (kbd "C-j") 'helm-gtags-select) (define-key helm-gtags-mode-map (kbd "M-.") 'helm-gtags-dwim)) -;; (use-package aweshell -;; :quelpa (abc-mode :fetcher github :repo "manateelazycat/aweshell") -;; :bind(("C-M-" . aweshell-dedicated-toggle))) +(use-package emacs-everywhere + :ensure t) +(provide 'bard-emacs-package.el) -- cgit v1.2.3