Fix emacs tiling

peel · Mar 7, 2024 · 0a883d2 · 0a883d2
1 parent 097b594
commit 0a883d2
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 126 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -67,7 +67,7 @@
             ./modules/nixos/setup
             {
               virtualisation.host.pkgs = nixpkgs.legacyPackages.aarch64-darwin;
-              nixpkgs.pkgs = nixpkgs.legacyPackages.aarch64-linux.pkgs;
+              nixpkgs.config.pkgs = nixpkgs.legacyPackages.aarch64-linux.pkgs;
               virtualisation.sharedDirectories = {
                 wrk = {
                   source = "/Users/peel/wrk";

diff --git a/machines/demo/configuration.nix b/machines/demo/configuration.nix
@@ -38,7 +38,7 @@ in {
   boot.loader.efi.canTouchEfiVariables = true;
   boot.growPartition = true;
   boot.loader.grub.device = pkgs.lib.mkDefault "/dev/vda";
-  hardware.video.hidpi.enable = true;
+  # hardware.video.hidpi.enable = true;
   hardware.opengl = {
     enable = true;
     driSupport = true;

diff --git a/modules/darwin/linux-builder/default.nix b/modules/darwin/linux-builder/default.nix
diff --git a/modules/darwin/setup/default.nix b/modules/darwin/setup/default.nix
@@ -15,5 +15,9 @@
   services.activate-system.enable = true;
   services.nix-daemon.enable = true;
   programs.nix-index.enable = true;
+  nix.linux-builder = {
+    enable = true;
+    systems = [ "aarch64-linux" ];
+  };
   nixpkgs.config.allowBroken = false;
 }
diff --git a/modules/darwin/setup/wm.nix b/modules/darwin/setup/wm.nix
@@ -40,10 +40,11 @@ in {
     yabai -m config right_padding                 0
     yabai -m config window_gap                    0
 
-    yabai -m rule --add app="emacs" title!="(^$|${captureTitle})" manage="on"
+
+    yabai -m rule --add app="emacs" role="AXTextField" subrole="AXStandardWindow" manage="on"
     # grid="<rows>:<cols>:<start-x>:<start-y>:<width>:<height>"
-    yabai -m rule --add app="emacs" title="^${captureTitle}$" manage="off" sticky="on" grid="1:2:1:1:4:4"
-    yabai -m rule --add app="Synology Surveillance Station Client" sticky="on" grid="1:4:3:0:1:1"
+    # yabai -m rule --add app="emacs" role="AXTextField" subrole="AXStandardWindow" title="^${captureTitle}$" manage="off" sticky="on" grid="1:2:1:1:4:4"
+    yabai -m rule --add app="Synology Surveillance Station Client" sticky="on" grid="4:4:3:0:1:1"
     yabai -m rule --add app="Dash"                manage="off"
     yabai -m rule --add app="1Password"           manage="off"
     yabai -m rule --add app="System Preferences"  manage="off"