modules/common/default.nix

@@ -88,9 +88,8 @@
       settings = {
 
         # Add community Cachix to binary cache
-        substituters = lib.mkIf (!pkgs.stdenv.isDarwin)
-          [ "https://nix-community.cachix.org" ];
-        trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
+        substituters = [ "https://nix-community.cachix.org" ];
+        trusted-public-keys = [
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         ];
 

modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -8,44 +8,44 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
+function DrawSwitcher()
+    -- Drawing
     local width = hs.screen.mainScreen():fullFrame().w
     local switcherWidth = 500
-obj.canvas = hs.canvas.new({
+    local canv = hs.canvas.new({
         x = width / 2 - switcherWidth / 2,
         y = 1,
         h = 3,
         w = switcherWidth,
     })
--- Draw switcher
-obj.canvas[#obj.canvas + 1] = {
+    canv[#canv + 1] = {
         action = "build",
         type = "rectangle",
     }
-obj.canvas[#obj.canvas + 1] = {
+    canv[#canv + 1] = {
         type = "rectangle",
         fillColor = { alpha = 1, red = 0.8, green = 0.6, blue = 0.3 },
         action = "fill",
     }
+    return canv:show()
+end
 
 function obj:init()
     -- Begin launcher mode
     if self.launcher == nil then
         self.launcher = hs.hotkey.modal.new("ctrl", "space")
-
-        print(self.canvas)
-        print(obj.canvas)
     end
 
     -- Behaviors on enter
     function self.launcher:entered()
         -- hs.alert("Entered mode")
-        obj.canvas:show()
+        self.canv = DrawSwitcher()
     end
 
     -- Behaviors on exit
     function self.launcher:exited()
         -- hs.alert("Exited mode")
-        obj.canvas:hide()
+        self.canv:hide()
     end
 
     -- Use escape to exit launcher mode
@@ -54,8 +54,7 @@ function obj:init()
     end)
 
     -- Launcher shortcuts
-    self.launcher:bind("ctrl", "space", function()
-    end)
+    self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
         self:switch("@kitty@")
     end)