From e22078b34a60b3bcf6154c6d39040ed9cbf7a17f Mon Sep 17 00:00:00 2001 From: marc Date: Sun, 13 Nov 2022 19:42:32 +0100 Subject: [PATCH] Modified emacs config --- config/doom/config.el | 54 +++-------------------------------------- config/doom/init.el | 5 ++-- config/doom/packages.el | 1 - flake.nix | 3 --- 4 files changed, 7 insertions(+), 56 deletions(-) diff --git a/config/doom/config.el b/config/doom/config.el index 4016123..e4a6ef1 100644 --- a/config/doom/config.el +++ b/config/doom/config.el @@ -67,7 +67,7 @@ ;; ----------------------------------------------------------------------------- (use-package vterm :config - (setq vterm-shell "fish")) + (setq vterm-shell "zsh")) ;; ----------------------------------------------------------------------------- @@ -93,7 +93,6 @@ :config (setq py-autopep8-options '("--max-line-length=120"))) - (use-package pipenv :config (setq pipenv-with-projectile t) @@ -106,17 +105,6 @@ (setq org-directory "~/org/") -(defun org-set-trello-mode () - (let ((filename (buffer-file-name (current-buffer)))) - (when (and filename (string= "trello" (file-name-extension filename))) - (org-trello-mode)))) - -(use-package org - :config - (add-to-list 'auto-mode-alist '("\\.trello$" . org-mode)) - (add-hook! 'org-mode-hook 'org-set-trello-mode)) - - (use-package org-roam :ensure t :init @@ -136,37 +124,6 @@ :config (org-roam-setup)) -(use-package org-trello - :config - ;; (setq org-trello-current-prefix-keybinding "SPC r") - (defun org-trello-bindings () - "Set the keybindings for org-trello mode" - (defun set-key (key fn) - (evil-define-key* 'normal org-trello-mode-map - (kbd (concat "SPC r" " " key)) fn)) - (set-key "v" 'org-trello-version) - (set-key "i" 'org-trello-install-key-and-token) - (set-key "I" 'org-trello-install-board-metadata) - (set-key "c" 'org-trello-sync-card) - (set-key "s" 'org-trello-sync-buffer) - (set-key "a" 'org-trello-assign-me) - (set-key "d" 'org-trello-check-setup) - (set-key "D" 'org-trello-delete-setup) - (set-key "b" 'org-trello-create-board-and-install-metadata) - (set-key "k" 'org-trello-kill-entity) - (set-key "K" 'org-trello-kill-cards) - (set-key "a" 'org-trello-archive-card) - (set-key "A" 'org-trello-archive-cards) - (set-key "j" 'org-trello-jump-to-trello-card) - (set-key "J" 'org-trello-jump-to-trello-board) - (set-key "C" 'org-trello-add-card-comments) - (set-key "o" 'org-trello-show-card-comments) - (set-key "l" 'org-trello-show-card-labels) - (set-key "u" 'org-trello-update-board-metadata) - (set-key "h" 'org-trello-help-describing-bindings)) - - (add-hook! 'org-trello-mode-hook 'org-trello-bindings)) - (use-package! websocket :after org-roam) @@ -203,12 +160,9 @@ ("not in" "∉") ("in" "∈")) - (pretty-hook emacs-lisp-mode) ;; ("defun" "𝙛") - -(pretty-hook org-mode - ("[ ]" "☐") - ("[X]" "☑")) - +;; (pretty-hook org-mode +;; ("[ ]" "☐") +;; ("[X]" "☑")) diff --git a/config/doom/init.el b/config/doom/init.el index ceb4311..9cc978c 100644 --- a/config/doom/init.el +++ b/config/doom/init.el @@ -35,7 +35,8 @@ hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra ;;indent-guides ; highlighted indent columns - (ligatures +iosevka) ; ligatures and symbols to make your code pretty again + (ligatures + +iosevka) ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions @@ -144,7 +145,7 @@ ;;lua ; one-based indices? one-based indices markdown ; writing docs for people to ignore ;;nim ; python + lisp at the speed of c - ;;nix ; I hereby declare "nix geht mehr!" + nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel (org +journal diff --git a/config/doom/packages.el b/config/doom/packages.el index 3c81963..b651ae1 100644 --- a/config/doom/packages.el +++ b/config/doom/packages.el @@ -58,7 +58,6 @@ (package! py-autopep8) ;; Org -(package! org-trello) ;; Org-Roam UI (unpin! org-roam) diff --git a/flake.nix b/flake.nix index 16cf92c..d5503ff 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,6 @@ emacs-overlay.url = "github:nix-community/emacs-overlay"; - doom-emacs.url = "github:doomemacs/doomemacs"; - doom-emacs.flake = false; - }; outputs = inputs @ { self, nixpkgs, home-manager, ... }: