From 887f728562994d9e841dbc5438b8611c5e9b3f04 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Thu, 23 Apr 2020 07:35:24 +0200 Subject: [PATCH 01/10] Ignore projectile --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 14adf817..fdb2c38e 100755 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ elpy/rpc-venv/ /network-security.data session.* elpa/ +projectile-bookmarks.eld From 242e3be01b7789edd64b1a00d832701ebb09334e Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Thu, 23 Apr 2020 07:38:38 +0200 Subject: [PATCH 02/10] Update projectile keybindings --- init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.el b/init.el index 0e7c75c9..93909a8f 100755 --- a/init.el +++ b/init.el @@ -51,6 +51,8 @@ There are two things you can do about this warning: (require 'bundles) (ivy-mode 1) (projectile-mode +1) +(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map) +(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) ;; UTF-8 FTW (prefer-coding-system 'utf-8) (set-default-coding-systems 'utf-8) From 2a394c33623affe14bcb1cda21b513e30b828da3 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Thu, 23 Apr 2020 07:39:56 +0200 Subject: [PATCH 03/10] Remove projectile booksmarks --- projectile-bookmarks.eld | 1 - 1 file changed, 1 deletion(-) delete mode 100644 projectile-bookmarks.eld diff --git a/projectile-bookmarks.eld b/projectile-bookmarks.eld deleted file mode 100644 index 2e0ab12b..00000000 --- a/projectile-bookmarks.eld +++ /dev/null @@ -1 +0,0 @@ -("~/.emacs.d/" "/run/media/WD-0104/marcus/Documents/journal/" "/run/media/WD-0104/marcus/opt/marcuskammer/mysite/" "/run/media/WD-0104/marcus/opt/marcuskammer/marcuskammer.gitlab.io/") \ No newline at end of file From 899e17e7b49a218cc11ab1df78ea94f511bd451d Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Thu, 23 Apr 2020 07:40:09 +0200 Subject: [PATCH 04/10] Use nromal font weight --- bundle/display.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/display.el b/bundle/display.el index e35a248e..adab89ab 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -17,7 +17,7 @@ (display-time-mode -1) ; Display time in the mode line (add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window -(add-to-list 'default-frame-alist '(font . "Iosevka Term Medium-13")) +(add-to-list 'default-frame-alist '(font . "Iosevka Term-13")) (when (eq system-type 'gnu/linux) (add-to-list 'default-frame-alist '(undecorated . t))) From 4a4d3bfc6cee6993aedfdd7b2247dda9606d27db Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Thu, 23 Apr 2020 07:41:26 +0200 Subject: [PATCH 05/10] Ignore projectile cache --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fdb2c38e..ac9d36f0 100755 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ elpy/rpc-venv/ session.* elpa/ projectile-bookmarks.eld +/projectile.cache From 148ae09983a780490a9378ea59558af78452c1b6 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Fri, 24 Apr 2020 19:22:51 +0200 Subject: [PATCH 06/10] Change font type --- bundle/display.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/display.el b/bundle/display.el index e35a248e..adab89ab 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -17,7 +17,7 @@ (display-time-mode -1) ; Display time in the mode line (add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window -(add-to-list 'default-frame-alist '(font . "Iosevka Term Medium-13")) +(add-to-list 'default-frame-alist '(font . "Iosevka Term-13")) (when (eq system-type 'gnu/linux) (add-to-list 'default-frame-alist '(undecorated . t))) From eb893c978c56b613bd4716d980b37489fe5027b1 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Fri, 24 Apr 2020 19:23:21 +0200 Subject: [PATCH 07/10] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 14adf817..fdb2c38e 100755 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ elpy/rpc-venv/ /network-security.data session.* elpa/ +projectile-bookmarks.eld From c502e76da5532b5a6427bc01b0c3bf2dd232587e Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Fri, 24 Apr 2020 19:23:59 +0200 Subject: [PATCH 08/10] Update kitty settings --- kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitty.conf b/kitty.conf index df3fa030..039ada95 100644 --- a/kitty.conf +++ b/kitty.conf @@ -315,7 +315,7 @@ window_resize_step_lines 2 #: resizing windows. The cells value is used for horizontal resizing #: and the lines value for vertical resizing. -window_border_width 0.4 +window_border_width 0.5 #: The width (in pts) of window borders. Will be rounded to the #: nearest number of pixels based on screen resolution. Note that From dcaf6b2571d76ab3f7dddb2c67fdc020dda35b71 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Fri, 24 Apr 2020 19:25:32 +0200 Subject: [PATCH 09/10] Update packages --- bundle/custom.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/custom.el b/bundle/custom.el index 8fd8806a..c85635c0 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -69,7 +69,7 @@ '(package-enable-at-startup t) '(package-selected-packages (quote - (ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) + (gnu-elpa-keyring-update ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) '(python-shell-interpreter "python3") '(register-preview-delay 2) '(register-separator 43) From 16b75218678060e316e46ae157e0d541bc9532f6 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 1 May 2020 20:43:50 +0200 Subject: [PATCH 10/10] Update bundles --- bundle/bundles.el | 1 + bundle/custom.el | 2 +- bundle/display.el | 2 +- bundle/org-mode-settings.el | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bundle/bundles.el b/bundle/bundles.el index 01860181..88369cf4 100644 --- a/bundle/bundles.el +++ b/bundle/bundles.el @@ -8,6 +8,7 @@ (require 'sbcl-settings) (require 'hooks) (require 'elpy-settings) +(require 'org-attach-git) (provide 'bundles) diff --git a/bundle/custom.el b/bundle/custom.el index c85635c0..c05d2dd5 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -69,7 +69,7 @@ '(package-enable-at-startup t) '(package-selected-packages (quote - (gnu-elpa-keyring-update ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) + (gnuplot org org-ref gnu-elpa-keyring-update ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) '(python-shell-interpreter "python3") '(register-preview-delay 2) '(register-separator 43) diff --git a/bundle/display.el b/bundle/display.el index adab89ab..aec99a49 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -17,7 +17,7 @@ (display-time-mode -1) ; Display time in the mode line (add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window -(add-to-list 'default-frame-alist '(font . "Iosevka Term-13")) +(add-to-list 'default-frame-alist '(font . "Iosevka Term-12")) (when (eq system-type 'gnu/linux) (add-to-list 'default-frame-alist '(undecorated . t))) diff --git a/bundle/org-mode-settings.el b/bundle/org-mode-settings.el index f586830a..a40979b6 100644 --- a/bundle/org-mode-settings.el +++ b/bundle/org-mode-settings.el @@ -4,6 +4,7 @@ org-agenda-inhibit-startup nil org-babel-load-languages (quote ((js . t) + (gnuplot . t) (emacs-lisp . t) (python . t) (sqlite . t)