summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@protonmail.com>2023-02-07 21:18:09 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2023-02-07 21:18:09 +0100
commit52a96a66cf98c7a956645767b211064815504eb7 (patch)
tree347d4dddde0c71591f78ac5bbeee320fefc74736
parent3756fc70bcf9ba93759435fcf9bd197d3ea811d5 (diff)
Integrate the emacs.el file
-rw-r--r--aisaka.org79
-rw-r--r--emacs.el71
-rw-r--r--home-configuration.scm73
3 files changed, 150 insertions, 73 deletions
diff --git a/aisaka.org b/aisaka.org
index 552554b..a8703e5 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -240,7 +240,8 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
`((".config/git/config" ,(local-file "git.config"))
(".config/guix/shell-authorized-directories"
,(local-file "guix-shell-authorized-directories"))
- (".emacs" ,(local-file "emacs.el")))))))
+ (".emacs" ,(plain-file "emacs" "\
+ <<emacs-configuration>>\n")))))))
#+end_src
*** TODO bashrc
@@ -249,6 +250,82 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
export LD_LIBRARY_PATH=$LIBRARY_PATH
#+end_src
+*** TODO emacs
+
+#+begin_src elisp :noweb-ref emacs-configuration
+ ;;; Disable auto-backup
+ (setq-default make-backup-files nil)
+
+ ;;; https://github.com/fimblo/dot.emacs
+ ;;; Theme Activation
+ (load-theme 'manoj-dark)
+
+ ;;; https://elpa.gnu.org/packages/aggressive-indent.html
+ ;;; Automatic Activation of Aggressive Indent
+ (global-aggressive-indent-mode)
+
+ ;; Highlight the pair of delimiters under the cursor
+ (setq-default show-paren-mode 1
+ show-paren-delay 0)
+
+ ;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html
+ ;;; Copyright Information
+ (setq-default user-full-name \"Marek Paśnikowski\"
+ user-mail-address \"marekpasnikowski@protonmail.com\")
+
+ ;;; Startup Screen Inhibition
+ (setq-default inhibit-startup-screen t)
+
+ ;; Enable the column-80 line
+ (setq-default display-fill-column-indicator 1
+ display-fill-column-indicator-column 80)
+ (global-display-fill-column-indicator-mode)
+
+ ;; Prepare Literate Programming
+ (setq-default
+ org-startup-indented t
+ org-confirm-babel-evaluate nil
+ org-src-fontify-natively t
+ org-src-tab-acts-natively t)
+ (org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
+ (scheme . t )
+ (shell . t )))
+
+ (add-to-list 'auto-mode-alist '(\"\\.epub\\'\" . nov-mode))
+
+ ;; Monospace Font in Ebook Reader
+ (setq-default nov-variable-pitch nil)
+
+ ;; Disable Toolbar
+ (tool-bar-mode -1)
+
+ ;; GNUS Configuration
+ (setq-default gnus-auto-select-first nil
+ gnus-select-method '(nnnil \"\")
+ gnus-secondary-select-methods '((nnimap \"outlook\"
+ (nnimap-address \"outlook.office365.com\")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file \"~/.authinfo\"))
+ (nnimap \"home\"
+ (nnimap-address \"serwer1930490.home.pl\")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file \"~/.authinfo\")))
+ nnmail-split-method 'nnmail-split-fancy
+ nnmail-split-fancy '(| \"normal\"))
+ (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
+
+ ;; Org Configuration
+ (setq-default org-contacts-files '(\"~/Dokumenty/UWM/filia w Ełku/Samorząd 2022/starostowie.org\"))
+
+ ;; ORG-FC Configuration
+ (require 'org-fc-hydra)
+ (setq-default
+ org-fc-algorithm 'tn
+ org-fc-directories '(\"~/Dokumenty/fiszki\"))
+#+end_src
+
* TODO LIBREBOOT
The first layer of computing is the firmware. The Lenovo Thinkpad X200 has
diff --git a/emacs.el b/emacs.el
deleted file mode 100644
index 7f1a1cd..0000000
--- a/emacs.el
+++ /dev/null
@@ -1,71 +0,0 @@
-;;; Disable auto-backup
-(setq-default make-backup-files nil)
-
-;;; https://github.com/fimblo/dot.emacs
-;;; Theme Activation
-(load-theme 'manoj-dark)
-
-;;; https://elpa.gnu.org/packages/aggressive-indent.html
-;;; Automatic Activation of Aggressive Indent
-(global-aggressive-indent-mode)
-
-;; Highlight the pair of delimiters under the cursor
-(setq-default show-paren-mode 1
- show-paren-delay 0)
-
-;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html
-;;; Copyright Information
-(setq-default user-full-name "Marek Paśnikowski"
- user-mail-address "marekpasnikowski@protonmail.com")
-
-;;; Startup Screen Inhibition
-(setq-default inhibit-startup-screen t)
-
-;; Enable the column-80 line
-(setq-default display-fill-column-indicator 1
- display-fill-column-indicator-column 80)
-(global-display-fill-column-indicator-mode)
-
-;; Prepare Literate Programming
-(setq-default
- org-startup-indented t
- org-confirm-babel-evaluate nil
- org-src-fontify-natively t
- org-src-tab-acts-natively t)
-(org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
- (scheme . t )
- (shell . t )))
-
-(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
-
-;; Monospace Font in Ebook Reader
-(setq-default nov-variable-pitch nil)
-
-;; Disable Toolbar
-(tool-bar-mode -1)
-
-;; GNUS Configuration
-(setq-default gnus-auto-select-first nil
- gnus-select-method '(nnnil "")
- gnus-secondary-select-methods '((nnimap "outlook"
- (nnimap-address "outlook.office365.com")
- (nnimap-server-port 993)
- (nnimap-stream ssl)
- (nnimap-authinfo-file "~/.authinfo"))
- (nnimap "home"
- (nnimap-address "serwer1930490.home.pl")
- (nnimap-server-port 993)
- (nnimap-stream ssl)
- (nnimap-authinfo-file "~/.authinfo")))
- nnmail-split-method 'nnmail-split-fancy
- nnmail-split-fancy '(| "normal"))
-(add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
-
-;; Org Configuration
-(setq-default org-contacts-files '("~/Dokumenty/UWM/filia w Ełku/Samorząd 2022/starostowie.org"))
-
-;; ORG-FC Configuration
-(require 'org-fc-hydra)
-(setq-default
- org-fc-algorithm 'tn
- org-fc-directories '("~/Dokumenty/fiszki"))
diff --git a/home-configuration.scm b/home-configuration.scm
index e436135..2fee4fc 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -168,4 +168,75 @@
`((".config/git/config" ,(local-file "git.config"))
(".config/guix/shell-authorized-directories"
,(local-file "guix-shell-authorized-directories"))
- (".emacs" ,(local-file "emacs.el")))))))
+ (".emacs" ,(plain-file "emacs" "\
+;;; Disable auto-backup
+(setq-default make-backup-files nil)
+
+;;; https://github.com/fimblo/dot.emacs
+;;; Theme Activation
+(load-theme 'manoj-dark)
+
+;;; https://elpa.gnu.org/packages/aggressive-indent.html
+;;; Automatic Activation of Aggressive Indent
+(global-aggressive-indent-mode)
+
+;; Highlight the pair of delimiters under the cursor
+(setq-default show-paren-mode 1
+ show-paren-delay 0)
+
+;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html
+;;; Copyright Information
+(setq-default user-full-name \"Marek Paśnikowski\"
+ user-mail-address \"marekpasnikowski@protonmail.com\")
+
+;;; Startup Screen Inhibition
+(setq-default inhibit-startup-screen t)
+
+;; Enable the column-80 line
+(setq-default display-fill-column-indicator 1
+ display-fill-column-indicator-column 80)
+(global-display-fill-column-indicator-mode)
+
+;; Prepare Literate Programming
+(setq-default
+ org-startup-indented t
+ org-confirm-babel-evaluate nil
+ org-src-fontify-natively t
+ org-src-tab-acts-natively t)
+(org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
+ (scheme . t )
+ (shell . t )))
+
+(add-to-list 'auto-mode-alist '(\"\\.epub\\'\" . nov-mode))
+
+;; Monospace Font in Ebook Reader
+(setq-default nov-variable-pitch nil)
+
+;; Disable Toolbar
+(tool-bar-mode -1)
+
+;; GNUS Configuration
+(setq-default gnus-auto-select-first nil
+ gnus-select-method '(nnnil \"\")
+ gnus-secondary-select-methods '((nnimap \"outlook\"
+ (nnimap-address \"outlook.office365.com\")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file \"~/.authinfo\"))
+ (nnimap \"home\"
+ (nnimap-address \"serwer1930490.home.pl\")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file \"~/.authinfo\")))
+ nnmail-split-method 'nnmail-split-fancy
+ nnmail-split-fancy '(| \"normal\"))
+(add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
+
+;; Org Configuration
+(setq-default org-contacts-files '(\"~/Dokumenty/UWM/filia w Ełku/Samorząd 2022/starostowie.org\"))
+
+;; ORG-FC Configuration
+(require 'org-fc-hydra)
+(setq-default
+ org-fc-algorithm 'tn
+ org-fc-directories '(\"~/Dokumenty/fiszki\"))\n")))))))