summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@protonmail.com>2023-02-08 20:33:05 +0100
committerMarek Paśnikowski <marekpasnikowski@protonmail.com>2023-02-08 20:33:05 +0100
commit27caff585e1ff65d86e5cfdd3a8ee42e25dbc476 (patch)
tree4ebf8fe720299a0e485a5b7309313ef6b2092a55
parent3e8ba0661b8fefd56e8b94a236d4b41107cfeb15 (diff)
Move configuration data to dedicated directory
-rw-r--r--aisaka.org44
-rw-r--r--data/bashrc1
-rw-r--r--data/emacs-config71
-rw-r--r--data/git-config3
-rw-r--r--home-configuration.scm80
5 files changed, 99 insertions, 100 deletions
diff --git a/aisaka.org b/aisaka.org
index a7f356a..0701dc7 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -233,24 +233,22 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
("system-update" . ,system-update)
("system-update-" . ,system-update-)))
(bashrc (list
- (plain-file "bashrc" "<<ld-library-path>>")))))
+ (local-file "data/bashrc")))))
(simple-service 'configuration-files
home-files-service-type
- `((".config/git/config" ,(plain-file "git-config" "\
- <<git-config>>\n"))
- (".emacs" ,(plain-file "emacs" "\
- <<emacs-configuration>>\n")))))))
+ `((".config/git/config" ,(local-file "data/git-config"))
+ (".emacs" ,(local-file "data/emacs-config")))))))
#+end_src
*** TODO bashrc
-#+begin_src bash :noweb-ref ld-library-path
+#+begin_src bash :tangle data/bashrc
export LD_LIBRARY_PATH=$LIBRARY_PATH
#+end_src
*** TODO emacs
-#+begin_src elisp :noweb-ref emacs-configuration
+#+begin_src elisp :tangle data/emacs-config
;;; Disable auto-backup
(setq-default make-backup-files nil)
@@ -268,8 +266,8 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
;;; 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\")
+ (setq-default user-full-name "Marek Paśnikowski"
+ user-mail-address "marekpasnikowski@protonmail.com")
;;; Startup Screen Inhibition
(setq-default inhibit-startup-screen t)
@@ -289,7 +287,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
(scheme . t )
(shell . t )))
- (add-to-list 'auto-mode-alist '(\"\\.epub\\'\" . nov-mode))
+ (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
;; Monospace Font in Ebook Reader
(setq-default nov-variable-pitch nil)
@@ -299,37 +297,37 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
;; GNUS Configuration
(setq-default gnus-auto-select-first nil
- gnus-select-method '(nnnil \"\")
- gnus-secondary-select-methods '((nnimap \"outlook\"
- (nnimap-address \"outlook.office365.com\")
+ 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-authinfo-file "~/.authinfo"))
+ (nnimap "home"
+ (nnimap-address "serwer1930490.home.pl")
(nnimap-server-port 993)
(nnimap-stream ssl)
- (nnimap-authinfo-file \"~/.authinfo\")))
+ (nnimap-authinfo-file "~/.authinfo")))
nnmail-split-method 'nnmail-split-fancy
- nnmail-split-fancy '(| \"normal\"))
+ 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\"))
+ (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\"))
+ org-fc-directories '("~/Dokumenty/fiszki"))
#+end_src
*** TODO git-config
-#+begin_src bash :noweb-ref git-config
+#+begin_src bash :tangle data/git-config
[user]
- name = \"Marek Paśnikowski\"
- email = \"marekpasnikowski@protonmail.com\"
+ name = "Marek Paśnikowski"
+ email = "marekpasnikowski@protonmail.com"
#+end_src
* TODO LIBREBOOT
diff --git a/data/bashrc b/data/bashrc
new file mode 100644
index 0000000..6486547
--- /dev/null
+++ b/data/bashrc
@@ -0,0 +1 @@
+export LD_LIBRARY_PATH=$LIBRARY_PATH
diff --git a/data/emacs-config b/data/emacs-config
new file mode 100644
index 0000000..4fe8823
--- /dev/null
+++ b/data/emacs-config
@@ -0,0 +1,71 @@
+;;; 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/data/git-config b/data/git-config
new file mode 100644
index 0000000..fa4d5ba
--- /dev/null
+++ b/data/git-config
@@ -0,0 +1,3 @@
+[user]
+name = "Marek Paśnikowski"
+email = "marekpasnikowski@protonmail.com"
diff --git a/home-configuration.scm b/home-configuration.scm
index ab9048d..7d808bd 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -169,82 +169,8 @@
("system-update" . ,system-update)
("system-update-" . ,system-update-)))
(bashrc (list
- (plain-file "bashrc" "export LD_LIBRARY_PATH=$LIBRARY_PATH")))))
+ (local-file "data/bashrc")))))
(simple-service 'configuration-files
home-files-service-type
- `((".config/git/config" ,(plain-file "git-config" "\
-[user]
-name = \"Marek Paśnikowski\"
-email = \"marekpasnikowski@protonmail.com\"\n"))
- (".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")))))))
+ `((".config/git/config" ,(local-file "data/git-config"))
+ (".emacs" ,(local-file "data/emacs-config")))))))