From 4128eacc9802e5d4ba98310459b3419d1e14461b Mon Sep 17 00:00:00 2001 From: opFez Date: Fri, 9 Apr 2021 17:56:51 +0200 Subject: [PATCH] alksdfl;asdkjfalskj --- functions.el | 9 +++++++++ init.el | 30 ++++++++++++++++-------------- packages.el | 11 +++++++++++ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/functions.el b/functions.el index 61805ca..f8c99d4 100644 --- a/functions.el +++ b/functions.el @@ -53,3 +53,12 @@ (defun toggle-indent () (interactive) (setq-default indent-tabs-mode (not indent-tabs-mode))) + +(global-set-key [f5] (lambda () + (interactive) + (disable-theme 'basic) + (load-theme 'magik))) +(global-set-key [f6] (lambda () + (interactive) + (disable-theme 'magik) + (load-theme 'basic))) diff --git a/init.el b/init.el index 0a78d51..d934559 100644 --- a/init.el +++ b/init.el @@ -24,7 +24,7 @@ (set-language-environment "UTF-8") ;; Appearance -(set-frame-font "ttyp0 12") +(set-frame-font "Gohu Gohufont 11") (set-face-italic 'font-lock-comment-face nil) ; disable italics ; theme set in packages.el (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") @@ -46,8 +46,8 @@ (setq auto-save-default nil) ;; pretty lambdas -(setq-default prettify-symbols-alist '(("lambda" . 955))) -(global-prettify-symbols-mode 1) +;(setq-default prettify-symbols-alist '(("lambda" . 955))) +;(global-prettify-symbols-mode 1) ;; Y or N instead of Yes or No (defalias 'yes-or-no-p 'y-or-n-p) @@ -74,13 +74,13 @@ (setq add-log-mailing-address "opfez@disroot.org") ;; windmove -(global-set-key (kbd "C-:") 'windmove-left) -(global-set-key (kbd "C-|") 'windmove-right) -(global-set-key (kbd "C-{") 'windmove-up) -(global-set-key (kbd "C-\"") 'windmove-down) +(global-set-key (kbd "C-S-j") 'windmove-left) +(global-set-key (kbd "C-S-k") 'windmove-down) +(global-set-key (kbd "C-S-l") 'windmove-up) +(global-set-key (kbd "C-:") 'windmove-right) ;; Terminal -(defvar term-shell "/bin/zsh") +(defvar term-shell "/bin/mksh") (defadvice ansi-term (before force-bash) (interactive (list term-shell))) (ad-activate 'ansi-term) @@ -90,9 +90,7 @@ c-basic-offset 4) ;; Scheme configuration -(setq geiser-active-implementations '(chicken)) -(add-hook 'geiser-mode-hook - (lambda () (local-set-key (kbd "C-c C-l") #'run-chicken))) +(setq geiser-active-implementations '(guile)) ;; Disable bold fonts (defun remap-faces-default-attributes () @@ -118,11 +116,15 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(column-number-mode t) '(custom-safe-themes - '("b026761932dac55edfc103de7267ab1db5cd7cc183e06654a2be976cf3a09b9c" "2eeeb1813d66b7d1b858ecf7e4623f774ee555f4b6c1e6de93a1875c03af41de" "5a5e51dc0d54d7626f182dcc1712ed0bad80085db52da3fbe737be4f58d983d0" "4c5f4e96bbde8ab012c661b04c887d9cf65ee9fc37abcce661aabd3a098a69e9" "9c25bd583aa28e4a96af84c9bcf4b5c917bb2ec907ac9d5ab745e54b27104ec6" default)) + '("a6473f7abf949f4a6a1a9cc0dd37ea2e35ba3cea65d3442b98d65c5c5c5cb8d7" "b026761932dac55edfc103de7267ab1db5cd7cc183e06654a2be976cf3a09b9c" "2eeeb1813d66b7d1b858ecf7e4623f774ee555f4b6c1e6de93a1875c03af41de" "5a5e51dc0d54d7626f182dcc1712ed0bad80085db52da3fbe737be4f58d983d0" "4c5f4e96bbde8ab012c661b04c887d9cf65ee9fc37abcce661aabd3a098a69e9" "9c25bd583aa28e4a96af84c9bcf4b5c917bb2ec907ac9d5ab745e54b27104ec6" default)) + '(display-time-mode t) '(package-selected-packages - '(disaster multiple-cursors nasm-mode carp-mode flycheck ido-mode move-text undo-tree sorcery-theme autothemer rust-mode paredit geiser forth-mode avy swiper auto-package-update magit expand-region go-mode tao-themes tao-theme almost-mono-themes use-package)) - '(pdf-view-midnight-colors '("#dddddd" . "#000000"))) + '(basic-theme geiser-chicken geiser-guile disaster multiple-cursors nasm-mode carp-mode flycheck ido-mode move-text undo-tree sorcery-theme autothemer rust-mode paredit forth-mode avy swiper auto-package-update magit expand-region go-mode tao-themes tao-theme almost-mono-themes use-package)) + '(pdf-view-midnight-colors '("#dddddd" . "#000000")) + '(show-paren-mode t) + '(tool-bar-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/packages.el b/packages.el index 200877a..700dbd1 100644 --- a/packages.el +++ b/packages.el @@ -27,6 +27,9 @@ (use-package autothemer :ensure t) +(use-package basic-theme + :ensure t) + ;; better incremental search with minibuffer (use-package swiper :ensure t @@ -67,6 +70,14 @@ (use-package geiser :ensure t) +(use-package geiser-guile + :ensure t) + +(use-package geiser-chicken + :ensure t + :config + (setq geiser-chicken-binary "chicken-csi")) + (use-package disaster :ensure t :config