47 files changed, 51 insertions, 94 deletions
diff --git a/com/influencedbybooks/aero.hs b/Com/InfluencedByBooks/Aero.hs
index 63066c5..92d071d 100644
--- a/com/influencedbybooks/aero.hs
+++ b/Com/InfluencedByBooks/Aero.hs
@@ -3,11 +3,11 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 -- | Front-end
-module Com.Influencedbybooks.Aero where
+module Com.InfluencedByBooks.Aero where
 
 import Com.Simatime.Alpha
-import Com.Influencedbybooks.Move (move)
-import Com.Influencedbybooks.Core (Action(..), see, init)
+import Com.InfluencedByBooks.Move (move)
+import Com.InfluencedByBooks.Core (Action(..), see, init)
 import Miso (App(..), defaultEvents, miso)
 
 main :: IO ()
diff --git a/com/influencedbybooks/apex.hs b/Com/InfluencedByBooks/Apex.hs
index 32e6403..c154f95 100644
--- a/com/influencedbybooks/apex.hs
+++ b/Com/InfluencedByBooks/Apex.hs
@@ -8,12 +8,12 @@
 {-# LANGUAGE TypeOperators #-}
 
 -- | Server
-module Com.Influencedbybooks.Apex where
+module Com.InfluencedByBooks.Apex where
 
 import Com.Simatime.Alpha
-import Com.Influencedbybooks.Core
-import qualified Com.Influencedbybooks.Keep as Keep
-import qualified Com.Influencedbybooks.Look as Look
+import Com.InfluencedByBooks.Core
+import qualified Com.InfluencedByBooks.Keep as Keep
+import qualified Com.InfluencedByBooks.Look as Look
 import qualified Clay
 import qualified Data.Text.Lazy                as Lazy
 import qualified Data.Text.Lazy.Encoding       as Lazy
diff --git a/com/influencedbybooks/core.hs b/Com/InfluencedByBooks/Core.hs
index 2a616f3..9bd2353 100644
--- a/com/influencedbybooks/core.hs
+++ b/Com/InfluencedByBooks/Core.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- | Main app logic
-module Com.Influencedbybooks.Core where
+module Com.InfluencedByBooks.Core where
 
 import Com.Simatime.Alpha
 import Data.Aeson hiding (Success)
diff --git a/com/influencedbybooks/influencers.hs b/Com/InfluencedByBooks/Influencers.hs
index c0cb143..2583770 100644
--- a/com/influencedbybooks/influencers.hs
+++ b/Com/InfluencedByBooks/Influencers.hs
@@ -2,9 +2,9 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 
-module Com.Influencedbybooks.Influencers where
+module Com.InfluencedByBooks.Influencers where
 
-import Com.Influencedbybooks.Core
+import Com.InfluencedByBooks.Core
 
 allPeople :: [Person]
 allPeople =
diff --git a/com/influencedbybooks/keep.hs b/Com/InfluencedByBooks/Keep.hs
index 2b7ff3a..0bc527a 100644
--- a/com/influencedbybooks/keep.hs
+++ b/Com/InfluencedByBooks/Keep.hs
@@ -10,9 +10,9 @@
 -- `Biz.Keep`. I could wrap all the safecopy stuff in my own template haskell
 -- like `$(keep ''MyType)`.
 --
-module Com.Influencedbybooks.Keep where
+module Com.InfluencedByBooks.Keep where
 
-import Com.Influencedbybooks.Core (Person(..), Book(..))
+import Com.InfluencedByBooks.Core (Person(..), Book(..))
 import Control.Monad.State (get, put)
 import Control.Monad.Reader (ask)
 import Data.Acid (Update, makeAcidic)
@@ -24,7 +24,7 @@ import Data.SafeCopy
 import Data.Text (Text)
 import qualified Data.Text as Text
 
-import qualified Com.Influencedbybooks.Influencers as Influencers
+import qualified Com.InfluencedByBooks.Influencers as Influencers
 
 -- * Keep
 
diff --git a/com/influencedbybooks/look.hs b/Com/InfluencedByBooks/Look.hs
index 68ae81f..d61fc11 100644
--- a/com/influencedbybooks/look.hs
+++ b/Com/InfluencedByBooks/Look.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 -- | The look and feel of Ibb
-module Com.Influencedbybooks.Look  where
+module Com.InfluencedByBooks.Look  where
 
 import Com.Simatime.Alpha
 import Clay
diff --git a/com/influencedbybooks/move.hs b/Com/InfluencedByBooks/Move.hs
index 6623d6f..d372da6 100644
--- a/com/influencedbybooks/move.hs
+++ b/Com/InfluencedByBooks/Move.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- | App update logic
-module Com.Influencedbybooks.Move (
+module Com.InfluencedByBooks.Move (
     move
   -- * Server interactions
   , fetchPeople
@@ -10,7 +10,7 @@ module Com.Influencedbybooks.Move (
 
 import Com.Simatime.Alpha
 import Data.Aeson
-import Com.Influencedbybooks.Core as Core
+import Com.InfluencedByBooks.Core as Core
 import JavaScript.Web.XMLHttpRequest (Request(..), Method(GET), RequestData(NoData), contents, xhrByteString)
 import Miso
 import Miso.String
diff --git a/com/influencedbybooks/service.nix b/Com/InfluencedByBooks/service.nix
index f9d0f36..f9d0f36 100644
--- a/com/influencedbybooks/service.nix
+++ b/Com/InfluencedByBooks/service.nix
diff --git a/com/simatime/alpha.hs b/Com/Simatime/Alpha.hs
index 438b97a..438b97a 100644
--- a/com/simatime/alpha.hs
+++ b/Com/Simatime/Alpha.hs
diff --git a/com/simatime/go.hs b/Com/Simatime/Go.hs
index 1b32230..1b32230 100644
--- a/com/simatime/go.hs
+++ b/Com/Simatime/Go.hs
diff --git a/com/simatime/network.hs b/Com/Simatime/Network.hs
index e47e891..e47e891 100644
--- a/com/simatime/network.hs
+++ b/Com/Simatime/Network.hs
diff --git a/com/simatime/sema.hs b/Com/Simatime/Sema.hs
index f0f75da..f0f75da 100644
--- a/com/simatime/sema.hs
+++ b/Com/Simatime/Sema.hs
diff --git a/com/simatime/shuffle.hs b/Com/Simatime/Shuffle.hs
index 02cd3e0..02cd3e0 100644
--- a/com/simatime/shuffle.hs
+++ b/Com/Simatime/Shuffle.hs
diff --git a/com/simatime/bild.scm b/Com/Simatime/bild.scm
index d924b29..6ac09ce 100755
--- a/com/simatime/bild.scm
+++ b/Com/Simatime/bild.scm
@@ -117,12 +117,12 @@
 ;;
 ;;; Code:
 
-(define-module (com simatime bild)
+(define-module (Com Simatime bild)
   #:use-module ((ice-9 popen) #:prefix popen/)
   #:use-module ((ice-9 format) #:select (format))
   #:use-module ((ice-9 rdelim) #:prefix rdelim/)
-  #:use-module ((com simatime shell) #:prefix sh/)
-  #:use-module ((com simatime string) #:prefix string/)
+  #:use-module ((Com Simatime shell) #:prefix sh/)
+  #:use-module ((Com Simatime string) #:prefix string/)
   #:export (ns?
             ns->path
             path->ns
diff --git a/com/simatime/buildHaskellApp.nix b/Com/Simatime/buildHaskellApp.nix
index ff9c741..7f67622 100644
--- a/com/simatime/buildHaskellApp.nix
+++ b/Com/Simatime/buildHaskellApp.nix
@@ -19,7 +19,7 @@ let
   nsToPath = ns: builtins.toString (builtins.replaceStrings ["."] ["/"] ns);
   aeroPath = nsToPath aero;
   apexPath = nsToPath apex;
-  basePath = lib.strings.removeSuffix "/Apex" apexPath;
+  basePath = nsToPath name;
 
   depsToPackageSet = packageSet: deps:
     map (s: builtins.getAttr s packageSet) deps;
@@ -50,7 +50,7 @@ let
     depsToPackageSet hp (deps.both ++ deps.aero));
 
 in {
-  env = ghc // ghcjs // guile;
+  inherit ghc ghcjs;
   app = stdenv.mkDerivation {
     name = name;
     version = "0";
@@ -60,9 +60,6 @@ in {
     ];
     strictDeps = true;
     buildPhase = ''
-      # capitalize paths for 'ghc --make'
-      source .envrc
-      guile -e '(com simatime caplinks)' -s ./com/simatime/caplinks.scm .
       #
       mkdir -p $out/{bin,static} ${basePath}
       #
diff --git a/com/simatime/core.scm b/Com/Simatime/core.scm
index 155214c..dbacd8a 100644
--- a/com/simatime/core.scm
+++ b/Com/Simatime/core.scm
@@ -1,4 +1,4 @@
-(define-module (com simatime core))
+(define-module (Com Simatime core))
 
 (define (flip f)           (lambda (x y) (f y x)))
 (define (curry f a)        (lambda (b) (apply f (cons a (list b)))))
@@ -63,6 +63,11 @@
       (last coll)
       (first coll)))
 
+(define (butlast ls)
+  "Return everthing execpt the last element in ls."
+  (let ((len (length ls)))
+    (list-head ls (- len 1))))
+
 (define (false? x)
   (eq? #f x))
 
diff --git a/com/simatime/dev/configuration.nix b/Com/Simatime/dev/configuration.nix
index c096f85..c096f85 100644
--- a/com/simatime/dev/configuration.nix
+++ b/Com/Simatime/dev/configuration.nix
diff --git a/com/simatime/dev/hardware.nix b/Com/Simatime/dev/hardware.nix
index fc0e7a0..fc0e7a0 100644
--- a/com/simatime/dev/hardware.nix
+++ b/Com/Simatime/dev/hardware.nix
diff --git a/com/simatime/fathom.nix b/Com/Simatime/fathom.nix
index 40e8b0b..40e8b0b 100644
--- a/com/simatime/fathom.nix
+++ b/Com/Simatime/fathom.nix
diff --git a/com/simatime/firefox.nix b/Com/Simatime/firefox.nix
index 12316fb..12316fb 100644
--- a/com/simatime/firefox.nix
+++ b/Com/Simatime/firefox.nix
diff --git a/com/simatime/git.nix b/Com/Simatime/git.nix
index 51e46b6..51e46b6 100644
--- a/com/simatime/git.nix
+++ b/Com/Simatime/git.nix
diff --git a/com/simatime/hardware.nix b/Com/Simatime/hardware.nix
index 8c88cb7..8c88cb7 100644
--- a/com/simatime/hardware.nix
+++ b/Com/Simatime/hardware.nix
diff --git a/com/simatime/idea/duree-pitch.org b/Com/Simatime/idea/duree-pitch.org
index d4d9d6f..d4d9d6f 100644
--- a/com/simatime/idea/duree-pitch.org
+++ b/Com/Simatime/idea/duree-pitch.org
diff --git a/com/simatime/idea/flash.org b/Com/Simatime/idea/flash.org
index 1c392f0..1c392f0 100644
--- a/com/simatime/idea/flash.org
+++ b/Com/Simatime/idea/flash.org
diff --git a/com/simatime/keys/ben.pub b/Com/Simatime/keys/ben.pub
index c661508..c661508 100644
--- a/com/simatime/keys/ben.pub
+++ b/Com/Simatime/keys/ben.pub
diff --git a/com/simatime/keys/deploy.pub b/Com/Simatime/keys/deploy.pub
index 664a2d9..664a2d9 100644
--- a/com/simatime/keys/deploy.pub
+++ b/Com/Simatime/keys/deploy.pub
diff --git a/com/simatime/keys/nick.pub b/Com/Simatime/keys/nick.pub
index 4dc08fb..4dc08fb 100644
--- a/com/simatime/keys/nick.pub
+++ b/Com/Simatime/keys/nick.pub
diff --git a/com/simatime/language/bs.hs b/Com/Simatime/language/Bs.hs
index a810706..a810706 100644
--- a/com/simatime/language/bs.hs
+++ b/Com/Simatime/language/Bs.hs
diff --git a/com/simatime/language/bs/cli.hs b/Com/Simatime/language/Bs/Cli.hs
index 4c48c86..4c48c86 100644
--- a/com/simatime/language/bs/cli.hs
+++ b/Com/Simatime/language/Bs/Cli.hs
diff --git a/com/simatime/language/bs/eval.hs b/Com/Simatime/language/Bs/Eval.hs
index 290170b..290170b 100644
--- a/com/simatime/language/bs/eval.hs
+++ b/Com/Simatime/language/Bs/Eval.hs
diff --git a/com/simatime/language/bs/expr.hs b/Com/Simatime/language/Bs/Expr.hs
index a39c7b6..a39c7b6 100644
--- a/com/simatime/language/bs/expr.hs
+++ b/Com/Simatime/language/Bs/Expr.hs
diff --git a/com/simatime/language/bs/parser.hs b/Com/Simatime/language/Bs/Parser.hs
index 3044a60..3044a60 100644
--- a/com/simatime/language/bs/parser.hs
+++ b/Com/Simatime/language/Bs/Parser.hs
diff --git a/com/simatime/language/bs/primitives.hs b/Com/Simatime/language/Bs/Primitives.hs
index c074c59..c074c59 100644
--- a/com/simatime/language/bs/primitives.hs
+++ b/Com/Simatime/language/Bs/Primitives.hs
diff --git a/com/simatime/language/bs/repl.hs b/Com/Simatime/language/Bs/Repl.hs
index 64ffaa2..64ffaa2 100644
--- a/com/simatime/language/bs/repl.hs
+++ b/Com/Simatime/language/Bs/Repl.hs
diff --git a/com/simatime/language/bs/test.hs b/Com/Simatime/language/Bs/Test.hs
index 4a40036..4a40036 100644
--- a/com/simatime/language/bs/test.hs
+++ b/Com/Simatime/language/Bs/Test.hs
diff --git a/com/simatime/mail.nix b/Com/Simatime/mail.nix
index 81bddc2..81bddc2 100644
--- a/com/simatime/mail.nix
+++ b/Com/Simatime/mail.nix
diff --git a/com/simatime/networking.nix b/Com/Simatime/networking.nix
index f634187..f634187 100644
--- a/com/simatime/networking.nix
+++ b/Com/Simatime/networking.nix
diff --git a/com/simatime/nixpkgs.nix b/Com/Simatime/nixpkgs.nix
index 5d8dc56..5d8dc56 100644
--- a/com/simatime/nixpkgs.nix
+++ b/Com/Simatime/nixpkgs.nix
diff --git a/com/simatime/packages.nix b/Com/Simatime/packages.nix
index 920d19d..920d19d 100644
--- a/com/simatime/packages.nix
+++ b/Com/Simatime/packages.nix
diff --git a/com/simatime/repl.scm b/Com/Simatime/repl.scm
index bae7e8f..4913383 100644
--- a/com/simatime/repl.scm
+++ b/Com/Simatime/repl.scm
@@ -1,4 +1,4 @@
-(define-module (com simatime repl)
+(define-module (Com Simatime repl)
   #:export ())
 
 
diff --git a/com/simatime/shell.scm b/Com/Simatime/shell.scm
index 7c6bb5c..02c4e00 100644
--- a/com/simatime/shell.scm
+++ b/Com/Simatime/shell.scm
@@ -1,4 +1,4 @@
-(define-module (com simatime shell)
+(define-module (Com Simatime shell)
   #:use-module ((ice-9 popen) #:prefix popen/)
   #:use-module ((ice-9 rdelim) #:prefix rdelim/)
   #:use-module ((ice-9 ftw) #:prefix ftw/)
diff --git a/com/simatime/string.scm b/Com/Simatime/string.scm
index 01c5a70..3d32cd1 100644
--- a/com/simatime/string.scm
+++ b/Com/Simatime/string.scm
@@ -1,4 +1,4 @@
-(define-module (com simatime string)
+(define-module (Com Simatime string)
   #:export (replace to-string str capitalize))
 
 (define (replace s match repl)
diff --git a/com/simatime/users.nix b/Com/Simatime/users.nix
index daac9d6..daac9d6 100644
--- a/com/simatime/users.nix
+++ b/Com/Simatime/users.nix
diff --git a/com/simatime/web.nix b/Com/Simatime/web.nix
index d6be348..d6be348 100644
--- a/com/simatime/web.nix
+++ b/Com/Simatime/web.nix
diff --git a/com/simatime/znc.nix b/Com/Simatime/znc.nix
index 9b1a28d..9b1a28d 100644
--- a/com/simatime/znc.nix
+++ b/Com/Simatime/znc.nix
diff --git a/com/simatime/caplinks.scm b/com/simatime/caplinks.scm
deleted file mode 100755
index 21f0b88..0000000
--- a/com/simatime/caplinks.scm
+++ /dev/null
@@ -1,45 +0,0 @@
-
-(define-module (com simatime caplinks)
-  #:use-module ((ice-9 popen) #:prefix popen/)
-  #:use-module ((com simatime string) #:prefix string/)
-  #:use-module ((com simatime shell) #:prefix sh/)
-  #:export (main get-all-nodes make-symlink))
-
-;; given a root directory, walk the tree and get a list of all the files. Then,
-;; for each file, symlink a capitalized version
-(define (main args)
-  (let* ((root (cadr args))
-         (files (get-all-nodes root)))
-    (for-each (lambda (file)
-                (display file)
-                (move-file file (capitalize-file file)))
-              files)
-    (display root) (newline)
-    (display "done moving files") (newline)
-    (newline)))
-
-(define (get-all-nodes root)
-  (filter (lambda (s) (not (equal? "" s)))
-          (string-split (sh/stream
-                         (format #f "find ~a -name '*.hs*'" root))
-                        #\newline)))
-
-(define (capitalize-file file)
-  (string-join (map string/capitalize (string-split file #\/))
-               "/"))
-
-(define (butlast ls)
-  (let ((len (length ls)))
-    (list-head ls (- len 1))))
-
-(define (dir-for f)
-  (string-join
-   (butlast (string-split f #\/))
-   "/"))
-
-(define (move-file here there)
-  (display (format #f "~a -> ~a" here there))
-  (newline)
-  ;; make the directory tree for the link, if it doesn't already exist
-  (system (format #f "mkdir -p ~a" (dir-for there)))
-  (system (format #f "mv ~a ~a" here there)))
diff --git a/default.nix b/default.nix
index c5bfabd..70d6e5e 100644
--- a/default.nix
+++ b/default.nix
@@ -8,26 +8,26 @@ let
     system = full.system;
     vm = full.vm;
   };
-  buildHaskellApp = import ./com/simatime/buildHaskellApp.nix nixpkgs;
+  buildHaskellApp = import ./Com/Simatime/buildHaskellApp.nix nixpkgs;
   nixos-mailserver = builtins.fetchTarball {
     url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz";
     sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx";
   };
 in {
-  com.simatime = buildNixOS {
+  Com.Simatime = buildNixOS {
     system = "x86_64-linux";
     configuration = {
       imports = [
-        ./com/simatime/hardware.nix
-        ./com/simatime/networking.nix
+        ./Com/Simatime/hardware.nix
+        ./Com/Simatime/networking.nix
         # common infra
-        ./com/simatime/users.nix
-        ./com/simatime/packages.nix
+        ./Com/Simatime/users.nix
+        ./Com/Simatime/packages.nix
         # configured modules
-        ./com/simatime/git.nix
-        ./com/simatime/mail.nix
-        ./com/simatime/web.nix
-        ./com/simatime/znc.nix
+        ./Com/Simatime/git.nix
+        ./Com/Simatime/mail.nix
+        ./Com/Simatime/web.nix
+        ./Com/Simatime/znc.nix
         # third party
         nixos-mailserver
       ];
@@ -49,22 +49,22 @@ in {
       system = "x86_64-linux";
       configuration = {
         imports = [
-          ./com/simatime/users.nix
-          ./com/simatime/packages.nix
-          ./com/simatime/dev/hardware.nix
-          ./com/simatime/dev/configuration.nix
+          ./Com/Simatime/users.nix
+          ./Com/Simatime/packages.nix
+          ./Com/Simatime/dev/hardware.nix
+          ./Com/Simatime/dev/configuration.nix
         ];
       };
     };
   };
-  com.influencedbybooks = buildNixOS  {
+  Com.InfluencedByBooks = buildNixOS {
     system = "x86_64-linux";
     configuration = {
       imports = [
-        ./com/influencedbybooks/service.nix
+        ./Com/InfluencedByBooks/service.nix
         # common infra
-        ./com/simatime/users.nix
-        ./com/simatime/packages.nix
+        ./Com/Simatime/users.nix
+        ./Com/Simatime/packages.nix
       ];
       nixpkgs.config.allowUnfree = true;
       services.openssh = {
@@ -75,10 +75,10 @@ in {
       boot.cleanTmpDir = true;
     };
   } // (buildHaskellApp {
-    name = "Com.Influencedbybooks";
+    name = "Com.InfluencedByBooks";
     nick = "ibb";
-    apex = "Com.Influencedbybooks.Apex";
-    aero = "Com.Influencedbybooks.Aero";
+    apex = "Com.InfluencedByBooks.Apex";
+    aero = "Com.InfluencedByBooks.Aero";
     deps = {
       both = [
         "clay"