Compare commits
No commits in common. "9a4c10442aca986460f928df79241625be90f95c" and "46f71fabdd3e80892120c80e21333b271b95dd6c" have entirely different histories.
9a4c10442a
...
46f71fabdd
@ -1,15 +0,0 @@
|
||||
(function()
|
||||
local hyper = { "ctrl", "alt", "cmd" }
|
||||
|
||||
-- move window to next screen
|
||||
hs.hotkey.bind(hyper, "N", function()
|
||||
local win = hs.window.focusedWindow()
|
||||
win:moveToScreen(win:screen():next())
|
||||
end)
|
||||
|
||||
for i = 1, 3 do
|
||||
hs.hotkey.bind(hyper, "pad" .. i, function()
|
||||
hs.window.focusedWindow():moveToScreen(i)
|
||||
end)
|
||||
end
|
||||
end)()
|
||||
@ -1,153 +1,156 @@
|
||||
(function()
|
||||
hs.window.animationDuration = 0
|
||||
hs.window.setShadows(false)
|
||||
local hyper = { "ctrl", "alt", "cmd" }
|
||||
hs.window.animationDuration = 0
|
||||
hs.window.setShadows(false)
|
||||
local hyper = { "ctrl", "alt", "cmd" }
|
||||
|
||||
local wm = {
|
||||
sizes = { 1 / 2, 2 / 3, 1 / 3 },
|
||||
-- move window to next screen
|
||||
hs.hotkey.bind(hyper, "N", function()
|
||||
local win = hs.window.focusedWindow()
|
||||
win:moveToScreen(win:screen():next())
|
||||
end)
|
||||
|
||||
local wm = {
|
||||
sizes = { 1 / 2, 2 / 3, 1 / 3 },
|
||||
}
|
||||
|
||||
function wm:_nextStep(dim, offs, cb)
|
||||
if hs.window.focusedWindow() then
|
||||
local axis = dim == "w" and "x" or "y"
|
||||
local oppDim = dim == "w" and "h" or "w"
|
||||
local oppAxis = dim == "w" and "y" or "x"
|
||||
local win = hs.window.frontmostWindow()
|
||||
local screen = win:screen()
|
||||
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
local nextSize = self.sizes[1]
|
||||
for i = 1, #self.sizes do
|
||||
if
|
||||
cell[dim] == self.GRID[dim] * self.sizes[i]
|
||||
and (cell[axis] + (offs and cell[dim] or 0)) == (offs and self.GRID[dim] or 0)
|
||||
then
|
||||
nextSize = self.sizes[(i % #self.sizes) + 1]
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
cb(cell, nextSize)
|
||||
if cell[oppAxis] ~= 0 and cell[oppAxis] + cell[oppDim] ~= self.GRID[oppDim] then
|
||||
cell[oppDim] = self.GRID[oppDim]
|
||||
cell[oppAxis] = 0
|
||||
end
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
end
|
||||
end
|
||||
|
||||
function wm:_fullscreen()
|
||||
if hs.window.focusedWindow() then
|
||||
local win = hs.window.frontmostWindow()
|
||||
local screen = win:screen()
|
||||
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
cell.x = 0
|
||||
cell.y = 0
|
||||
cell.w = self.GRID.w
|
||||
cell.h = self.GRID.h
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
end
|
||||
end
|
||||
|
||||
function wm:_fullDimension(dim)
|
||||
if hs.window.focusedWindow() then
|
||||
local win = hs.window.frontmostWindow()
|
||||
local id = win:id()
|
||||
local screen = win:screen()
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
if dim == "x" then
|
||||
cell = "0,0 " .. self.GRID.w .. "x" .. self.GRID.h
|
||||
else
|
||||
cell[dim] = self.GRID[dim]
|
||||
cell[dim == "w" and "x" or "y"] = 0
|
||||
end
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
end
|
||||
end
|
||||
|
||||
function wm:init()
|
||||
self._pressed = {
|
||||
up = false,
|
||||
down = false,
|
||||
left = false,
|
||||
right = false,
|
||||
}
|
||||
self.GRID = { w = 24, h = 24 }
|
||||
|
||||
function wm:_nextStep(dim, offs, cb)
|
||||
if hs.window.focusedWindow() then
|
||||
local axis = dim == "w" and "x" or "y"
|
||||
local oppDim = dim == "w" and "h" or "w"
|
||||
local oppAxis = dim == "w" and "y" or "x"
|
||||
local win = hs.window.frontmostWindow()
|
||||
local screen = win:screen()
|
||||
hs.grid.setGrid(self.GRID.w .. "x" .. self.GRID.h)
|
||||
hs.grid.MARGINX = 0
|
||||
hs.grid.MARGINY = 0
|
||||
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
local nextSize = self.sizes[1]
|
||||
for i = 1, #self.sizes do
|
||||
if
|
||||
cell[dim] == self.GRID[dim] * self.sizes[i]
|
||||
and (cell[axis] + (offs and cell[dim] or 0)) == (offs and self.GRID[dim] or 0)
|
||||
then
|
||||
nextSize = self.sizes[(i % #self.sizes) + 1]
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
cb(cell, nextSize)
|
||||
if cell[oppAxis] ~= 0 and cell[oppAxis] + cell[oppDim] ~= self.GRID[oppDim] then
|
||||
cell[oppDim] = self.GRID[oppDim]
|
||||
cell[oppAxis] = 0
|
||||
end
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
hs.hotkey.bind(hyper, "down", function()
|
||||
self._pressed.down = true
|
||||
if self._pressed.up then
|
||||
self:_fullDimension("h")
|
||||
else
|
||||
self:_nextStep("h", true, function(cell, nextSize)
|
||||
cell.y = self.GRID.h - self.GRID.h * nextSize
|
||||
cell.h = self.GRID.h * nextSize
|
||||
end)
|
||||
end
|
||||
end
|
||||
end, function()
|
||||
self._pressed.down = false
|
||||
end)
|
||||
|
||||
function wm:_fullscreen()
|
||||
if hs.window.focusedWindow() then
|
||||
local win = hs.window.frontmostWindow()
|
||||
local screen = win:screen()
|
||||
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
cell.x = 0
|
||||
cell.y = 0
|
||||
cell.w = self.GRID.w
|
||||
cell.h = self.GRID.h
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
hs.hotkey.bind(hyper, "right", function()
|
||||
self._pressed.right = true
|
||||
if self._pressed.left then
|
||||
self:_fullDimension("w")
|
||||
else
|
||||
self:_nextStep("w", true, function(cell, nextSize)
|
||||
cell.x = self.GRID.w - self.GRID.w * nextSize
|
||||
cell.w = self.GRID.w * nextSize
|
||||
end)
|
||||
end
|
||||
end
|
||||
end, function()
|
||||
self._pressed.right = false
|
||||
end)
|
||||
|
||||
function wm:_fullDimension(dim)
|
||||
if hs.window.focusedWindow() then
|
||||
local win = hs.window.frontmostWindow()
|
||||
local id = win:id()
|
||||
local screen = win:screen()
|
||||
local cell = hs.grid.get(win, screen)
|
||||
|
||||
if dim == "x" then
|
||||
cell = "0,0 " .. self.GRID.w .. "x" .. self.GRID.h
|
||||
else
|
||||
cell[dim] = self.GRID[dim]
|
||||
cell[dim == "w" and "x" or "y"] = 0
|
||||
end
|
||||
|
||||
hs.grid.set(win, cell, screen)
|
||||
hs.hotkey.bind(hyper, "left", function()
|
||||
self._pressed.left = true
|
||||
if self._pressed.right then
|
||||
self:_fullDimension("w")
|
||||
else
|
||||
self:_nextStep("w", false, function(cell, nextSize)
|
||||
cell.x = 0
|
||||
cell.w = self.GRID.w * nextSize
|
||||
end)
|
||||
end
|
||||
end
|
||||
end, function()
|
||||
self._pressed.left = false
|
||||
end)
|
||||
|
||||
function wm:init()
|
||||
self._pressed = {
|
||||
up = false,
|
||||
down = false,
|
||||
left = false,
|
||||
right = false,
|
||||
}
|
||||
self.GRID = { w = 24, h = 24 }
|
||||
hs.hotkey.bind(hyper, "up", function()
|
||||
self._pressed.up = true
|
||||
if self._pressed.down then
|
||||
self:_fullDimension("h")
|
||||
else
|
||||
self:_nextStep("h", false, function(cell, nextSize)
|
||||
cell.y = 0
|
||||
cell.h = self.GRID.h * nextSize
|
||||
end)
|
||||
end
|
||||
end, function()
|
||||
self._pressed.up = false
|
||||
end)
|
||||
|
||||
hs.grid.setGrid(self.GRID.w .. "x" .. self.GRID.h)
|
||||
hs.grid.MARGINX = 0
|
||||
hs.grid.MARGINY = 0
|
||||
hs.hotkey.bind(hyper, "m", function()
|
||||
self:_fullscreen()
|
||||
end)
|
||||
end
|
||||
|
||||
hs.hotkey.bind(hyper, "down", function()
|
||||
self._pressed.down = true
|
||||
if self._pressed.up then
|
||||
self:_fullDimension("h")
|
||||
else
|
||||
self:_nextStep("h", true, function(cell, nextSize)
|
||||
cell.y = self.GRID.h - self.GRID.h * nextSize
|
||||
cell.h = self.GRID.h * nextSize
|
||||
end)
|
||||
end
|
||||
end, function()
|
||||
self._pressed.down = false
|
||||
end)
|
||||
wm:init()
|
||||
|
||||
hs.hotkey.bind(hyper, "right", function()
|
||||
self._pressed.right = true
|
||||
if self._pressed.left then
|
||||
self:_fullDimension("w")
|
||||
else
|
||||
self:_nextStep("w", true, function(cell, nextSize)
|
||||
cell.x = self.GRID.w - self.GRID.w * nextSize
|
||||
cell.w = self.GRID.w * nextSize
|
||||
end)
|
||||
end
|
||||
end, function()
|
||||
self._pressed.right = false
|
||||
end)
|
||||
|
||||
hs.hotkey.bind(hyper, "left", function()
|
||||
self._pressed.left = true
|
||||
if self._pressed.right then
|
||||
self:_fullDimension("w")
|
||||
else
|
||||
self:_nextStep("w", false, function(cell, nextSize)
|
||||
cell.x = 0
|
||||
cell.w = self.GRID.w * nextSize
|
||||
end)
|
||||
end
|
||||
end, function()
|
||||
self._pressed.left = false
|
||||
end)
|
||||
|
||||
hs.hotkey.bind(hyper, "up", function()
|
||||
self._pressed.up = true
|
||||
if self._pressed.down then
|
||||
self:_fullDimension("h")
|
||||
else
|
||||
self:_nextStep("h", false, function(cell, nextSize)
|
||||
cell.y = 0
|
||||
cell.h = self.GRID.h * nextSize
|
||||
end)
|
||||
end
|
||||
end, function()
|
||||
self._pressed.up = false
|
||||
end)
|
||||
|
||||
hs.hotkey.bind(hyper, "m", function()
|
||||
self:_fullscreen()
|
||||
end)
|
||||
end
|
||||
|
||||
wm:init()
|
||||
|
||||
hs.notify.show("Welcome to Hammerspoon", "Have fun!", "")
|
||||
|
||||
end)()
|
||||
hs.notify.show("Welcome to Hammerspoon", "Have fun!", "")
|
||||
|
||||
@ -43,7 +43,6 @@ in
|
||||
"${homedir}/.hammerspoon/init.lua" = {
|
||||
text = ''
|
||||
${builtins.readFile ./hammerspoon/window-tiling.lua}
|
||||
${builtins.readFile ./hammerspoon/window-move.lua}
|
||||
'';
|
||||
};
|
||||
};
|
||||
@ -136,10 +135,11 @@ in
|
||||
launchd.agents.keepass-sync = {
|
||||
enable = true;
|
||||
config = {
|
||||
Program = "${pkgs.writeShellScript "keepass-sync" ''
|
||||
${pkgs.coreutils}/bin/cp "${homedir}/storage/.macshare/.secret/arnie.kdbx" "${homedir}/.secret/arnie.kdbx"
|
||||
''}";
|
||||
ProgramArguments = [];
|
||||
Program = /bin/cp;
|
||||
ProgramArguments = [
|
||||
"${homedir}/storage/.macshare/.secret/arnie.kdbx"
|
||||
"${homedir}/arnie.kdbx"
|
||||
];
|
||||
StartInterval = 60 * 10;
|
||||
StandardErrorPath = "/var/log/keepass-sync.error.log";
|
||||
StandardOutPath = "/var/log/keepass-sync.out.log";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user