Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines

flake.nix

@@ -64,7 +64,7 @@
           sops-nix.nixosModules.sops
         ];
     };
-    darwinConfigurations."Universe-MacBook-Air" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       specialArgs = {
         inputs = attrs;

machines/universeair/configuration.nix

@@ -43,6 +43,18 @@ in
       };
     };
 
+    fonts.fontDir.enable = true;
+    fonts.fonts = with pkgs; [
+      julia-mono
+      bqn386
+    ];
+
+    services.emacs = {
+      # Emacsclient behaving weirdly
+      # enable = true;
+      package = pkgs.mac-emacs;
+    };
+
     environment.variables = {
       EDITOR = "emacs";
     };
@@ -58,10 +70,13 @@ in
       texlive.combined.scheme-full
       wget
 
+      xquartz
       kitty
       
       btop
 
+      remmina
+      
       cbqn-replxx
 
       # Graphical Apps:
@@ -85,6 +100,8 @@ in
         "nextcloud"
         "tidal"
         "bitwarden"
+        "zoom-for-it-admins"
+        "libreoffice"
       ];
       # Apps to install outside of nix for when wanting to test/run
       # things that... aren't used by other people who use nix, like

machines/universeair/skhd.nix

@@ -2,8 +2,8 @@
   services.skhd = {
     enable = true;
     skhdConfig = ''
-      cmd + shift - e : open ${pkgs.mac-emacs}/Applications/Emacs.app
+      cmd + shift - e : open '${pkgs.mac-emacs}/Applications/Emacs.app'
-      cmd + shift + ctrl - e : open ${pkgs.kitty}/Applications/Kitty.app
+      cmd + shift + ctrl - e : kitty -d ~ -1
     '';
   };
 }

machines/universeair/yabai.nix

@@ -9,6 +9,7 @@
   ];
   services.yabai = {
     enable = true;
+    enableScriptingAddition = true;
     config = {
       layout = "bsp";
       focus_follows_mouse = "autofocus";
@@ -25,19 +26,7 @@
       yabai -m rule --add app='System Settings' manage=off
       yabai -m rule --add app='Boot Camp Assistant' manage=off
       yabai -m rule --add app='System Information' manage=off
+      yabai -m rule --add title='^Figure' manage=off
     '';
   };
-
-  # https://github.com/IvarWithoutBones/dotfiles/blob/main/modules/darwin/yabai/default.nix
-  # The scripting addition needs root access to load, which we want to do automatically when logging in.
-  # Disable the password requirement for it so that a service can do so without user interaction.
-  environment.etc."sudoers.d/yabai-load-sa".text = ''
-    universelaptop ALL = (root) NOPASSWD: sha256:${builtins.hashFile "sha256" "${pkgs.yabai}/bin/yabai"} ${pkgs.yabai}/bin/yabai
-  '';
-
-  launchd.user.agents.yabai-load-sa = {
-    path = [ pkgs.yabai config.environment.systemPath ];
-    command = "/usr/bin/sudo ${pkgs.yabai}/bin/yabai --load-sa";
-    serviceConfig.RunAtLoad = true;
-  };
 }