summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.envrc16
-rw-r--r--.vimrc14
-rw-r--r--Biz/Dragons.hs82
-rw-r--r--Biz/Dragons/Analysis.hs6
-rw-r--r--Biz/Que.nix9
-rw-r--r--Biz/Que/Host.hs8
-rw-r--r--Biz/Que/Site.hs6
-rw-r--r--Control/Concurrent/Go.hs6
-rw-r--r--Omni/App.hs (renamed from Biz/App.hs)4
-rw-r--r--Omni/Auth.hs (renamed from Biz/Auth.hs)4
-rw-r--r--Omni/Bild.hs (renamed from Biz/Bild.hs)54
-rw-r--r--Omni/Bild.nix (renamed from Biz/Bild.nix)20
-rw-r--r--Omni/Bild/Builder.nix (renamed from Biz/Bild/Builder.nix)2
-rw-r--r--Omni/Bild/CcacheWrapper.nix (renamed from Biz/Bild/CcacheWrapper.nix)0
-rw-r--r--Omni/Bild/Constants.nix (renamed from Biz/Bild/Constants.nix)0
-rw-r--r--Omni/Bild/Deps.hs (renamed from Biz/Bild/Deps.hs)6
-rw-r--r--Omni/Bild/Deps.nix (renamed from Biz/Bild/Deps.nix)0
-rw-r--r--Omni/Bild/Deps/C.nix (renamed from Biz/Bild/Deps/C.nix)0
-rw-r--r--Omni/Bild/Deps/Haskell.nix (renamed from Biz/Bild/Deps/Haskell.nix)0
-rw-r--r--Omni/Bild/Deps/Python.nix (renamed from Biz/Bild/Deps/Python.nix)0
-rw-r--r--Omni/Bild/Deps/accelerate.nix (renamed from Biz/Bild/Deps/accelerate.nix)0
-rw-r--r--Omni/Bild/Deps/bitsandbytes.nix (renamed from Biz/Bild/Deps/bitsandbytes.nix)0
-rw-r--r--Omni/Bild/Deps/guile-opengl.nix (renamed from Biz/Bild/Deps/guile-opengl.nix)0
-rw-r--r--Omni/Bild/Deps/inspekt3d.nix (renamed from Biz/Bild/Deps/inspekt3d.nix)0
-rw-r--r--Omni/Bild/Deps/interegular.nix (renamed from Biz/Bild/Deps/interegular.nix)0
-rw-r--r--Omni/Bild/Deps/lion-pytorch.nix (renamed from Biz/Bild/Deps/lion-pytorch.nix)0
-rw-r--r--Omni/Bild/Deps/llm-ollama.nix (renamed from Biz/Bild/Deps/llm-ollama.nix)0
-rw-r--r--Omni/Bild/Deps/llm-sentence-transformers.nix (renamed from Biz/Bild/Deps/llm-sentence-transformers.nix)0
-rw-r--r--Omni/Bild/Deps/nostr-rs-relay.nix (renamed from Biz/Bild/Deps/nostr-rs-relay.nix)0
-rw-r--r--Omni/Bild/Deps/outlines.nix (renamed from Biz/Bild/Deps/outlines.nix)0
-rw-r--r--Omni/Bild/Deps/perscache.nix (renamed from Biz/Bild/Deps/perscache.nix)0
-rw-r--r--Omni/Bild/Example.c (renamed from Biz/Bild/Example.c)2
-rw-r--r--Omni/Bild/Example.hs (renamed from Biz/Bild/Example.hs)8
-rw-r--r--Omni/Bild/Example.lisp (renamed from Biz/Bild/Example.lisp)0
-rw-r--r--Omni/Bild/Example.py (renamed from Biz/Bild/Example.py)0
-rw-r--r--Omni/Bild/Example.rs (renamed from Biz/Bild/Example.rs)0
-rw-r--r--Omni/Bild/Functions.nix (renamed from Biz/Bild/Functions.nix)0
-rw-r--r--Omni/Bild/Haskell.nix (renamed from Biz/Bild/Haskell.nix)0
-rw-r--r--Omni/Bild/Meta.hs (renamed from Biz/Bild/Meta.hs)2
-rw-r--r--Omni/Bild/Nixpkgs.nix (renamed from Biz/Bild/Nixpkgs.nix)0
-rw-r--r--Omni/Bild/Python.nix (renamed from Biz/Bild/Python.nix)0
-rw-r--r--Omni/Bild/Sources.json (renamed from Biz/Bild/Sources.json)0
-rw-r--r--Omni/Bild/Sources.nix (renamed from Biz/Bild/Sources.nix)0
-rw-r--r--Omni/Bot.nix (renamed from Biz/Bot.nix)22
-rwxr-xr-xOmni/Bot.scm (renamed from Biz/Bot.scm)10
-rwxr-xr-xOmni/Ci.sh (renamed from Biz/Ci.sh)2
-rw-r--r--Omni/Cli.hs (renamed from Biz/Cli.hs)4
-rw-r--r--Omni/Cloud.nix (renamed from Biz/Cloud.nix)0
-rw-r--r--Omni/Cloud/Chat.nix (renamed from Biz/Cloud/Chat.nix)0
-rw-r--r--Omni/Cloud/Comms.nix (renamed from Biz/Cloud/Comms.nix)0
-rw-r--r--Omni/Cloud/Comms/Coturn.nix (renamed from Biz/Cloud/Comms/Coturn.nix)0
-rw-r--r--Omni/Cloud/Comms/Jitsi.nix (renamed from Biz/Cloud/Comms/Jitsi.nix)0
-rw-r--r--Omni/Cloud/Comms/Mumble.nix (renamed from Biz/Cloud/Comms/Mumble.nix)0
-rw-r--r--Omni/Cloud/Comms/Xmpp.nix (renamed from Biz/Cloud/Comms/Xmpp.nix)0
-rw-r--r--Omni/Cloud/Git.nix (renamed from Biz/Cloud/Git.nix)0
-rw-r--r--Omni/Cloud/Gmnisrv.nix (renamed from Biz/Cloud/Gmnisrv.nix)0
-rw-r--r--Omni/Cloud/Grocy.nix (renamed from Biz/Cloud/Grocy.nix)0
-rw-r--r--Omni/Cloud/Hardware.nix (renamed from Biz/Cloud/Hardware.nix)0
-rw-r--r--Omni/Cloud/Hub.nix (renamed from Biz/Cloud/Hub.nix)0
-rw-r--r--Omni/Cloud/Mail.nix (renamed from Biz/Cloud/Mail.nix)0
-rw-r--r--Omni/Cloud/Networking.nix (renamed from Biz/Cloud/Networking.nix)0
-rw-r--r--Omni/Cloud/NostrRelay.nix (renamed from Biz/Cloud/NostrRelay.nix)0
-rw-r--r--Omni/Cloud/Ports.nix (renamed from Biz/Cloud/Ports.nix)0
-rw-r--r--Omni/Cloud/Web.nix (renamed from Biz/Cloud/Web.nix)0
-rw-r--r--Omni/Cloud/Znc.nix (renamed from Biz/Cloud/Znc.nix)0
-rwxr-xr-xOmni/Cloud/post-receive.sh (renamed from Biz/Cloud/post-receive.sh)4
-rw-r--r--Omni/Dev/Beryllium.nix (renamed from Biz/Dev/Beryllium.nix)0
-rw-r--r--Omni/Dev/Beryllium/Configuration.nix (renamed from Biz/Dev/Beryllium/Configuration.nix)0
-rw-r--r--Omni/Dev/Beryllium/Hardware.nix (renamed from Biz/Dev/Beryllium/Hardware.nix)0
-rw-r--r--Omni/Dev/Beryllium/Ollama.nix (renamed from Biz/Dev/Beryllium/Ollama.nix)0
-rw-r--r--Omni/Dev/Dns.nix (renamed from Biz/Dev/Dns.nix)0
-rw-r--r--Omni/Dev/Guix.nix (renamed from Biz/Dev/Guix.nix)0
-rw-r--r--Omni/Dev/Hoogle.nix (renamed from Biz/Dev/Hoogle.nix)0
-rw-r--r--Omni/Dev/Lithium.nix (renamed from Biz/Dev/Lithium.nix)4
-rw-r--r--Omni/Dev/Lithium/Configuration.nix (renamed from Biz/Dev/Lithium/Configuration.nix)0
-rw-r--r--Omni/Dev/Lithium/Hardware.nix (renamed from Biz/Dev/Lithium/Hardware.nix)0
-rw-r--r--Omni/Dev/Networking.nix (renamed from Biz/Dev/Networking.nix)0
-rw-r--r--Omni/Dev/Vpn.nix (renamed from Biz/Dev/Vpn.nix)0
-rw-r--r--Omni/Id.hs (renamed from Biz/Id.hs)2
-rwxr-xr-xOmni/Ide/MakeTags.py (renamed from Biz/Ide/MakeTags.py)0
-rwxr-xr-xOmni/Ide/ftags.sh (renamed from Biz/Ide/ftags.sh)0
-rwxr-xr-xOmni/Ide/hoog.sh (renamed from Biz/Ide/hoog.sh)0
-rwxr-xr-xOmni/Ide/hooks/commit-msg (renamed from Biz/Ide/hooks/commit-msg)0
-rwxr-xr-xOmni/Ide/hooks/post-applypatch (renamed from Biz/Ide/hooks/post-applypatch)0
-rwxr-xr-xOmni/Ide/hooks/post-checkout (renamed from Biz/Ide/hooks/post-checkout)2
-rwxr-xr-xOmni/Ide/hooks/post-commit (renamed from Biz/Ide/hooks/post-commit)0
-rwxr-xr-xOmni/Ide/hooks/post-merge (renamed from Biz/Ide/hooks/post-merge)2
-rwxr-xr-xOmni/Ide/hooks/post-rewrite (renamed from Biz/Ide/hooks/post-rewrite)0
-rwxr-xr-xOmni/Ide/hooks/pre-auto-gc (renamed from Biz/Ide/hooks/pre-auto-gc)0
-rwxr-xr-xOmni/Ide/hooks/pre-commit (renamed from Biz/Ide/hooks/pre-commit)2
-rwxr-xr-xOmni/Ide/hooks/pre-push (renamed from Biz/Ide/hooks/pre-push)0
-rwxr-xr-xOmni/Ide/hooks/reference-transaction (renamed from Biz/Ide/hooks/reference-transaction)0
-rwxr-xr-xOmni/Ide/ns.sh (renamed from Biz/Ide/ns.sh)0
-rwxr-xr-xOmni/Ide/push.sh (renamed from Biz/Ide/push.sh)0
-rwxr-xr-xOmni/Ide/repl.sh (renamed from Biz/Ide/repl.sh)4
-rwxr-xr-xOmni/Ide/run.sh (renamed from Biz/Ide/run.sh)0
-rwxr-xr-xOmni/Ide/ship.sh (renamed from Biz/Ide/ship.sh)0
-rwxr-xr-xOmni/Ide/tips.sh (renamed from Biz/Ide/tips.sh)2
-rwxr-xr-xOmni/Ide/version.sh (renamed from Biz/Ide/version.sh)0
-rw-r--r--Omni/Keys/Ben.pub (renamed from Biz/Keys/Ben.pub)0
-rw-r--r--Omni/Keys/Deploy.pub (renamed from Biz/Keys/Deploy.pub)0
-rw-r--r--Omni/Keys/Dre.pub (renamed from Biz/Keys/Dre.pub)0
-rw-r--r--Omni/Keys/Nick.pub (renamed from Biz/Keys/Nick.pub)0
-rw-r--r--Omni/Lint.hs (renamed from Biz/Lint.hs)18
-rw-r--r--Omni/Llamacpp.py (renamed from Biz/Llamacpp.py)0
-rw-r--r--Omni/Log.hs (renamed from Biz/Log.hs)6
-rw-r--r--Omni/Log.py (renamed from Biz/Log.py)2
-rw-r--r--Omni/Look.hs (renamed from Biz/Look.hs)2
-rw-r--r--Omni/Namespace.hs (renamed from Biz/Namespace.hs)6
-rw-r--r--Omni/OsBase.nix (renamed from Biz/OsBase.nix)0
-rw-r--r--Omni/Packages.nix (renamed from Biz/Packages.nix)0
-rw-r--r--Omni/Repl.py (renamed from Biz/Repl.py)8
-rwxr-xr-xOmni/Sentry.sh (renamed from Biz/Sentry.sh)0
-rw-r--r--Omni/Test.hs (renamed from Biz/Test.hs)4
-rw-r--r--Omni/Users.nix (renamed from Biz/Users.nix)0
-rw-r--r--Omni/Wipbase.c (renamed from Biz/Wipbase.c)0
-rw-r--r--README.md43
-rw-r--r--default.nix4
-rw-r--r--shell.nix2
119 files changed, 206 insertions, 198 deletions
diff --git a/.envrc b/.envrc
index 7e9583e..f342995 100644
--- a/.envrc
+++ b/.envrc
@@ -7,8 +7,8 @@
# watch some files that effect the dev environment
# watch_file shell.nix
# watch_file default.nix
-# watch_file Biz/Bild.nix
-# watch_file Biz/Bild.hs
+# watch_file Omni/Bild.nix
+# watch_file Omni/Bild.hs
# if direnv doesn't detect changes to the nix environment, just touch .envrc and
# it will refresh
use nix
@@ -17,7 +17,7 @@
export COLUMNS
#
# scripts for editing go here
- PATH_add $CODEROOT/Biz/Ide
+ PATH_add $CODEROOT/Omni/Ide
#
# executable bild outputs go here
PATH_add $CODEROOT/_/bin
@@ -40,15 +40,15 @@
fi
#
# configure git
- git config --local core.hooksPath "$CODEROOT/Biz/Ide/hooks"
+ git config --local core.hooksPath "$CODEROOT/Omni/Ide/hooks"
git config --local notes.displayRef refs/notes/ci
git config --local remotes.origin.fetch +refs/notes/*:refs/notes/* notes
git config --local branchless.test.strategy worktree
git config --local branchless.test.alias.default 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild --test **/*'
git config --local branchless.test.alias.bild 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild **/*'
- git config --local branchless.test.alias.lint 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild Biz/Lint.hs; lint **/*'
- git config --local branchless.test.alias.lintfix 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild Biz/Lint.hs; lint --fix **/*'
- git config --local branchless.test.alias.ci 'export CI=1; git clean -ffdx; eval $(direnv export bash); Biz/Ci.sh'
+ git config --local branchless.test.alias.lint 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild Omni/Lint.hs; lint **/*'
+ git config --local branchless.test.alias.lintfix 'export CI=1; git clean -ffdx; eval $(direnv export bash); bild Omni/Lint.hs; lint --fix **/*'
+ git config --local branchless.test.alias.ci 'export CI=1; git clean -ffdx; eval $(direnv export bash); Omni/Ci.sh'
#
# end here if we are in CI
[[ -n "CI" ]] && exit 0
@@ -56,7 +56,7 @@
# create third-party tags
[[ -L "$CODEROOT"/_/src/.ctags.d ]] || ln -s "$CODEROOT"/.ctags.d "$CODEROOT"/_/src/.ctags.d
function MakeExternalTags {
- "$CODEROOT"/Biz/Ide/MakeTags.py --external $(tr ':' '\n' <<< "$ALL_SOURCES")
+ "$CODEROOT"/Omni/Ide/MakeTags.py --external $(tr ':' '\n' <<< "$ALL_SOURCES")
}
hashfile="$CODEROOT"/_/src/hash
curhash=$(cat "$hashfile")
diff --git a/.vimrc b/.vimrc
index 51ab588..c4591aa 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,12 +1,12 @@
" requires: https://github.com/MarcWeber/vim-addon-local-vimrc
augroup tags
-au BufWritePost *.hs silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.hsc silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.lhs silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.py silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.rs silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.c silent !$CODEROOT/Biz/Ide/MakeTags.py %
-au BufWritePost *.scm silent !$CODEROOT/Biz/Ide/MakeTags.py %
+au BufWritePost *.hs silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.hsc silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.lhs silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.py silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.rs silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.c silent !$CODEROOT/Omni/Ide/MakeTags.py %
+au BufWritePost *.scm silent !$CODEROOT/Omni/Ide/MakeTags.py %
augroup END
setl tags=$CODEROOT/tags,$CODEROOT/_/src/tags
diff --git a/Biz/Dragons.hs b/Biz/Dragons.hs
index 4497f8e..3379732 100644
--- a/Biz/Dragons.hs
+++ b/Biz/Dragons.hs
@@ -31,16 +31,8 @@ module Biz.Dragons
where
import Alpha hiding (rem, (<.>))
-import qualified Biz.App as App
-import qualified Biz.Auth as Auth
-import qualified Biz.Cli as Cli
import Biz.Dragons.Analysis (Analysis (..), Commit (..))
import qualified Biz.Dragons.Analysis as Analysis
-import qualified Biz.Id as Id
-import qualified Biz.Log as Log
-import qualified Biz.Look
-import Biz.Test ((@=?), (@?!=), (@?=))
-import qualified Biz.Test as Test
import qualified CMark as Cmark
import qualified CMark.Lucid as Cmark
import Clay (em, pct, px, rem, sec, (?))
@@ -76,6 +68,14 @@ import qualified Lucid.Servant as Lucid
import NeatInterpolation
import qualified Network.Wai as Wai
import qualified Network.Wai.Handler.Warp as Warp
+import qualified Omni.App as App
+import qualified Omni.Auth as Auth
+import qualified Omni.Cli as Cli
+import qualified Omni.Id as Id
+import qualified Omni.Log as Log
+import qualified Omni.Look
+import Omni.Test ((@=?), (@?!=), (@?=))
+import qualified Omni.Test as Test
import Servant
import qualified Servant.Auth as Auth
import qualified Servant.Auth.Server as Auth
@@ -287,45 +287,45 @@ instance Indexable Analysis where
instance App.HasCss AnalysisAction where
cssFor _ = do
"#analysis > *" ? do
- Biz.Look.marginAll (rem 2)
+ Omni.Look.marginAll (rem 2)
".score" ? do
Clay.display Clay.grid
- Biz.Look.gridTemplateAreas
+ Omni.Look.gridTemplateAreas
[ "title quantity details-collapsed",
"preview-chart preview-chart preview-chart",
"details details details"
]
Clay.alignItems Clay.baseline
Clay.gridTemplateColumns [pct 30, 40, 30]
- Biz.Look.gridTemplateRows ["auto"]
+ Omni.Look.gridTemplateRows ["auto"]
".title" ? do
- Biz.Look.gridArea "title"
+ Omni.Look.gridArea "title"
Clay.fontSize (rem 1.4)
Clay.lineHeight (rem 2.4)
".percentage" ? do
- Biz.Look.gridArea "quantity"
+ Omni.Look.gridArea "quantity"
Clay.display Clay.flex
Clay.alignItems Clay.baseline
".centum" ? do
Clay.fontSize (rem 1.2)
Clay.lineHeight (rem 1.2)
".quantity" ? do
- Biz.Look.gridArea "quantity"
+ Omni.Look.gridArea "quantity"
Clay.fontSize (rem 3)
Clay.lineHeight (rem 3)
".preview-chart" ? do
- Biz.Look.gridArea "preview-chart"
+ Omni.Look.gridArea "preview-chart"
"details" ? do
- Biz.Look.gridArea "details-collapsed"
- Biz.Look.justifySelf <| Clay.JustifyContentValue "self-end"
+ Omni.Look.gridArea "details-collapsed"
+ Omni.Look.justifySelf <| Clay.JustifyContentValue "self-end"
"details[open]" ? do
- Biz.Look.gridArea "details"
- Biz.Look.justifySelf <| Clay.JustifyContentValue "auto"
+ Omni.Look.gridArea "details"
+ Omni.Look.justifySelf <| Clay.JustifyContentValue "auto"
".preview-chart" ? do
Clay.height (px 2)
Clay.maxWidth (pct 100)
"table" ? do
- Biz.Look.marginAll (px 0)
+ Omni.Look.marginAll (px 0)
Clay.maxWidth (pct 100)
"#hotspots" ? do
".preview-chart" ? do
@@ -1098,9 +1098,9 @@ htmlApp jwtCfg cooks kp cfg oAuthArgs =
baseStyle :: Clay.Css
baseStyle = do
- Biz.Look.fuckingStyle
+ Omni.Look.fuckingStyle
- Biz.Look.whenDark <| do
+ Omni.Look.whenDark <| do
"body" ? do
Clay.backgroundColor black
"a:link" <> "a:visited" ? do
@@ -1112,7 +1112,7 @@ baseStyle = do
Clay.backgroundColor black
Clay.color Clay.white
- Biz.Look.whenLight <| do
+ Omni.Look.whenLight <| do
"body" ? do
Clay.color black
"a:link" <> "a:visited" ? do
@@ -1124,7 +1124,7 @@ baseStyle = do
Clay.backgroundColor Clay.white
Clay.color black
- "body" ? Biz.Look.fontStack
+ "body" ? Omni.Look.fontStack
"header" ? do
Clay.maxWidth (pct 100)
"footer" ? do
@@ -1140,17 +1140,17 @@ baseStyle = do
"text-decoration-width"
]
Clay.textDecoration Clay.underline
- Biz.Look.textDecorationThickness (em 0.1)
- Biz.Look.textDecorationWidth (em 0.1)
+ Omni.Look.textDecorationThickness (em 0.1)
+ Omni.Look.textDecorationWidth (em 0.1)
"a:hover" <> "input.link" ? do
Clay.textDecorationColor yellow
Clay.textDecoration Clay.underline
- Biz.Look.textDecorationThickness (em 0.2)
- Biz.Look.textDecorationWidth (em 0.2)
+ Omni.Look.textDecorationThickness (em 0.2)
+ Omni.Look.textDecorationWidth (em 0.2)
"select" <> "button" <> "input" ? do
- Biz.Look.paddingAll (em 0.5)
- Biz.Look.marginX (em 0.5)
+ Omni.Look.paddingAll (em 0.5)
+ Omni.Look.marginX (em 0.5)
Clay.borderColor yellow
Clay.borderStyle Clay.solid
@@ -1159,18 +1159,18 @@ baseStyle = do
Clay.cursor Clay.pointer
Clay.borderWidth 0
Clay.fontSize (rem 1)
- Biz.Look.marginAll (px 0)
- Biz.Look.paddingAll (px 0)
+ Omni.Look.marginAll (px 0)
+ Omni.Look.paddingAll (px 0)
".badge" ? do
Clay.borderWidth (px 1)
Clay.borderColor Clay.grey
Clay.borderStyle Clay.solid
- Biz.Look.borderRadiusAll (rem 2)
+ Omni.Look.borderRadiusAll (rem 2)
Clay.fontSize (rem 0.8)
- Biz.Look.marginAll (rem 1)
- Biz.Look.paddingX (rem 0.5)
- Biz.Look.paddingY (rem 0.25)
+ Omni.Look.marginAll (rem 1)
+ Omni.Look.paddingX (rem 0.5)
+ Omni.Look.paddingY (rem 0.25)
"label" ? do
Clay.display Clay.inlineBlock
@@ -1245,9 +1245,9 @@ instance App.HasCss Home where
Clay.borderStyle Clay.solid
Clay.borderWidth (px 2)
Clay.borderColor "#aaa"
- Biz.Look.borderRadiusAll (px 10)
- Biz.Look.paddingX (em 2)
- Biz.Look.paddingY (em 1)
+ Omni.Look.borderRadiusAll (px 10)
+ Omni.Look.paddingX (em 2)
+ Omni.Look.paddingY (em 1)
maybe mempty App.cssFor mAnalysis
"section" ? do
Clay.padding (rem 3) 0 (rem 3) 0
@@ -1357,7 +1357,7 @@ instance Lucid.ToHtml Analyses where
Lucid.a_
[ href analysisId,
css
- <| Biz.Look.marginAll (em 1)
+ <| Omni.Look.marginAll (em 1)
<> Clay.textDecoration Clay.none
]
<| do
@@ -1374,7 +1374,7 @@ instance App.HasCss UserAccount where
cssFor (UserAccount _) = do
"ul.apikeys" ? do
Clay.listStyleType Clay.none
- Biz.Look.paddingAll (em 0)
+ Omni.Look.paddingAll (em 0)
"li" ? do
Clay.overflowX Clay.scroll
diff --git a/Biz/Dragons/Analysis.hs b/Biz/Dragons/Analysis.hs
index a946b4d..64b2906 100644
--- a/Biz/Dragons/Analysis.hs
+++ b/Biz/Dragons/Analysis.hs
@@ -21,9 +21,6 @@ module Biz.Dragons.Analysis
where
import Alpha
-import qualified Biz.Cli as Cli
-import Biz.Test ((@=?))
-import qualified Biz.Test as Test
import qualified Control.Concurrent.Async as Async
import qualified Data.Aeson as Aeson
import Data.Data (Data)
@@ -33,6 +30,9 @@ import qualified Data.String as String
import qualified Data.Text as Text
import qualified Data.Time.Clock as Time
import qualified Data.Time.Format as Time
+import qualified Omni.Cli as Cli
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
import qualified System.Directory as Directory
import qualified System.Process as Process
diff --git a/Biz/Que.nix b/Biz/Que.nix
index fc76758..9f1f098 100644
--- a/Biz/Que.nix
+++ b/Biz/Que.nix
@@ -3,8 +3,13 @@
# The production server for que.run
bild.os {
- imports =
- [ ./OsBase.nix ./Packages.nix ./Users.nix ./Que/Host.nix ./Que/Site.nix ];
+ imports = [
+ ../Omni/OsBase.nix
+ ../Omni/Packages.nix
+ ../Omni/Users.nix
+ ./Que/Host.nix
+ ./Que/Site.nix
+ ];
networking.hostName = "prod-que";
networking.domain = "que.run";
services.que-server = {
diff --git a/Biz/Que/Host.hs b/Biz/Que/Host.hs
index da424df..a908d5b 100644
--- a/Biz/Que/Host.hs
+++ b/Biz/Que/Host.hs
@@ -26,10 +26,6 @@ module Biz.Que.Host
where
import Alpha hiding (gets, modify, poll)
-import qualified Biz.Cli as Cli
-import qualified Biz.Log as Log
-import Biz.Test ((@=?))
-import qualified Biz.Test as Test
import qualified Control.Concurrent.Go as Go
import qualified Control.Concurrent.STM as STM
import qualified Control.Exception as Exception
@@ -37,6 +33,10 @@ import Data.HashMap.Lazy (HashMap)
import qualified Data.HashMap.Lazy as HashMap
import Network.HTTP.Media ((//), (/:))
import qualified Network.Wai.Handler.Warp as Warp
+import qualified Omni.Cli as Cli
+import qualified Omni.Log as Log
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
import Servant
import Servant.Server.Generic (AsServerT, genericServeT)
import qualified Servant.Types.SourceT as Source
diff --git a/Biz/Que/Site.hs b/Biz/Que/Site.hs
index 7151cd0..963927d 100644
--- a/Biz/Que/Site.hs
+++ b/Biz/Que/Site.hs
@@ -13,15 +13,15 @@ module Biz.Que.Site
where
import Alpha
-import qualified Biz.Cli as Cli
-import Biz.Test ((@=?))
-import qualified Biz.Test as Test
import qualified Control.Concurrent.Async as Async
import qualified Data.ByteString.Char8 as BS
import qualified Data.Ini.Config as Config
import qualified Data.Text as Text
import qualified Data.Text.IO as Text
import Network.HTTP.Req
+import qualified Omni.Cli as Cli
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
import qualified System.Directory as Directory
import System.FilePath ((</>))
import qualified System.Process as Process
diff --git a/Control/Concurrent/Go.hs b/Control/Concurrent/Go.hs
index a5eb2b7..9a2fec1 100644
--- a/Control/Concurrent/Go.hs
+++ b/Control/Concurrent/Go.hs
@@ -32,12 +32,12 @@ module Control.Concurrent.Go
where
import Alpha
-import qualified Biz.Cli as Cli
-import Biz.Test ((@?=))
-import qualified Biz.Test as Test
import qualified Control.Concurrent as Concurrent
import qualified Control.Concurrent.Chan.Unagi.Bounded as Chan
import qualified Data.Aeson as Aeson
+import qualified Omni.Cli as Cli
+import Omni.Test ((@?=))
+import qualified Omni.Test as Test
import qualified System.IO.Unsafe as Unsafe
main :: IO ()
diff --git a/Biz/App.hs b/Omni/App.hs
index 317a163..38ce91b 100644
--- a/Biz/App.hs
+++ b/Omni/App.hs
@@ -4,7 +4,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
-- | General utils for apps
-module Biz.App
+module Omni.App
( Area (..),
CSS (..),
HasCss (..),
@@ -60,7 +60,7 @@ instance ToJSON Manifest
-- | A wrapper for an HTML page. You need to provide an orphan
-- 'Lucid.Base.ToHtml' instance in the web module of your app.
--
--- Ideally this would be captured in a Biz.App type, with overrides for head
+-- Ideally this would be captured in a Omni.App type, with overrides for head
-- elements, and we would wouldn't have to make the same basic orphan instance
-- for each app.
newtype Html a = Html a
diff --git a/Biz/Auth.hs b/Omni/Auth.hs
index 73022d7..0f1cb66 100644
--- a/Biz/Auth.hs
+++ b/Omni/Auth.hs
@@ -7,7 +7,7 @@
-- | A module for common OAuth flows.
--
-- Consider using authenticate-oauth package
-module Biz.Auth
+module Omni.Auth
( -- * OAuth
OAuthResponse (..),
OAuthArgs (..),
@@ -75,7 +75,7 @@ instance Envy.DefConfig OAuthArgs where
instance Envy.FromEnv OAuthArgs
-- | A type for parsing JSON auth responses, used in 'githubOauth' below.
--- Should be moved to Biz.Auth with others.
+-- Should be moved to Omni.Auth with others.
data OAuthResponse = OAuthResponse
{ access_token :: Text,
scope :: Text,
diff --git a/Biz/Bild.hs b/Omni/Bild.hs
index cb3fe16..60253c0 100644
--- a/Biz/Bild.hs
+++ b/Omni/Bild.hs
@@ -113,16 +113,9 @@
-- Local module deps are included by just giving the repo root to the underlying
-- compiler for the target, and the compiler does the work of walking the source
-- tree.
-module Biz.Bild where
+module Omni.Bild where
import Alpha hiding (sym, (<.>))
-import qualified Biz.Bild.Meta as Meta
-import qualified Biz.Cli as Cli
-import qualified Biz.Log as Log
-import Biz.Namespace (Namespace (..))
-import qualified Biz.Namespace as Namespace
-import Biz.Test ((@=?))
-import qualified Biz.Test as Test
import qualified Conduit
import qualified Control.Concurrent.Async as Async
import qualified Data.Aeson as Aeson
@@ -142,6 +135,13 @@ import qualified Data.Text as Text
import qualified Data.Text.IO as Text.IO
import qualified GHC.Conc as GHC
import qualified Network.HostName as HostName
+import qualified Omni.Bild.Meta as Meta
+import qualified Omni.Cli as Cli
+import qualified Omni.Log as Log
+import Omni.Namespace (Namespace (..))
+import qualified Omni.Namespace as Namespace
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
import qualified System.Directory as Dir
import qualified System.Environment as Env
import qualified System.Exit as Exit
@@ -157,7 +157,7 @@ main = Cli.Plan help move test_ pure |> Cli.main
where
test_ =
Test.group
- "Biz.Bild"
+ "Omni.Bild"
[ test_bildBild,
test_bildExamples,
test_isGitIgnored,
@@ -169,7 +169,7 @@ test_bildBild :: Test.Tree
test_bildBild =
Test.unit "can bild bild" <| do
root <- Env.getEnv "CODEROOT"
- path <- Dir.makeAbsolute "Biz/Bild.hs"
+ path <- Dir.makeAbsolute "Omni/Bild.hs"
case Namespace.fromPath root path of
Nothing -> Test.assertFailure "can't find ns for bild"
Just ns ->
@@ -186,7 +186,7 @@ test_bildExamples =
Test.unit "can bild examples" <| do
Env.getEnv "CODEROOT" +> \root ->
["c", "hs", "lisp", "rs"]
- |> map ("Biz/Bild/Example." <>)
+ |> map ("Omni/Bild/Example." <>)
|> traverse Dir.makeAbsolute
/> map (Namespace.fromPath root)
/> catMaybes
@@ -275,13 +275,13 @@ test_isGitIgnored =
res <- isGitIgnored "_"
res @=? True,
Test.unit "filters many" <| do
- traverse isGitIgnored ["Biz/Bild.hs", "TAGS"]
+ traverse isGitIgnored ["Omni/Bild.hs", "TAGS"]
+> (@=? [False, True])
]
isGitHook :: FilePath -> Bool
isGitHook path =
- "Biz/Ide/hooks" `List.isInfixOf` path
+ "Omni/Ide/hooks" `List.isInfixOf` path
test_isGitHook :: Test.Tree
test_isGitHook =
@@ -289,10 +289,10 @@ test_isGitHook =
"isGitHook"
[ Test.unit "filters pre-commit hook" <| do
root <- Env.getEnv "CODEROOT"
- True @=? (isGitHook <| root <> "/Biz/Ide/hooks/pre-commit"),
+ True @=? (isGitHook <| root <> "/Omni/Ide/hooks/pre-commit"),
Test.unit "doesn't filter non-hooks" <| do
root <- Env.getEnv "CODEROOT"
- False @=? (isGitHook <| root <> "/Biz/Bild.hs")
+ False @=? (isGitHook <| root <> "/Omni/Bild.hs")
]
namespaceFromPathOrDie :: FilePath -> FilePath -> IO Namespace
@@ -462,10 +462,10 @@ isBuildableNs = \case
nixTargets =
[ ["Biz", "Pie"],
["Biz", "Que"],
- ["Biz", "Cloud"],
- ["Biz", "Dev"],
- ["Biz", "Dev", "Lithium"],
- ["Biz", "Dev", "Beryllium"],
+ ["Omni", "Cloud"],
+ ["Omni", "Dev"],
+ ["Omni", "Dev", "Lithium"],
+ ["Omni", "Dev", "Beryllium"],
["Biz", "Dragons", "Analysis"]
]
@@ -686,7 +686,7 @@ analyze hmap ns = case Map.lookup ns hmap of
toNixFlag builder,
"--arg",
"bild",
- str <| "import " <> root </> "Biz/Bild.nix {}"
+ str <| "import " <> root </> "Omni/Bild.nix {}"
]
|> map Text.pack,
out = Meta.None,
@@ -855,11 +855,11 @@ test_detectPythonImports =
Test.group
"detectPythonImports"
[ Test.unit "matches import statements" <| do
- set <- detectPythonImports ["import Biz.Log"]
- Set.fromList ["Biz/Log.py"] @=? set,
+ set <- detectPythonImports ["import Omni.Log"]
+ Set.fromList ["Omni/Log.py"] @=? set,
Test.unit "matches import as statements" <| do
- set <- detectPythonImports ["import Biz.Log as Log"]
- Set.fromList ["Biz/Log.py"] @=? set
+ set <- detectPythonImports ["import Omni.Log as Log"]
+ Set.fromList ["Omni/Log.py"] @=? set
]
ghcPkgFindModule :: Set String -> String -> IO (Set String)
@@ -1024,7 +1024,7 @@ puts src =
.| Conduit.iterM (liftIO <. putStr)
.| Conduit.foldC
--- | Like 'puts' but logs the output via 'Biz.Log'.
+-- | Like 'puts' but logs the output via 'Omni.Log'.
logs ::
Namespace ->
Conduit.ConduitT () ByteString (Conduit.ResourceT IO) () ->
@@ -1101,8 +1101,8 @@ nixBuild loud maxJobs cores target@(Target {..}) =
-- way around that, methinks.
args =
[ ["--argstr", "analysisJSON", str <| Aeson.encode <| (Map.singleton namespace target :: Analysis)],
- ["--arg", "bild", str <| "import " <> root </> "Biz/Bild.nix {}"],
- [str <| root </> "Biz/Bild/Builder.nix"]
+ ["--arg", "bild", str <| "import " <> root </> "Omni/Bild.nix {}"],
+ [str <| root </> "Omni/Bild/Builder.nix"]
]
|> mconcat
|> map Text.unpack,
diff --git a/Biz/Bild.nix b/Omni/Bild.nix
index e52fa24..1a31e1e 100644
--- a/Biz/Bild.nix
+++ b/Omni/Bild.nix
@@ -74,7 +74,7 @@ let
tasty-quickcheck
text
hostname
- wai # can remove when removed from Biz.Log
+ wai # can remove when removed from Omni.Log
]);
};
@@ -111,12 +111,12 @@ let
root = ../.;
fileset = self.lib.fileset.unions [
../Alpha.hs
- ../Biz/Bild.hs
- ../Biz/Bild/Meta.hs
- ../Biz/Cli.hs
- ../Biz/Log.hs
- ../Biz/Namespace.hs
- ../Biz/Test.hs
+ ../Omni/Bild.hs
+ ../Omni/Bild/Meta.hs
+ ../Omni/Cli.hs
+ ../Omni/Log.hs
+ ../Omni/Namespace.hs
+ ../Omni/Test.hs
];
};
nativeBuildInputs = [ self.haskell.ghcPackageSetBild ];
@@ -146,8 +146,8 @@ let
-Winvalid-haddock \
-haddock \
-i. \
- --make Biz/Bild.hs \
- -main-is Biz.Bild \
+ --make Omni/Bild.hs \
+ -main-is Omni.Bild \
-o $out/bin/bild
'';
installPhase = ''
@@ -198,7 +198,7 @@ let
# the main development environment
env = stable.mkShell {
- name = "bizdev";
+ name = "omnidev";
# this should just be dev tools
buildInputs = with self.pkgs; [
bat
diff --git a/Biz/Bild/Builder.nix b/Omni/Bild/Builder.nix
index df5aeba..a78f311 100644
--- a/Biz/Bild/Builder.nix
+++ b/Omni/Bild/Builder.nix
@@ -148,7 +148,7 @@ let
name="${name}",
entry_points={"console_scripts":["${name} = ${mainModule}:main"]},
version="0.0.0",
- url="git://simatime.com/biz.git",
+ url="git://simatime.com/omni.git",
author="dev",
author_email="dev@simatime.com",
description="nil",
diff --git a/Biz/Bild/CcacheWrapper.nix b/Omni/Bild/CcacheWrapper.nix
index 78e5a08..78e5a08 100644
--- a/Biz/Bild/CcacheWrapper.nix
+++ b/Omni/Bild/CcacheWrapper.nix
diff --git a/Biz/Bild/Constants.nix b/Omni/Bild/Constants.nix
index 20c992e..20c992e 100644
--- a/Biz/Bild/Constants.nix
+++ b/Omni/Bild/Constants.nix
diff --git a/Biz/Bild/Deps.hs b/Omni/Bild/Deps.hs
index e268a74..c2fe53f 100644
--- a/Biz/Bild/Deps.hs
+++ b/Omni/Bild/Deps.hs
@@ -8,7 +8,7 @@
-- | A specific-purpose dependency manager.
--
-- : out deps
-module Biz.Bild.Deps where
+module Omni.Bild.Deps where
import Alpha hiding (map, packageName, str, tshow)
import Data.Aeson ((.=))
@@ -48,7 +48,7 @@ getFindSourcesJson :: NIO FindSourcesJson
-- getFindSourcesJson = ask
getFindSourcesJson = do
root <- li <| getEnv "CODEROOT"
- pure <| AtPath <| root </> "Biz/Bild/Sources.json"
+ pure <| AtPath <| root </> "Omni/Bild/Sources.json"
li :: (MonadIO io) => IO a -> io a
li = liftIO
@@ -83,7 +83,7 @@ cli args = do
( Opts.long "sources-file"
<> Opts.short 's'
<> Opts.metavar "FILE"
- <> Opts.help "Use FILE instead of Biz/Bild/Sources.json"
+ <> Opts.help "Use FILE instead of Omni/Bild/Sources.json"
)
<|> pure Auto
parseColors =
diff --git a/Biz/Bild/Deps.nix b/Omni/Bild/Deps.nix
index 9ba0b31..9ba0b31 100644
--- a/Biz/Bild/Deps.nix
+++ b/Omni/Bild/Deps.nix
diff --git a/Biz/Bild/Deps/C.nix b/Omni/Bild/Deps/C.nix
index 3f670cd..3f670cd 100644
--- a/Biz/Bild/Deps/C.nix
+++ b/Omni/Bild/Deps/C.nix
diff --git a/Biz/Bild/Deps/Haskell.nix b/Omni/Bild/Deps/Haskell.nix
index 04f3a74..04f3a74 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Omni/Bild/Deps/Haskell.nix
diff --git a/Biz/Bild/Deps/Python.nix b/Omni/Bild/Deps/Python.nix
index b0b2465..b0b2465 100644
--- a/Biz/Bild/Deps/Python.nix
+++ b/Omni/Bild/Deps/Python.nix
diff --git a/Biz/Bild/Deps/accelerate.nix b/Omni/Bild/Deps/accelerate.nix
index be1d2fd..be1d2fd 100644
--- a/Biz/Bild/Deps/accelerate.nix
+++ b/Omni/Bild/Deps/accelerate.nix
diff --git a/Biz/Bild/Deps/bitsandbytes.nix b/Omni/Bild/Deps/bitsandbytes.nix
index eb32aac..eb32aac 100644
--- a/Biz/Bild/Deps/bitsandbytes.nix
+++ b/Omni/Bild/Deps/bitsandbytes.nix
diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Omni/Bild/Deps/guile-opengl.nix
index af01082..af01082 100644
--- a/Biz/Bild/Deps/guile-opengl.nix
+++ b/Omni/Bild/Deps/guile-opengl.nix
diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Omni/Bild/Deps/inspekt3d.nix
index 3146350..3146350 100644
--- a/Biz/Bild/Deps/inspekt3d.nix
+++ b/Omni/Bild/Deps/inspekt3d.nix
diff --git a/Biz/Bild/Deps/interegular.nix b/Omni/Bild/Deps/interegular.nix
index 24065d8..24065d8 100644
--- a/Biz/Bild/Deps/interegular.nix
+++ b/Omni/Bild/Deps/interegular.nix
diff --git a/Biz/Bild/Deps/lion-pytorch.nix b/Omni/Bild/Deps/lion-pytorch.nix
index 7b06e78..7b06e78 100644
--- a/Biz/Bild/Deps/lion-pytorch.nix
+++ b/Omni/Bild/Deps/lion-pytorch.nix
diff --git a/Biz/Bild/Deps/llm-ollama.nix b/Omni/Bild/Deps/llm-ollama.nix
index e2b6a66..e2b6a66 100644
--- a/Biz/Bild/Deps/llm-ollama.nix
+++ b/Omni/Bild/Deps/llm-ollama.nix
diff --git a/Biz/Bild/Deps/llm-sentence-transformers.nix b/Omni/Bild/Deps/llm-sentence-transformers.nix
index 4d63c83..4d63c83 100644
--- a/Biz/Bild/Deps/llm-sentence-transformers.nix
+++ b/Omni/Bild/Deps/llm-sentence-transformers.nix
diff --git a/Biz/Bild/Deps/nostr-rs-relay.nix b/Omni/Bild/Deps/nostr-rs-relay.nix
index 0eef13f..0eef13f 100644
--- a/Biz/Bild/Deps/nostr-rs-relay.nix
+++ b/Omni/Bild/Deps/nostr-rs-relay.nix
diff --git a/Biz/Bild/Deps/outlines.nix b/Omni/Bild/Deps/outlines.nix
index 29ef41b..29ef41b 100644
--- a/Biz/Bild/Deps/outlines.nix
+++ b/Omni/Bild/Deps/outlines.nix
diff --git a/Biz/Bild/Deps/perscache.nix b/Omni/Bild/Deps/perscache.nix
index 508a261..508a261 100644
--- a/Biz/Bild/Deps/perscache.nix
+++ b/Omni/Bild/Deps/perscache.nix
diff --git a/Biz/Bild/Example.c b/Omni/Bild/Example.c
index 52ea9b9..2f4bfd4 100644
--- a/Biz/Bild/Example.c
+++ b/Omni/Bild/Example.c
@@ -10,6 +10,6 @@ main (void)
{
/* panic! the library couldn't be initialized; it is not safe to use */
}
- printf ("Biz/Bild/Example.c: Hello world!\n");
+ printf ("Omni/Bild/Example.c: Hello world!\n");
return 0;
}
diff --git a/Biz/Bild/Example.hs b/Omni/Bild/Example.hs
index 66812ba..025391c 100644
--- a/Biz/Bild/Example.hs
+++ b/Omni/Bild/Example.hs
@@ -2,7 +2,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
-- : out example
-module Biz.Bild.Example where
+module Omni.Bild.Example where
-- Both internal and external language dependencies are detected automatically
-- by bild, for example here we import 'Crypto.Saltine' and list 'saltine' in
@@ -10,10 +10,10 @@ module Biz.Bild.Example where
-- available to bild, which will index the external package and record its
-- modules for lookup.
import Alpha
-import qualified Biz.Cli as Cli
-import qualified Biz.Test as Test
import qualified Crypto.Saltine as Saltine
import qualified Crypto.Saltine.Core.SecretBox as Saltine
+import qualified Omni.Cli as Cli
+import qualified Omni.Test as Test
main :: IO ()
main = Cli.main <| Cli.Plan help move test pure
@@ -24,7 +24,7 @@ move _ = putStrLn "Hello world"
test :: Test.Tree
test =
Test.group
- "Biz.Bild.Example"
+ "Omni.Bild.Example"
[ Test.unit "can use saltine package" <| do
Saltine.sodiumInit
k <- Saltine.newKey
diff --git a/Biz/Bild/Example.lisp b/Omni/Bild/Example.lisp
index cdabe7c..cdabe7c 100644
--- a/Biz/Bild/Example.lisp
+++ b/Omni/Bild/Example.lisp
diff --git a/Biz/Bild/Example.py b/Omni/Bild/Example.py
index e5766ba..e5766ba 100644
--- a/Biz/Bild/Example.py
+++ b/Omni/Bild/Example.py
diff --git a/Biz/Bild/Example.rs b/Omni/Bild/Example.rs
index ba98dda..ba98dda 100644
--- a/Biz/Bild/Example.rs
+++ b/Omni/Bild/Example.rs
diff --git a/Biz/Bild/Functions.nix b/Omni/Bild/Functions.nix
index 8b87f86..8b87f86 100644
--- a/Biz/Bild/Functions.nix
+++ b/Omni/Bild/Functions.nix
diff --git a/Biz/Bild/Haskell.nix b/Omni/Bild/Haskell.nix
index c744848..c744848 100644
--- a/Biz/Bild/Haskell.nix
+++ b/Omni/Bild/Haskell.nix
diff --git a/Biz/Bild/Meta.hs b/Omni/Bild/Meta.hs
index 0025d94..44bcff0 100644
--- a/Biz/Bild/Meta.hs
+++ b/Omni/Bild/Meta.hs
@@ -3,7 +3,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
-- | Small module for extracting metadata from the comments of modules.
-module Biz.Bild.Meta where
+module Omni.Bild.Meta where
import Alpha
import qualified Data.Aeson as Aeson
diff --git a/Biz/Bild/Nixpkgs.nix b/Omni/Bild/Nixpkgs.nix
index 212e3f1..212e3f1 100644
--- a/Biz/Bild/Nixpkgs.nix
+++ b/Omni/Bild/Nixpkgs.nix
diff --git a/Biz/Bild/Python.nix b/Omni/Bild/Python.nix
index 6e4f390..6e4f390 100644
--- a/Biz/Bild/Python.nix
+++ b/Omni/Bild/Python.nix
diff --git a/Biz/Bild/Sources.json b/Omni/Bild/Sources.json
index 2939283..2939283 100644
--- a/Biz/Bild/Sources.json
+++ b/Omni/Bild/Sources.json
diff --git a/Biz/Bild/Sources.nix b/Omni/Bild/Sources.nix
index f7af81e..f7af81e 100644
--- a/Biz/Bild/Sources.nix
+++ b/Omni/Bild/Sources.nix
diff --git a/Biz/Bot.nix b/Omni/Bot.nix
index 3b7710b..934ad9c 100644
--- a/Biz/Bot.nix
+++ b/Omni/Bot.nix
@@ -1,12 +1,12 @@
{ options, lib, config, pkgs, ... }:
-let cfg = config.services.bizbot;
+let cfg = config.services.omnibot;
in {
options.services.bizbot = {
- enable = lib.mkEnableOption "Enable the bizbot service";
+ enable = lib.mkEnableOption "Enable the omnibot service";
package = lib.mkOption {
type = lib.types.package;
- description = "bizbot package to use";
+ description = "omnibot package to use";
};
server = lib.mkOption {
type = lib.types.str;
@@ -18,36 +18,36 @@ in {
};
dataDir = lib.mkOption {
type = lib.types.str;
- description = "where bizbot will start it's ii tree";
+ description = "where omnibot will start it's ii tree";
};
};
config = lib.mkIf cfg.enable {
systemd.services = {
- "bizbot-${cfg.server}-${cfg.channel}-ii" = {
+ "omnibot-${cfg.server}-${cfg.channel}-ii" = {
wantedBy = [ "multi-user.target" ];
path = [ pkgs.ii ];
script = ''
- ${pkgs.ii}/bin/ii ${cfg.dataDir}/irc -s ${cfg.server} -p 6667 -n bizbot
+ ${pkgs.ii}/bin/ii ${cfg.dataDir}/irc -s ${cfg.server} -p 6667 -n omnibot
'';
postStart = ''
echo "/join ${cfg.channel}" > ${cfg.dataDir}/irc/${cfg.server}/in
'';
description = ''
- bizbot ii tree for ${cfg.server}/${cfg.channel}
+ omnibot ii tree for ${cfg.server}/${cfg.channel}
'';
};
- "bizbot-${cfg.server}-${cfg.channel}" = {
+ "omnibot-${cfg.server}-${cfg.channel}" = {
path = [ cfg.package ];
wantedBy = [ "multi-user.target" ];
- after = [ "bizbot-${cfg.server}-${cfg.channel}-ii.service" ];
+ after = [ "omnibot-${cfg.server}-${cfg.channel}-ii.service" ];
script = ''
tail -f ${cfg.dataDir}/irc/${cfg.server}/${cfg.channel}/out \
- | ${cfg.package}/bin/bizbot \
+ | ${cfg.package}/bin/omnibot \
| tee -a ${cfg.dataDir}/irc/${cfg.server}/${cfg.channel}/in
'';
description = ''
- bizbot for ${cfg.server}/${cfg.channel}
+ omnibot for ${cfg.server}/${cfg.channel}
'';
serviceConfig = {
KillSignal = "INT";
diff --git a/Biz/Bot.scm b/Omni/Bot.scm
index 81e04f0..c526507 100755
--- a/Biz/Bot.scm
+++ b/Omni/Bot.scm
@@ -1,10 +1,10 @@
-;; : out bizbot
+;; : out omnibot
;;
;; Usage with ii:
;;
-;; tail -f \#biz/out | guile -L $CODEROOT -s Biz/Bot.scm
+;; tail -f \#omni/out | guile -L $CODEROOT -s Omni/Bot.scm
;;
-(define-module (Biz Bot) #:export (main))
+(define-module (Omni Bot) #:export (main))
(import (ice-9 rdelim))
(import (ice-9 match))
@@ -17,7 +17,7 @@
(display msg (current-error-port)))
(define (is-command? msg)
- (string.prefix? msg "bizbot:"))
+ (string.prefix? msg "omnibot:"))
(define (parse-line line)
(if (eof-object? line)
@@ -33,7 +33,7 @@
(define (dispatch user msg)
(let ([msg (-> msg
- (string-drop (string-length "bizbot:"))
+ (string-drop (string-length "omnibot:"))
(string.lstrip #\space))])
(cond
((equal? msg "hi")
diff --git a/Biz/Ci.sh b/Omni/Ci.sh
index c6b1f7a..609e9aa 100755
--- a/Biz/Ci.sh
+++ b/Omni/Ci.sh
@@ -33,7 +33,7 @@
fi
##
runlint="$CODEROOT"/_/bin/lint
- [[ ! -f "$runlint" ]] && bild "${BILD_ARGS:-""}" "${CODEROOT:?}"/Biz/Lint.hs
+ [[ ! -f "$runlint" ]] && bild "${BILD_ARGS:-""}" "${CODEROOT:?}"/Omni/Lint.hs
if "$runlint" "${CODEROOT:?}"/**/*
then
lint_result="good"
diff --git a/Biz/Cli.hs b/Omni/Cli.hs
index c524332..8ace2a7 100644
--- a/Biz/Cli.hs
+++ b/Omni/Cli.hs
@@ -3,7 +3,7 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE NoImplicitPrelude #-}
-module Biz.Cli
+module Omni.Cli
( Plan (..),
main,
Docopt.Docopt (..),
@@ -21,7 +21,7 @@ module Biz.Cli
where
import Alpha
-import qualified Biz.Test as Test
+import qualified Omni.Test as Test
import qualified System.Console.Docopt as Docopt
import qualified System.Environment as Environment
diff --git a/Biz/Cloud.nix b/Omni/Cloud.nix
index 08d1ba2..08d1ba2 100644
--- a/Biz/Cloud.nix
+++ b/Omni/Cloud.nix
diff --git a/Biz/Cloud/Chat.nix b/Omni/Cloud/Chat.nix
index 7f86621..7f86621 100644
--- a/Biz/Cloud/Chat.nix
+++ b/Omni/Cloud/Chat.nix
diff --git a/Biz/Cloud/Comms.nix b/Omni/Cloud/Comms.nix
index bf7a763..bf7a763 100644
--- a/Biz/Cloud/Comms.nix
+++ b/Omni/Cloud/Comms.nix
diff --git a/Biz/Cloud/Comms/Coturn.nix b/Omni/Cloud/Comms/Coturn.nix
index 93093f0..93093f0 100644
--- a/Biz/Cloud/Comms/Coturn.nix
+++ b/Omni/Cloud/Comms/Coturn.nix
diff --git a/Biz/Cloud/Comms/Jitsi.nix b/Omni/Cloud/Comms/Jitsi.nix
index 17aeced..17aeced 100644
--- a/Biz/Cloud/Comms/Jitsi.nix
+++ b/Omni/Cloud/Comms/Jitsi.nix
diff --git a/Biz/Cloud/Comms/Mumble.nix b/Omni/Cloud/Comms/Mumble.nix
index 66d21a5..66d21a5 100644
--- a/Biz/Cloud/Comms/Mumble.nix
+++ b/Omni/Cloud/Comms/Mumble.nix
diff --git a/Biz/Cloud/Comms/Xmpp.nix b/Omni/Cloud/Comms/Xmpp.nix
index ad8649b..ad8649b 100644
--- a/Biz/Cloud/Comms/Xmpp.nix
+++ b/Omni/Cloud/Comms/Xmpp.nix
diff --git a/Biz/Cloud/Git.nix b/Omni/Cloud/Git.nix
index bc97d23..bc97d23 100644
--- a/Biz/Cloud/Git.nix
+++ b/Omni/Cloud/Git.nix
diff --git a/Biz/Cloud/Gmnisrv.nix b/Omni/Cloud/Gmnisrv.nix
index e2a66f6..e2a66f6 100644
--- a/Biz/Cloud/Gmnisrv.nix
+++ b/Omni/Cloud/Gmnisrv.nix
diff --git a/Biz/Cloud/Grocy.nix b/Omni/Cloud/Grocy.nix
index 697c2f1..697c2f1 100644
--- a/Biz/Cloud/Grocy.nix
+++ b/Omni/Cloud/Grocy.nix
diff --git a/Biz/Cloud/Hardware.nix b/Omni/Cloud/Hardware.nix
index 8fdbd4e..8fdbd4e 100644
--- a/Biz/Cloud/Hardware.nix
+++ b/Omni/Cloud/Hardware.nix
diff --git a/Biz/Cloud/Hub.nix b/Omni/Cloud/Hub.nix
index 39bbdd0..39bbdd0 100644
--- a/Biz/Cloud/Hub.nix
+++ b/Omni/Cloud/Hub.nix
diff --git a/Biz/Cloud/Mail.nix b/Omni/Cloud/Mail.nix
index fa99cf3..fa99cf3 100644
--- a/Biz/Cloud/Mail.nix
+++ b/Omni/Cloud/Mail.nix
diff --git a/Biz/Cloud/Networking.nix b/Omni/Cloud/Networking.nix
index 1c1f832..1c1f832 100644
--- a/Biz/Cloud/Networking.nix
+++ b/Omni/Cloud/Networking.nix
diff --git a/Biz/Cloud/NostrRelay.nix b/Omni/Cloud/NostrRelay.nix
index 0be8a6f..0be8a6f 100644
--- a/Biz/Cloud/NostrRelay.nix
+++ b/Omni/Cloud/NostrRelay.nix
diff --git a/Biz/Cloud/Ports.nix b/Omni/Cloud/Ports.nix
index 5b8446c..5b8446c 100644
--- a/Biz/Cloud/Ports.nix
+++ b/Omni/Cloud/Ports.nix
diff --git a/Biz/Cloud/Web.nix b/Omni/Cloud/Web.nix
index 0e080f5..0e080f5 100644
--- a/Biz/Cloud/Web.nix
+++ b/Omni/Cloud/Web.nix
diff --git a/Biz/Cloud/Znc.nix b/Omni/Cloud/Znc.nix
index e68ebc7..e68ebc7 100644
--- a/Biz/Cloud/Znc.nix
+++ b/Omni/Cloud/Znc.nix
diff --git a/Biz/Cloud/post-receive.sh b/Omni/Cloud/post-receive.sh
index cedbf90..179fbd0 100755
--- a/Biz/Cloud/post-receive.sh
+++ b/Omni/Cloud/post-receive.sh
@@ -5,7 +5,7 @@
# unfortunately the nixos gitolite module does not copy the 'commonHooks'
# properly, so we have to manually deploy this like so:
#
-# scp Biz/Cloud/post-receive \
+# scp Omni/Cloud/post-receive \
# root@simatime.com:/srv/git/.gitolite/hooks/common/post-receive
#
# One time only:
@@ -33,7 +33,7 @@ do
echo "$hash" > "$outdir/$newrev.sha256"
echo " commit: $newrev"
echo " sha256: $hash"
- echo " in biz: deps update $repo --branch $branch --rev $newrev --attribute sha256=$hash"
+ echo "in omni: deps update $repo --branch $branch --rev $newrev --attribute sha256=$hash"
chmod -R 755 "$webroot/archive"
fi
done
diff --git a/Biz/Dev/Beryllium.nix b/Omni/Dev/Beryllium.nix
index 82374c3..82374c3 100644
--- a/Biz/Dev/Beryllium.nix
+++ b/Omni/Dev/Beryllium.nix
diff --git a/Biz/Dev/Beryllium/Configuration.nix b/Omni/Dev/Beryllium/Configuration.nix
index 16f4bca..16f4bca 100644
--- a/Biz/Dev/Beryllium/Configuration.nix
+++ b/Omni/Dev/Beryllium/Configuration.nix
diff --git a/Biz/Dev/Beryllium/Hardware.nix b/Omni/Dev/Beryllium/Hardware.nix
index ecf425c..ecf425c 100644
--- a/Biz/Dev/Beryllium/Hardware.nix
+++ b/Omni/Dev/Beryllium/Hardware.nix
diff --git a/Biz/Dev/Beryllium/Ollama.nix b/Omni/Dev/Beryllium/Ollama.nix
index 35b4fe1..35b4fe1 100644
--- a/Biz/Dev/Beryllium/Ollama.nix
+++ b/Omni/Dev/Beryllium/Ollama.nix
diff --git a/Biz/Dev/Dns.nix b/Omni/Dev/Dns.nix
index baf79aa..baf79aa 100644
--- a/Biz/Dev/Dns.nix
+++ b/Omni/Dev/Dns.nix
diff --git a/Biz/Dev/Guix.nix b/Omni/Dev/Guix.nix
index 0b261fb..0b261fb 100644
--- a/Biz/Dev/Guix.nix
+++ b/Omni/Dev/Guix.nix
diff --git a/Biz/Dev/Hoogle.nix b/Omni/Dev/Hoogle.nix
index 213a31c..213a31c 100644
--- a/Biz/Dev/Hoogle.nix
+++ b/Omni/Dev/Hoogle.nix
diff --git a/Biz/Dev/Lithium.nix b/Omni/Dev/Lithium.nix
index 02488d9..567f6e0 100644
--- a/Biz/Dev/Lithium.nix
+++ b/Omni/Dev/Lithium.nix
@@ -11,7 +11,7 @@ bild.os {
./Hoogle.nix
./Networking.nix
./Dns.nix
- ../Dragons.nix
+ ../../Biz/Dragons.nix
#./Guix.nix # I need to package a bunch of guile libs first
./Vpn.nix
];
@@ -20,7 +20,7 @@ bild.os {
services.dragons = {
enable = true;
port = 8095;
- package = bild.run ../Dragons.hs;
+ package = bild.run ../../Biz/Dragons.hs;
keep = "/var/dragons/keep";
depo = "/var/dragons/depo";
};
diff --git a/Biz/Dev/Lithium/Configuration.nix b/Omni/Dev/Lithium/Configuration.nix
index 97b00c8..97b00c8 100644
--- a/Biz/Dev/Lithium/Configuration.nix
+++ b/Omni/Dev/Lithium/Configuration.nix
diff --git a/Biz/Dev/Lithium/Hardware.nix b/Omni/Dev/Lithium/Hardware.nix
index 54c07f5..54c07f5 100644
--- a/Biz/Dev/Lithium/Hardware.nix
+++ b/Omni/Dev/Lithium/Hardware.nix
diff --git a/Biz/Dev/Networking.nix b/Omni/Dev/Networking.nix
index c89add7..c89add7 100644
--- a/Biz/Dev/Networking.nix
+++ b/Omni/Dev/Networking.nix
diff --git a/Biz/Dev/Vpn.nix b/Omni/Dev/Vpn.nix
index 9b791b7..9b791b7 100644
--- a/Biz/Dev/Vpn.nix
+++ b/Omni/Dev/Vpn.nix
diff --git a/Biz/Id.hs b/Omni/Id.hs
index 344149d..59201d5 100644
--- a/Biz/Id.hs
+++ b/Omni/Id.hs
@@ -3,7 +3,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
-- Integer-based identifier.
-module Biz.Id
+module Omni.Id
( Id (..),
mk,
untag,
diff --git a/Biz/Ide/MakeTags.py b/Omni/Ide/MakeTags.py
index add07c0..add07c0 100755
--- a/Biz/Ide/MakeTags.py
+++ b/Omni/Ide/MakeTags.py
diff --git a/Biz/Ide/ftags.sh b/Omni/Ide/ftags.sh
index b29d994..b29d994 100755
--- a/Biz/Ide/ftags.sh
+++ b/Omni/Ide/ftags.sh
diff --git a/Biz/Ide/hoog.sh b/Omni/Ide/hoog.sh
index 237eb78..237eb78 100755
--- a/Biz/Ide/hoog.sh
+++ b/Omni/Ide/hoog.sh
diff --git a/Biz/Ide/hooks/commit-msg b/Omni/Ide/hooks/commit-msg
index e07d1f4..e07d1f4 100755
--- a/Biz/Ide/hooks/commit-msg
+++ b/Omni/Ide/hooks/commit-msg
diff --git a/Biz/Ide/hooks/post-applypatch b/Omni/Ide/hooks/post-applypatch
index 5071dc5..5071dc5 100755
--- a/Biz/Ide/hooks/post-applypatch
+++ b/Omni/Ide/hooks/post-applypatch
diff --git a/Biz/Ide/hooks/post-checkout b/Omni/Ide/hooks/post-checkout
index 4f58c74..85541a2 100755
--- a/Biz/Ide/hooks/post-checkout
+++ b/Omni/Ide/hooks/post-checkout
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
function MakeTags {
- ${CODEROOT:?}/Biz/Ide/MakeTags.py
+ ${CODEROOT:?}/Omni/Ide/MakeTags.py
}
old=$1
new=$2
diff --git a/Biz/Ide/hooks/post-commit b/Omni/Ide/hooks/post-commit
index cd1f195..cd1f195 100755
--- a/Biz/Ide/hooks/post-commit
+++ b/Omni/Ide/hooks/post-commit
diff --git a/Biz/Ide/hooks/post-merge b/Omni/Ide/hooks/post-merge
index d2cfa63..fcfd314 100755
--- a/Biz/Ide/hooks/post-merge
+++ b/Omni/Ide/hooks/post-merge
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-"${CODEROOT:?}"/Biz/Ide/hooks/post-checkout 'HEAD@{1}' HEAD
+"${CODEROOT:?}"/Omni/Ide/hooks/post-checkout 'HEAD@{1}' HEAD
## START BRANCHLESS CONFIG
git branchless hook post-merge "$@"
diff --git a/Biz/Ide/hooks/post-rewrite b/Omni/Ide/hooks/post-rewrite
index 8b3237a..8b3237a 100755
--- a/Biz/Ide/hooks/post-rewrite
+++ b/Omni/Ide/hooks/post-rewrite
diff --git a/Biz/Ide/hooks/pre-auto-gc b/Omni/Ide/hooks/pre-auto-gc
index c92a844..c92a844 100755
--- a/Biz/Ide/hooks/pre-auto-gc
+++ b/Omni/Ide/hooks/pre-auto-gc
diff --git a/Biz/Ide/hooks/pre-commit b/Omni/Ide/hooks/pre-commit
index b0f204a..06f1716 100755
--- a/Biz/Ide/hooks/pre-commit
+++ b/Omni/Ide/hooks/pre-commit
@@ -7,7 +7,7 @@
mapfile -t changed < <(git diff-index --cached --name-only HEAD)
for ns in "${changed[@]}"
do
- version=$("${CODEROOT:?}"/Biz/Ide/version.sh "$ns")
+ version=$("${CODEROOT:?}"/Omni/Ide/version.sh "$ns")
if [[ $version -eq -1 ]]; then
echo "info: version: $ns: deleted"
elif [[ $version -lt 1 ]]; then
diff --git a/Biz/Ide/hooks/pre-push b/Omni/Ide/hooks/pre-push
index 00110bd..00110bd 100755
--- a/Biz/Ide/hooks/pre-push
+++ b/Omni/Ide/hooks/pre-push
diff --git a/Biz/Ide/hooks/reference-transaction b/Omni/Ide/hooks/reference-transaction
index ea0cce6..ea0cce6 100755
--- a/Biz/Ide/hooks/reference-transaction
+++ b/Omni/Ide/hooks/reference-transaction
diff --git a/Biz/Ide/ns.sh b/Omni/Ide/ns.sh
index a56ed89..a56ed89 100755
--- a/Biz/Ide/ns.sh
+++ b/Omni/Ide/ns.sh
diff --git a/Biz/Ide/push.sh b/Omni/Ide/push.sh
index 43dff28..43dff28 100755
--- a/Biz/Ide/push.sh
+++ b/Omni/Ide/push.sh
diff --git a/Biz/Ide/repl.sh b/Omni/Ide/repl.sh
index ceedb71..3b6a536 100755
--- a/Biz/Ide/repl.sh
+++ b/Omni/Ide/repl.sh
@@ -32,7 +32,7 @@ fi
exts=$(jq --raw-output '.[].namespace.ext' <<< "$json" | sort | uniq)
packageSet=$(jq --raw-output '.[].packageSet' <<< "$json")
module=$(jq --raw-output '.[].mainModule' <<< "$json")
- BILD="(import ${CODEROOT:?}/Biz/Bild.nix {})"
+ BILD="(import ${CODEROOT:?}/Omni/Bild.nix {})"
declare -a flags=(--packages "$BILD.pkgs.pkg-config")
for lib in "${sysdeps[@]}"; do
flags+=(--packages "$BILD.pkgs.${lib}")
@@ -71,7 +71,7 @@ fi
langdeps+=("mypy")
flags+=(--packages "$BILD.python.pythonWith (p: with p; [${langdeps[*]}])")
PYTHONPATH=$CODEROOT:$PYTHONPATH
- pycommand="python -i $CODEROOT/Biz/Repl.py $module ${targets[*]}"
+ pycommand="python -i $CODEROOT/Omni/Repl.py $module ${targets[*]}"
command=${CMD:-"$pycommand"}
;;
*)
diff --git a/Biz/Ide/run.sh b/Omni/Ide/run.sh
index 506aa92..506aa92 100755
--- a/Biz/Ide/run.sh
+++ b/Omni/Ide/run.sh
diff --git a/Biz/Ide/ship.sh b/Omni/Ide/ship.sh
index 8783e9b..8783e9b 100755
--- a/Biz/Ide/ship.sh
+++ b/Omni/Ide/ship.sh
diff --git a/Biz/Ide/tips.sh b/Omni/Ide/tips.sh
index c572022..453e464 100755
--- a/Biz/Ide/tips.sh
+++ b/Omni/Ide/tips.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo ""
-echo "bizdev" | figlet | lolcat
+echo "omnidev" | figlet | lolcat
echo ""
echo " bild compile code"
echo " repl.sh start a repl"
diff --git a/Biz/Ide/version.sh b/Omni/Ide/version.sh
index 60f9c91..60f9c91 100755
--- a/Biz/Ide/version.sh
+++ b/Omni/Ide/version.sh
diff --git a/Biz/Keys/Ben.pub b/Omni/Keys/Ben.pub
index d0e5b4a..d0e5b4a 100644
--- a/Biz/Keys/Ben.pub
+++ b/Omni/Keys/Ben.pub
diff --git a/Biz/Keys/Deploy.pub b/Omni/Keys/Deploy.pub
index 664a2d9..664a2d9 100644
--- a/Biz/Keys/Deploy.pub
+++ b/Omni/Keys/Deploy.pub
diff --git a/Biz/Keys/Dre.pub b/Omni/Keys/Dre.pub
index ebacdf9..ebacdf9 100644
--- a/Biz/Keys/Dre.pub
+++ b/Omni/Keys/Dre.pub
diff --git a/Biz/Keys/Nick.pub b/Omni/Keys/Nick.pub
index 4dc08fb..4dc08fb 100644
--- a/Biz/Keys/Nick.pub
+++ b/Omni/Keys/Nick.pub
diff --git a/Biz/Lint.hs b/Omni/Lint.hs
index c971c04..45d1523 100644
--- a/Biz/Lint.hs
+++ b/Omni/Lint.hs
@@ -15,20 +15,20 @@
-- : run shellcheck
-- : run indent
-- : run nixfmt
-module Biz.Lint (main) where
+module Omni.Lint (main) where
import Alpha
-import qualified Biz.Cli as Cli
-import qualified Biz.Log as Log
-import Biz.Namespace (Ext (..), Namespace (..))
-import qualified Biz.Namespace as Namespace
-import Biz.Test ((@=?))
-import qualified Biz.Test as Test
import qualified Data.Aeson as Aeson
import qualified Data.ByteString.Char8 as Char8
import qualified Data.Map as Map
import qualified Data.String as String
import qualified Data.Text as Text
+import qualified Omni.Cli as Cli
+import qualified Omni.Log as Log
+import Omni.Namespace (Ext (..), Namespace (..))
+import qualified Omni.Namespace as Namespace
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
import qualified System.Directory as Directory
import qualified System.Environment as Environment
import qualified System.Exit as Exit
@@ -68,9 +68,9 @@ move args =
test :: Test.Tree
test =
Test.group
- "Biz.Lint"
+ "Omni.Lint"
[ Test.unit "haskell files return two Results" <| do
- results <- run Check <| Map.singleton Hs <| [Namespace ["Biz", "Lint"] Hs]
+ results <- run Check <| Map.singleton Hs <| [Namespace ["Omni", "Lint"] Hs]
length results @=? 2
]
diff --git a/Biz/Llamacpp.py b/Omni/Llamacpp.py
index 66b57d8..66b57d8 100644
--- a/Biz/Llamacpp.py
+++ b/Omni/Llamacpp.py
diff --git a/Biz/Log.hs b/Omni/Log.hs
index 5c82c28..91fcb55 100644
--- a/Biz/Log.hs
+++ b/Omni/Log.hs
@@ -15,7 +15,7 @@
-- * often use `br` after `warn`, unless its really unimportant
--
-- * labels should be roughly hierarchical from general->specific
-module Biz.Log
+module Omni.Log
( Lvl (..),
good,
pass,
@@ -52,8 +52,8 @@ import System.IO.Unsafe (unsafePerformIO)
data Lvl = Good | Pass | Info | Warn | Fail | Mark
--- | Get the environment. This should probably return 'Biz.App.Area' instead of
--- 'String', but I don't want to depend on everything in 'Biz.App', so some kind
+-- | Get the environment. This should probably return 'Omni.App.Area' instead of
+-- 'String', but I don't want to depend on everything in 'Omni.App', so some kind
-- of refactor is needed.
area :: IO String
area =
diff --git a/Biz/Log.py b/Omni/Log.py
index debbf26..2fbd007 100644
--- a/Biz/Log.py
+++ b/Omni/Log.py
@@ -1,4 +1,4 @@
-"""Setup logging like Biz/Log.hs."""
+"""Setup logging like Omni/Log.hs."""
# noqa: builtin-attribute-shadowing
import logging
diff --git a/Biz/Look.hs b/Omni/Look.hs
index 7258375..d75d056 100644
--- a/Biz/Look.hs
+++ b/Omni/Look.hs
@@ -4,7 +4,7 @@
-- | Library of styles
--
-- https://leerob.io/blog/how-stripe-designs-beautiful-websites
-module Biz.Look
+module Omni.Look
( -- | Base stylesheets
fuckingStyle,
-- | Clay.Media extensions
diff --git a/Biz/Namespace.hs b/Omni/Namespace.hs
index aa69a9c..ef8cefd 100644
--- a/Biz/Namespace.hs
+++ b/Omni/Namespace.hs
@@ -4,7 +4,7 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE NoImplicitPrelude #-}
-module Biz.Namespace
+module Omni.Namespace
( Namespace (..),
Ext (..),
fromPath,
@@ -55,8 +55,8 @@ instance Aeson.ToJSONKey Namespace where
toJSONKey = Aeson.toJSONKeyText (Text.pack <. toPath)
fromPath :: String -> String -> Maybe Namespace
-fromPath bizRoot absPath =
- List.stripPrefix bizRoot absPath
+fromPath coderoot absPath =
+ List.stripPrefix coderoot absPath
+> List.stripPrefix "/"
+> Regex.match (Namespace </ rePath <* dot <*> reExt)
diff --git a/Biz/OsBase.nix b/Omni/OsBase.nix
index 3e69d8e..3e69d8e 100644
--- a/Biz/OsBase.nix
+++ b/Omni/OsBase.nix
diff --git a/Biz/Packages.nix b/Omni/Packages.nix
index d04dfc3..d04dfc3 100644
--- a/Biz/Packages.nix
+++ b/Omni/Packages.nix
diff --git a/Biz/Repl.py b/Omni/Repl.py
index 6b60d02..1cf2f65 100644
--- a/Biz/Repl.py
+++ b/Omni/Repl.py
@@ -5,9 +5,9 @@ This module attempts to emulate the workflow of ghci or lisp repls. It uses
importlib to load a namespace from the provided path, typechecks it with mypy,
and provides some tools for improving repl-driven development.
-This module is called in Biz/Ide/repl.sh like so:
+This module is called in Omni/Ide/repl.sh like so:
- python -i Biz/Repl.py NS PATH
+ python -i Omni/Repl.py NS PATH
where NS is the dot-partitioned namespace of the main module, and PATH is the
path to the same file. In the future this could be expanded to be a list of
@@ -16,12 +16,12 @@ additional files to load.
# : out python-improved-repl
# : dep mypy
-import Biz.Log as Log
import importlib
import importlib.util
import inspect
import logging
import mypy.api
+import Omni.Log as Log
import os
import pathlib
import pydoc
@@ -254,7 +254,7 @@ def move() -> None:
def main() -> None:
- """Entrypoint, should be replaced by a `Biz.Cli.main`."""
+ """Entrypoint, should be replaced by a `Omni.Cli.main`."""
if sys.argv[1] == "test":
test()
else:
diff --git a/Biz/Sentry.sh b/Omni/Sentry.sh
index 5c9e0ac..5c9e0ac 100755
--- a/Biz/Sentry.sh
+++ b/Omni/Sentry.sh
diff --git a/Biz/Test.hs b/Omni/Test.hs
index c81c5cf..0cc00ac 100644
--- a/Biz/Test.hs
+++ b/Omni/Test.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
-module Biz.Test
+module Omni.Test
( Tree,
Description,
Assertion,
@@ -105,6 +105,6 @@ a @?= b = a HUnit.@?= b
infixr 2 @?=
--- | For usage in 'Biz.Cli.Plan' when you have no tests.
+-- | For usage in 'Omni.Cli.Plan' when you have no tests.
none :: Tree
none = group "none" []
diff --git a/Biz/Users.nix b/Omni/Users.nix
index b214704..b214704 100644
--- a/Biz/Users.nix
+++ b/Omni/Users.nix
diff --git a/Biz/Wipbase.c b/Omni/Wipbase.c
index 31996a2..31996a2 100644
--- a/Biz/Wipbase.c
+++ b/Omni/Wipbase.c
diff --git a/README.md b/README.md
index 9ed996d..fb69112 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Biz.Dev is the namespace for business development (duh). Here we define the
-tools and infrastructure for internal dev work.
+Omni.Dev is the namespace for development. Here we define the tools and
+infrastructure for internal dev work.
# Goals of the workflow
@@ -29,18 +29,21 @@ Then run `help` to see the dev commands.
# Repository organization
-The source tree maps to the module namespace, and roughly follows the
-Haskell namespace hierarchy (although nothing is enforced). The root namespace
-for all code that we own is `Biz`; proprietary applications, products, and
-infrastructure lives under there. Stuff that can be open sourced or otherwise
-externalized should be outside of `Biz`.
+The source tree maps to the module namespace, and roughly follows the Haskell
+namespace hierarchy (although nothing is enforced).
-Development aspects should be localized to their sub-namespaces as much
-as possible. Only after sufficient iteration such that interfaces are
-solidified and functionality is well-established should some code be
-promoted up the namespace hierarchy.
+The namespace for all products that we own is `Biz`; proprietary applications,
+products, and related infrastructure lives under there. The `Omni` namespace is
+used for internal development tooling and infrastructure that are not related to
+individual products. Stuff that can be open sourced or otherwise externalized
+should be outside of `Biz` or `Omni`.
-Start with small namespaces: use `Biz/Thing.hs` before `Biz/Thing/Service.hs`.
+Development aspects should be localized to their sub-namespaces as much as
+possible. Only after sufficient iteration such that interfaces are solidified
+and functionality is well-established should some code be promoted up the
+namespace hierarchy.
+
+Start with small namespaces: use `Omni/Thing.hs` before `Omni/Thing/Service.hs`.
Try to keep all related code in one spot for as long as possible.
Boundaries and interfaces between namespaces should be singular and
@@ -48,10 +51,10 @@ well-defined. Likewise, the functionality and purpose of a particular
namespace should be singular and well-defined. Follow the unix principle
of "do one thing and do it well."
-Namespaces are always capitalized. I would prefer always lowercase, but
-`ghc` _really_ wants capitalized files, so we appeas `ghc`. In Scheme
-this actually translates quite well and helps distinguish between types
-and values.
+Namespaces are always capitalized. I would prefer always lowercase, but `ghc`
+_really_ wants capitalized files, so we appeas `ghc`. In Scheme and Python this
+actually translates quite well and helps distinguish between types/classes and
+values.
File extensions denote _type_ and indicate to the build system how to
handle the file. So for example:
@@ -64,10 +67,10 @@ handle the file. So for example:
# Setting up remote builds
-The Biz.Dev machine acts as a remote build server and Nix cache. To use it from
-your local machine, your public key must be at `Biz/Keys/$USER.pub` and your
-user added to `Biz/Users.nix`, then bild will automatically use your key to run
-builds on Biz.Dev.
+The `Omni.Dev` machine acts as a remote build server and Nix cache. To use it from
+your local machine, your public key must be at `Omni/Keys/$USER.pub` and your
+user added to `Omni/Users.nix`, then bild will automatically use your key to run
+builds on `Omni.Dev`.
To use distributed builds for all nix commands, add the following to your NixOS
configuration:
diff --git a/default.nix b/default.nix
index 6c43f8e..5f9f776 100644
--- a/default.nix
+++ b/default.nix
@@ -1,3 +1,3 @@
-let nixpkgs = import ./Biz/Bild/Nixpkgs.nix;
-in { bild = import ./Biz/Bild.nix { inherit nixpkgs; }; } // nixpkgs
+let nixpkgs = import ./Omni/Bild/Nixpkgs.nix;
+in { bild = import ./Omni/Bild.nix { inherit nixpkgs; }; } // nixpkgs
diff --git a/shell.nix b/shell.nix
index 19547fa..37ef90f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1 +1 @@
-(import ./Biz/Bild.nix { nixpkgs = import ./Biz/Bild/Nixpkgs.nix; }).env
+(import ./Omni/Bild.nix { nixpkgs = import ./Omni/Bild/Nixpkgs.nix; }).env