Config WIP 3

config-examples/default-config.toml

@@ -1,5 +1,8 @@
-# For the whole reference of possible keys and modifiers see: https://github.com/nikitabobko/AeroSpace/blob/main/src/config/keysMap.swift
+# For all possible keys and modifiers see: https://github.com/nikitabobko/AeroSpace/blob/main/src/config/keysMap.swift
 
+# todo review defaults
+
+after-startup-command = [] # You can use it to add command or commands that run after startup.
 use-padding-for-nested-containers-with-the-same-orientation = true
 auto-flatten-containers = true
 # auto-different-orientation-for-nested-containers = true
@@ -11,8 +14,8 @@ alt-enter = 'bash /usr/bin/open /System/Applications/Utilities/Terminal.app'
 
 alt-shift-quote = 'focus child'
 alt-quote       = 'focus parent'
-alt-slash       = 'layout toggle h_list v_list'
-alt-comma       = 'layout toggle h_accordion v_accordion'
+# alt-slash       = 'layout h_list v_list'
+# alt-comma       = 'layout h_accordion v_accordion'
 
 # todo focus floating binding
 
@@ -23,16 +26,17 @@ alt-j = ['focus tiling', 'focus down']
 alt-l = ['focus tiling', 'focus right']
 
 # Move window
-alt-shift-k = 'move_through up'
-alt-shift-h = 'move_through left'
-alt-shift-j = 'move_through down'
-alt-shift-l = 'move_through right'
+
+# alt-shift-k = 'move_through up'
+# alt-shift-h = 'move_through left'
+# alt-shift-j = 'move_through down'
+# alt-shift-l = 'move_through right'
 
 # Resize window
-alt-shift-minus  = 'resize shrink height 2 px'
-alt-shift-equal  = 'resize grow height 2 px'
-alt-shift-comma  = 'resize shrink width 2 px'
-alt-shift-period = 'resize grow width 2 px'
+# alt-shift-minus  = 'resize shrink height 2 px'
+# alt-shift-equal  = 'resize grow height 2 px'
+# alt-shift-comma  = 'resize shrink width 2 px'
+# alt-shift-period = 'resize grow width 2 px'
 
 alt-0 = 'workspace 000'
 alt-1 = 'workspace 111'
@@ -67,47 +71,42 @@ alt-x = 'workspace XXX'
 alt-y = 'workspace YYY'
 alt-z = 'workspace ZZZ'
 
-alt-shift-0 = 'move container to workspace 000'
-alt-shift-1 = 'move container to workspace 111'
-alt-shift-2 = 'move container to workspace 222'
-alt-shift-3 = 'move container to workspace 333'
-alt-shift-4 = 'move container to workspace 444'
-alt-shift-5 = 'move container to workspace 555'
-alt-shift-6 = 'move container to workspace 666'
-alt-shift-7 = 'move container to workspace 777'
-alt-shift-8 = 'move container to workspace 888'
-alt-shift-9 = 'move container to workspace 999'
-alt-shift-a = 'move container to workspace AAA'
-alt-shift-b = 'move container to workspace BBB'
-alt-shift-c = 'move container to workspace CCC'
-alt-shift-d = 'move container to workspace DDD'
-alt-shift-e = 'move container to workspace EEE'
-alt-shift-f = 'move container to workspace FFF'
-alt-shift-g = 'move container to workspace GGG'
-alt-shift-i = 'move container to workspace III'
-alt-shift-m = 'move container to workspace MMM'
-alt-shift-n = 'move container to workspace NNN'
-alt-shift-o = 'move container to workspace OOO'
-alt-shift-p = 'move container to workspace PPP'
-alt-shift-q = 'move container to workspace QQQ'
-alt-shift-r = 'move container to workspace RRR'
-alt-shift-s = 'move container to workspace SSS'
-alt-shift-t = 'move container to workspace TTT'
-alt-shift-u = 'move container to workspace UUU'
-alt-shift-v = 'move container to workspace VVV'
-alt-shift-w = 'move container to workspace WWW'
-alt-shift-x = 'move container to workspace XXX'
-alt-shift-y = 'move container to workspace YYY'
-alt-shift-z = 'move container to workspace ZZZ'
-
-alt-tab = 'workspace_back_and_forth'
+# alt-shift-0 = 'move container to workspace 000'
+# alt-shift-1 = 'move container to workspace 111'
+# alt-shift-2 = 'move container to workspace 222'
+# alt-shift-3 = 'move container to workspace 333'
+# alt-shift-4 = 'move container to workspace 444'
+# alt-shift-5 = 'move container to workspace 555'
+# alt-shift-6 = 'move container to workspace 666'
+# alt-shift-7 = 'move container to workspace 777'
+# alt-shift-8 = 'move container to workspace 888'
+# alt-shift-9 = 'move container to workspace 999'
+# alt-shift-a = 'move container to workspace AAA'
+# alt-shift-b = 'move container to workspace BBB'
+# alt-shift-c = 'move container to workspace CCC'
+# alt-shift-d = 'move container to workspace DDD'
+# alt-shift-e = 'move container to workspace EEE'
+# alt-shift-f = 'move container to workspace FFF'
+# alt-shift-g = 'move container to workspace GGG'
+# alt-shift-i = 'move container to workspace III'
+# alt-shift-m = 'move container to workspace MMM'
+# alt-shift-n = 'move container to workspace NNN'
+# alt-shift-o = 'move container to workspace OOO'
+# alt-shift-p = 'move container to workspace PPP'
+# alt-shift-q = 'move container to workspace QQQ'
+# alt-shift-r = 'move container to workspace RRR'
+# alt-shift-s = 'move container to workspace SSS'
+# alt-shift-t = 'move container to workspace TTT'
+# alt-shift-u = 'move container to workspace UUU'
+# alt-shift-v = 'move container to workspace VVV'
+# alt-shift-w = 'move container to workspace WWW'
+# alt-shift-x = 'move container to workspace XXX'
+# alt-shift-y = 'move container to workspace YYY'
+# alt-shift-z = 'move container to workspace ZZZ'
 
-alt-shift-slash.alt-shift-k = 'move_in up'
-alt-shift-slash.alt-shift-h = 'move_in left'
-alt-shift-slash.alt-shift-j = 'move_in down'
-alt-shift-slash.alt-shift-l = 'move_in right'
+# alt-tab = 'workspace_back_and_forth'
 
-# aerospace config set mode.main.binding.alt-l 'focus tiling' 'focus right'
-# aerospace config set mode.main.binding.alt-enter 'basn alacritty'
-# aerospace config set mode.main.binding.alt-shift-slash.alt-shift-l 'move_in right'
-# aerospace config set config.start-at-login false
+# alt-shift-slash.alt-shift-k = 'move_in up'
+# alt-shift-slash.alt-shift-h = 'move_in left'
+# alt-shift-slash.alt-shift-j = 'move_in down'
+# alt-shift-slash.alt-shift-l = 'move_in right'

project.yml

@@ -13,7 +13,7 @@ targets:
     type: application
     platform: macOS
     deploymentTarget: "13.0"
-    sources: [src]
+    sources: [src, config-examples/default-config.toml]
     dependencies:
       - package: HotKey
       - package: TOMLKit

src/accessibility.swift

@@ -10,10 +10,7 @@ func checkAccessibilityPermissions() {
 }
 
 private func resetAccessibility() {
-    do {
-        try Process.run(URL(filePath: "/usr/bin/tccutil"), arguments: ["reset", "Accessibility", Bundle.appId])
-    } catch {
-    }
+    try! Process.run(URL(filePath: "/usr/bin/tccutil"), arguments: ["reset", "Accessibility", Bundle.appId])
 }
 
 protocol ReadableAttr {

src/command/BashCommand.swift

@@ -0,0 +1,10 @@
+struct BashCommand: Command {
+    let bashCommand: String
+
+    func run() {
+        do {
+            try Process.run(URL(filePath: "/bin/bash"), arguments: ["-c", bashCommand])
+        } catch {
+        }
+    }
+}

src/command/Command.swift

@@ -0,0 +1,3 @@
+protocol Command {
+    func run()
+}

src/command/CompositeCommand.swift

@@ -0,0 +1,9 @@
+struct CompositeCommand: Command {
+    let subCommands: [Command]
+
+    func run() {
+        for command in subCommands {
+            command.run()
+        }
+    }
+}

src/command/FocusCommand.swift

@@ -0,0 +1,13 @@
+struct FocusCommand: Command {
+    let direction: Direction
+
+    enum Direction: String {
+        case up, down, left, right
+
+        case parent, child, floating, tiling, toggle_tiling_floating
+    }
+
+    func run() {
+        // todo
+    }
+}

src/command/LayoutCommand.swift

@@ -0,0 +1,17 @@
+/// Syntax:
+/// layout (main|h_accordion|v_accordion|h_list|v_list|floating|tiling)...
+struct LayoutCommand: Command {
+    let toggleTo: [Layout]
+    enum Layout {
+        case main
+        case h_accordion
+        case v_accordion
+        case h_list
+        case v_list
+        case floating
+    }
+
+    func run() {
+        // todo
+    }
+}

src/command/ModeCommand.swift

@@ -0,0 +1,13 @@
+struct ModeCommand: Command {
+    let idToActivate: String
+
+    func run() {
+        for (modeId, mode) in config.modes {
+            if modeId == idToActivate {
+                mode.activate()
+            } else {
+                mode.deactivate()
+            }
+        }
+    }
+}

src/command/MoveThroughtCommand.swift

@@ -0,0 +1,11 @@
+struct MoveThroughCommand: Command {
+    let direction: Direction
+
+    enum Direction {
+        case left, down, up, right
+    }
+
+    func run() {
+
+    }
+}

src/command/ReloadConfigCommand.swift

@@ -0,0 +1,6 @@
+struct ReloadConfigCommand: Command {
+    func run() {
+        reloadConfig()
+        refresh()
+    }
+}

src/command/WorkspaceCommand.swift

@@ -0,0 +1,7 @@
+struct WorkspaceCommand : Command {
+    let workspaceName: String
+
+    func run() {
+        switchToWorkspace(Workspace.get(byName: workspaceName))
+    }
+}