diff options
author | Hugo Hörnquist <hugo@hornquist.se> | 2019-12-28 02:32:38 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@hornquist.se> | 2019-12-28 02:32:38 +0100 |
commit | e9c12af512349cb95a0018e25a9cc54e78b468a4 (patch) | |
tree | 7bdfc3a05d673e220c5a3a49ebfbe7d4ebb6dba6 | |
parent | Broke out vevent->sxml into generalized function. (diff) | |
download | calp-e9c12af512349cb95a0018e25a9cc54e78b468a4.tar.gz calp-e9c12af512349cb95a0018e25a9cc54e78b468a4.tar.xz |
Move config from module to config directory.
Diffstat (limited to '')
-rw-r--r-- | config.scm (renamed from module/config.scm) | 2 | ||||
-rw-r--r-- | module/entry-points/html.scm | 1 | ||||
-rwxr-xr-x | module/main.scm | 6 | ||||
-rw-r--r-- | module/output/html.scm | 2 | ||||
-rw-r--r-- | module/output/terminal.scm | 1 |
5 files changed, 5 insertions, 7 deletions
diff --git a/module/config.scm b/config.scm index 08c678c9..f30263fd 100644 --- a/module/config.scm +++ b/config.scm @@ -2,8 +2,6 @@ ;;; Currently loaded by main, and requires that `calendar-files` ;;; is set to a list of files (or directories). -(define-module (config) #:use-module (parameters)) - (use-modules (srfi srfi-26) (srfi srfi-88) (ice-9 regex) diff --git a/module/entry-points/html.scm b/module/entry-points/html.scm index 699eebdb..82f972ae 100644 --- a/module/entry-points/html.scm +++ b/module/entry-points/html.scm @@ -8,7 +8,6 @@ :use-module (ice-9 getopt-long) :use-module (parameters) - ;; :use-module (config) ) diff --git a/module/main.scm b/module/main.scm index 72465a50..901746ea 100755 --- a/module/main.scm +++ b/module/main.scm @@ -28,8 +28,7 @@ exec guile -e main -s $0 "$@" (statprof) - (parameters) - (config)) + (parameters)) (define options '((mode (value #t) (single-char #\m)) @@ -47,6 +46,9 @@ exec guile -e main -s $0 "$@" (when stprof (statprof-start)) + (primitive-load (format #f "~a/.config/calp/config.scm" + (getenv "HOME"))) + (with-output-to-port (open-output-port (option-ref opts 'output "-")) (lambda () diff --git a/module/output/html.scm b/module/output/html.scm index d16bba1d..0682bc6e 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -16,7 +16,7 @@ #:use-module (git) #:use-module (parameters) - #:use-module (config)) + ) (define (td param) (lambda (d) `(td (@ ,(map (lambda (p) diff --git a/module/output/terminal.scm b/module/output/terminal.scm index 5d8a5a24..5ab70aa8 100644 --- a/module/output/terminal.scm +++ b/module/output/terminal.scm @@ -20,7 +20,6 @@ #:use-module (ice-9 format) #:use-module (parameters) - #:use-module (config) #:export (main-loop)) |