config.json

@@ -1,6 +1,6 @@
 {
   "mount": [],
-  "romount": ["/etc", "/var", "/usr", "/opt"],
+  "romount": ["/etc", "/var", "/usr", "/opt", ".oh-my-zsh", ".zsh", ".zshrc"],
   "symlinks": [
     {"src": "usr/lib", "dst": "/lib"},
     {"src": "usr/lib64", "dst": "/lib64"},

configs/box

@@ -1 +0,0 @@
-{"extends": "shell", "mountcwd": true}

configs/dev

@@ -1 +0,0 @@
-{"extends": "shell", "romount": [".gitconfig", ".gnupg", "/run/user/1000/gnupg", ".ssh/config"], "mountcwd": true, "mount": [".ssh/known_hosts"]}

configs/gui

@@ -1 +0,0 @@
-{"extends": "default", "romount": [".Xauthority", "/tmp/.X11-unix", "/run/user/1000/pulse/native"], "dbus": true, "dbuscall": ["org.freedesktop.Notifications.*=@/org/freedesktop/Notifications", "org.freedesktop.portal.*=*"], "dbusbroadcast": ["org.freedesktop.portal.*=@/org/freedesktop/portal/*"]}

configs/shell

@@ -1 +0,0 @@
-{"extends": "default", "romount": [".oh-my-zsh", ".zsh", ".zshrc", ".zshrc-local"], "sethostname": true}

lib/args.nim

@@ -1,13 +1,14 @@
+import parseopt
 import options
 import os
 
 type Args* = object
   name*: Option[string]
-  cmd*: Option[seq[string]]
+  cmd*: Option[string]
   profile*: Option[string]
 
-proc getCmd*(args: Args): seq[string] =
-  return args.cmd.get(@[getEnv("SHELL", "/bin/bash")])
+proc getCmd*(args: Args): string =
+  return args.cmd.get(getEnv("SHELL", "/bin/bash"))
 
 proc getProfile*(args: Args): string =
   if args.profile.isSome:
@@ -15,30 +16,30 @@ proc getProfile*(args: Args): string =
 
   return "default"
 
+proc parseOpt(args: var Args, key: string, value: string): bool =
+  case key
+  of "command", "c":
+    args.cmd = some(value)
+  of "profile", "p":
+    args.profile = some(value)
+  else:
+    return false
+
+  return true
+
 proc parseArgs*(): Option[Args] =
+  var p = initOptParser()
   var args = Args()
 
-  var command = newSeq[string]()
-  var i = 1
+  while true:
+    p.next()
+    case p.kind
+    of cmdEnd: break
+    of cmdShortOption, cmdLongOption:
+      if p.val == "" or args.parseOpt(p.key, p.val) == false:
+        echo "Invalid argument ", p.val
+        return
+    of cmdArgument:
+      args.name = some(p.key.string)
 
-  while i <= paramCount():
-    var arg = paramStr(i)
-
-    if arg == "--name":
-      args.name = some(paramStr(i + 1))
-      i += 2
-    elif arg == "--profile":
-      args.profile = some(paramStr(i + 1))
-      i += 2
-    else:
-      echo arg
-      command.add(arg)
-      i += 1
-
-  if command.len > 0:
-    args.cmd = some(command)
-
-  if args.name.isSome or args.cmd.isSome or args.profile.isSome:
-    return some(args)
-  else:
-    return none(Args)
+  return some(args)

lib/utils.nim

@@ -15,19 +15,9 @@ proc checkRelativePath*(p: string): string =
   getHomeDir().joinPath(p)
 
 proc getProfilePath*(profile: string): string =
-  let pid = getCurrentProcessId()
-
-  for path in [
-    getConfigDir().joinPath(APP_NAME),
-    &"/usr/share/{APP_NAME}",
-    parentDir(expandSymlink(&"/proc/{pid}/exe")).joinPath("configs")
-  ]:
-    let file = path.joinPath(profile)
-
-    if fileExists(file):
-      return file
-
-  raise newException(IOError, "Profile not found")
+  getConfigDir()
+        .joinPath(APP_NAME)
+        .joinPath(profile)
 
 proc getProfilePath*(args: Args): string =
   getProfilePath(args.getProfile())

main.nim

@@ -7,7 +7,7 @@ proc main(): int =
   let args = parseArgs()
 
   if args.isNone:
-    echo "Usage: bwshell --name=sandbox_name --profile=profile <sandbox_cmd>"
+    echo "Usage: bwshell --command=cmd --profile=profile <sandbox_name>"
     return 1
   else:
     randomize()

scripts/applications.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 1 ]; then
-  echo "Usage: $0 <target_dir>"
-  exit 1
-fi
-
-check_dir() {
-  local dir=$1
-  local file
-
-  for application in "$dir/"*; do
-    file="$(basename "$application")"
-
-    sed "s/Exec=/Exec=bwshell --name '$file' --profile gui /gi" "$application" > "$target/$file"
-  done
-}
-
-dirs=("/usr/share/applications" "$HOME/.local/share/applications")
-target="$1"
-
-mkdir -p "$target"
-
-for dir in "${dirs[@]}"; do
-  check_dir "$dir"
-done