diff --git a/roles/hammerspoon/files/config/init.lua b/roles/hammerspoon/files/config/init.lua index 1707254a..5e51c62c 100644 --- a/roles/hammerspoon/files/config/init.lua +++ b/roles/hammerspoon/files/config/init.lua @@ -112,22 +112,22 @@ end)) local chainX = { 'thirds', 'halves', 'twoThirds', 'fiveSixths', 'sixths' } local chainY = { 'full', 'thirds' } -local singleWindowMovements = { - ['h'] = chain(getPositions(chainX, 'left')), - ['k'] = chain(getPositions(chainY, 'center')), - ['j'] = chain({ positions.center.large, positions.center.medium, positions.center.small, positions.center.tiny, - positions.center.mini }), - ['l'] = chain(getPositions(chainX, 'right')), - ['y'] = chain(getPositions(chainX, 'left', 'top')), - ['u'] = chain(getPositions(chainX, 'right', 'top')), - ['n'] = chain(getPositions(chainX, 'left', 'bottom')), - ['m'] = chain(getPositions(chainX, 'right', 'bottom')), - -- ['i'] = function() hs.grid.snap(hs.window.focusedWindow()) end, -- seems buggy? -} - -registerKeyBindings(bigHyper, hs.fnutils.map(singleWindowMovements, function(fn) - return function() fn() end -end)) +-- local singleWindowMovements = { +-- ['h'] = chain(getPositions(chainX, 'left')), +-- ['k'] = chain(getPositions(chainY, 'center')), +-- ['j'] = chain({ positions.center.large, positions.center.medium, positions.center.small, positions.center.tiny, +-- positions.center.mini }), +-- ['l'] = chain(getPositions(chainX, 'right')), +-- ['y'] = chain(getPositions(chainX, 'left', 'top')), +-- ['u'] = chain(getPositions(chainX, 'right', 'top')), +-- ['n'] = chain(getPositions(chainX, 'left', 'bottom')), +-- ['m'] = chain(getPositions(chainX, 'right', 'bottom')), +-- -- ['i'] = function() hs.grid.snap(hs.window.focusedWindow()) end, -- seems buggy? +-- } + +-- registerKeyBindings(bigHyper, hs.fnutils.map(singleWindowMovements, function(fn) +-- return function() fn() end +-- end)) -------------------------------------------------------------------------------- diff --git a/roles/hammerspoon/tasks/MacOSX.yml b/roles/hammerspoon/tasks/MacOSX.yml index d0f6ea8e..f3d503f1 100644 --- a/roles/hammerspoon/tasks/MacOSX.yml +++ b/roles/hammerspoon/tasks/MacOSX.yml @@ -16,52 +16,52 @@ dest: "{{ ansible_user_dir }}/.hammerspoon" mode: "0644" -- name: "Hammerspoon | MacOSX | Detect local instance of GridLayout.spoon" - ansible.builtin.stat: - name: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" - register: hammerspoon_gridlayout_spoon - -- name: "Hammerspoon | MacOSX | Detect latest GridLayout.spoon Github release" - ansible.builtin.uri: - url: "https://api.github.com/repos/jesseleite/GridLayout.spoon/releases/latest" - return_content: true - register: hammerspoon_gridlayout_release - -- name: "Hammerspoon | MacOSX | Extract latest GridLayout.spoon release version" - ansible.builtin.set_fact: - hammerspoon_gridlayout_latest_version: "{{ hammerspoon_gridlayout_release.json.tag_name }}" - when: hammerspoon_gridlayout_release.status == 200 - -- name: "Hammerspoon | MacOSX | Install latest GridLayout.spoon" - when: not hammerspoon_gridlayout_spoon.stat.exists - block: - - name: "Hammerspoon | MacOSX | Ensure ~/.hammerspoon/Spoons exists" - ansible.builtin.file: - name: "{{ ansible_user_dir }}/.hammerspoon/Spoons" - state: directory - mode: "0755" - - - name: "Hammerspoon | MacOSX | Download latest GridLayout.spoon" - ansible.builtin.uri: - url: "https://github.com/jesseleite/GridLayout.spoon/releases/download/{{ hammerspoon_gridlayout_latest_version }}/GridLayout.spoon.zip" - dest: "{{ ansible_user_dir }}/.hammerspoon/Spoons" - notify: "Hammerspoon | MacOSX | Cleanup latest GridLayout.spoon zip" - - - name: "Hammerspoon | MacOSX | Ensure ~/.hammerspoon/Spoons/GridLayout.spoon exists" - ansible.builtin.file: - name: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" - state: directory - mode: "0755" - - - name: "Hammerspoon | MacOSX | Unzip latest GridLayout.spoon" - ansible.builtin.unarchive: - src: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon.zip" - dest: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" - creates: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" - -- name: "Hammerspoon | MacOSX | Install Official Hammerspoon Spoons" - ansible.builtin.include_tasks: spoons.yml - loop: - - "ReloadConfiguration" - loop_control: - loop_var: current_spoon +# - name: "Hammerspoon | MacOSX | Detect local instance of GridLayout.spoon" +# ansible.builtin.stat: +# name: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" +# register: hammerspoon_gridlayout_spoon +# +# - name: "Hammerspoon | MacOSX | Detect latest GridLayout.spoon Github release" +# ansible.builtin.uri: +# url: "https://api.github.com/repos/jesseleite/GridLayout.spoon/releases/latest" +# return_content: true +# register: hammerspoon_gridlayout_release +# +# - name: "Hammerspoon | MacOSX | Extract latest GridLayout.spoon release version" +# ansible.builtin.set_fact: +# hammerspoon_gridlayout_latest_version: "{{ hammerspoon_gridlayout_release.json.tag_name }}" +# when: hammerspoon_gridlayout_release.status == 200 +# +# - name: "Hammerspoon | MacOSX | Install latest GridLayout.spoon" +# when: not hammerspoon_gridlayout_spoon.stat.exists +# block: +# - name: "Hammerspoon | MacOSX | Ensure ~/.hammerspoon/Spoons exists" +# ansible.builtin.file: +# name: "{{ ansible_user_dir }}/.hammerspoon/Spoons" +# state: directory +# mode: "0755" +# +# - name: "Hammerspoon | MacOSX | Download latest GridLayout.spoon" +# ansible.builtin.uri: +# url: "https://github.com/jesseleite/GridLayout.spoon/releases/download/{{ hammerspoon_gridlayout_latest_version }}/GridLayout.spoon.zip" +# dest: "{{ ansible_user_dir }}/.hammerspoon/Spoons" +# notify: "Hammerspoon | MacOSX | Cleanup latest GridLayout.spoon zip" +# +# - name: "Hammerspoon | MacOSX | Ensure ~/.hammerspoon/Spoons/GridLayout.spoon exists" +# ansible.builtin.file: +# name: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" +# state: directory +# mode: "0755" +# +# - name: "Hammerspoon | MacOSX | Unzip latest GridLayout.spoon" +# ansible.builtin.unarchive: +# src: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon.zip" +# dest: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" +# creates: "{{ ansible_user_dir }}/.hammerspoon/Spoons/GridLayout.spoon" +# +# - name: "Hammerspoon | MacOSX | Install Official Hammerspoon Spoons" +# ansible.builtin.include_tasks: spoons.yml +# loop: +# - "ReloadConfiguration" +# loop_control: +# loop_var: current_spoon