Merge branch 'master' of https://github.com/lnfiniteMonkeys/TimeLines…

…-emacs

Sync

additional-settings.el

@@ -1,3 +1,5 @@
 (use-package magit)
 (use-package pdf-tools)
 (use-package org-pdfview)
+(use-package rust-mode)
+(setq rust-format-on-save t)

init.el

@@ -49,7 +49,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (expand-region helm org-ref intero elpy yasnippet which-key use-package smartparens scroll-restore org-pdfview monokai-theme magit ido-vertical-mode hydra ghc avy))))
+    (rust-mode expand-region helm org-ref intero elpy yasnippet which-key use-package smartparens scroll-restore org-pdfview monokai-theme magit ido-vertical-mode hydra ghc avy))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

snippets/timelines-mode/saw

@@ -8,6 +8,6 @@ synth "$1_saw" $ do
   "freq" <>< let
     in ${3:f}
   "width" <>< let
-    in ${5:0}
+    in ${5:0.5}
   "pan" <>< let
     in ${0:0}

snippets/timelines-mode/saw4

@@ -0,0 +1,20 @@
+# -*- mode: snippet -*-
+# name: saw4
+# key: saw4
+# --
+let chords = [ [0, 3, 7, 9] ]
+synth "$1_saw4" $ do
+  "amp" <>< let
+    in ${2:0}
+  "freq1" <>< let
+    in ${3:f}
+  "freq2" <>< let
+    in ${4:f}
+  "freq3" <>< let
+    in ${5:f}
+  "freq4" <>< let
+    in ${6:f}
+  "width" <>< let
+    in ${7:0.5}
+  "pan" <>< let
+    in ${0:0}

timelines-mode.el

@@ -16,7 +16,7 @@
   "*The name of the TimeLines process buffer (default = *timelines*).")
 
 
-(defvar timelines-path-to-src
+(defvar timelines-path
   "~/timelines"
   "*The path to the source files to be loaded on startup (default = '~/timelines')")
 
@@ -59,11 +59,11 @@
   (interactive)
   (if (comint-check-proc timelines-buffer)
       (error "A TimeLines process is already running")
-    (let ((default-directory timelines-path-to-src))
+    (let ((default-directory timelines-path))
       (make-comint "timelines" timelines-interpreter nil timelines-interpreter-args))
     (delete-other-windows)
     (timelines-show-output)
-    (timelines-send-string ":script Boot.hs")))
+    (timelines-send-string ":script BootScript.hs")))
 
 (defun timelines-reset ()
     (interactive)