From bd8ff19f4827d19d2fc3031aa972e8c3c88cb7db Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 16 Mar 2020 12:47:44 +0100 Subject: [PATCH 1/6] changed backends for lisp company, some changes tried for python lsp --- init.org | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/init.org b/init.org index 6ccb82d..9d06b21 100644 --- a/init.org +++ b/init.org @@ -448,7 +448,7 @@ Windows Theme: (defun company/elisp-mode-hook() (set (make-local-variable 'company-backends) - '((company-elisp company-dabbrev) company-capf company-files)) + '(company-capf company-files)) (message "company/elisp-mode-hook")) (defun company/beancount-mode-hook() @@ -924,8 +924,14 @@ Default completion is C-j (use-package lsp-python-ms :ensure t - :after lsp-mode python)) - ; :custom (lsp-python-executable-cmd "python3")) + ;:after lsp-mode python + :hook (python-mode . (lambda() + (require 'lsp-python-ms) + (lsp))) + :init + (setq lsp-python-ms-executable + "~/.emacs.d/mspyls/Microsoft.Python.LanguageServer") + :custom (lsp-python-executable-cmd "python3"))) #+END_SRC From 21081a85abc7289dac40b64dcfd8bbb526e30fbf Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 23 Mar 2020 10:25:11 +0100 Subject: [PATCH 2/6] Made bookmarks into its own configuration block --- init.org | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/init.org b/init.org index 9d06b21..4defbd9 100644 --- a/init.org +++ b/init.org @@ -126,6 +126,24 @@ This function updates init.el whenever changes in init.org are made. The update "Is emacs running at work on the remote system?") #+END_SRC +Bookmarks +Usage: +- C-x r m (bookmark-set): add bookmark +- C-x r l (list-bookmark): list bookmarks +- C-x r b (bookmark-jump): open bookmark + +Edit bookmarks (while in bookmark file): +- d: mark current item +- x: delete marked items +- r: rename current item +- s: save changes + +#+begin_src emacs-lisp +(use-package bookmark + :custom + (bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks"))) +#+end_src + #+BEGIN_SRC emacs-lisp (defvar MY--PATH_USER_LOCAL (expand-file-name "~/.emacs.d/user-local/")) (defvar MY--PATH_USER_GLOBAL (expand-file-name "~/.emacs.d/user-global/")) @@ -139,7 +157,6 @@ This function updates init.el whenever changes in init.org are made. The update (defconst MY--PATH_ORG_FILES_MOBILE nil) ;; hacky way to prevent "free variable" compiler error (defconst MY--PATH_ORG_JOURNAL nil) ;; hacky way to prevent "free variable" compiler error (defconst MY--PATH_START "p:/Eigene Dateien/Notizen/")) -(setq bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks")) (setq recentf-save-file (concat MY--PATH_USER_LOCAL "recentf")) (setq custom-file (concat MY--PATH_USER_LOCAL "custom.el")) ;; don't spam init.e with saved customization settings (setq abbrev-file-name (concat MY--PATH_USER_GLOBAL "abbrev_defs")) From cb03a4d02e3a00b647bb07bb2e70bda0b15c9e27 Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 23 Mar 2020 10:39:08 +0100 Subject: [PATCH 3/6] moved bookmark config after setting of some variables --- init.org | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/init.org b/init.org index 4defbd9..8134e6f 100644 --- a/init.org +++ b/init.org @@ -126,24 +126,6 @@ This function updates init.el whenever changes in init.org are made. The update "Is emacs running at work on the remote system?") #+END_SRC -Bookmarks -Usage: -- C-x r m (bookmark-set): add bookmark -- C-x r l (list-bookmark): list bookmarks -- C-x r b (bookmark-jump): open bookmark - -Edit bookmarks (while in bookmark file): -- d: mark current item -- x: delete marked items -- r: rename current item -- s: save changes - -#+begin_src emacs-lisp -(use-package bookmark - :custom - (bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks"))) -#+end_src - #+BEGIN_SRC emacs-lisp (defvar MY--PATH_USER_LOCAL (expand-file-name "~/.emacs.d/user-local/")) (defvar MY--PATH_USER_GLOBAL (expand-file-name "~/.emacs.d/user-global/")) @@ -195,6 +177,24 @@ Edit bookmarks (while in bookmark file): (scroll-bar-mode 0) ;; disable scroll bar #+END_SRC +Bookmarks +Usage: +- C-x r m (bookmark-set): add bookmark +- C-x r l (list-bookmark): list bookmarks +- C-x r b (bookmark-jump): open bookmark + +Edit bookmarks (while in bookmark file): +- d: mark current item +- x: delete marked items +- r: rename current item +- s: save changes + +#+begin_src emacs-lisp +(use-package bookmark + :custom + (bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks"))) +#+end_src + Some windows specific stuff #+BEGIN_SRC emacs-lisp (when *sys/windows* From a0f06107fa7d5f5c852c8a9520c73c1bb7927bca Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 28 Apr 2020 11:54:53 +0200 Subject: [PATCH 4/6] fixed font name Hack Nerd Font --- init.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.org b/init.org index 8134e6f..6d395e7 100644 --- a/init.org +++ b/init.org @@ -216,7 +216,7 @@ Some windows specific stuff :END: #+BEGIN_SRC emacs-lisp (when *sys/linux* - (set-face-font 'default "Hack-10")) + (set-face-font 'default "Hack Nerd Font-10")) (when *work_remote* (set-face-font 'default "Lucida Sans Typewriter-11")) #+END_SRC @@ -1020,4 +1020,4 @@ deactivate Start fava with fava my_file.beancount It is accessable on this URL: [[http://127.0.0.1:5000][Fava]] -Beancount-mode can start fava and open the URL right away. +Beancount-mode can start fava and open the URL right away. From 937c5262f9dcc6cb8cf7bd484109f087765c0286 Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 28 Apr 2020 11:57:56 +0200 Subject: [PATCH 5/6] added gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2539b21 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/init.elc From 5885caea6c72222e7f9049663d383c7c97d6f62b Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 28 Apr 2020 11:59:58 +0200 Subject: [PATCH 6/6] more files to ignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 2539b21..92eb74f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ /init.elc +/user-local/ +/init.el +/elpa/ +/places +/transient/ +/auto-save-list/ +/init.shell