universeair: fonts.fonts -> fonts.packages

Flake lock file updates:

• Updated input 'me-emacs':
    'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=3ac7b61c9f476746489938d708309b7e69eeafd4' (2024-06-16)
  → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=d2df2d938d87216af25639be001ebf531c7c4c2e' (2024-06-27)

flake.lock

@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718551485,
+        "lastModified": 1719516443,
-        "narHash": "sha256-rIAQivtFw0YN3i3xAeBEpCcErA1KGD/IxV7c2VaKIJ8=",
+        "narHash": "sha256-Yk5Y9f2RyMVsgJvnHviQZaa+B44ea6ZhUcJIfT/x2rY=",
         "ref": "refs/heads/master",
-        "rev": "3ac7b61c9f476746489938d708309b7e69eeafd4",
+        "rev": "d2df2d938d87216af25639be001ebf531c7c4c2e",
-        "revCount": 61,
+        "revCount": 65,
         "type": "git",
         "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
       },

machines/hippocampus/riscv.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... ]: {
+{ config, pkgs, lib, ... }: {
   boot.binfmt.emulatedSystems = [
     "riscv64-linux"
   ];

machines/hippocampus/servers/public/hydra.nix

@@ -1,14 +1,4 @@
 {config, pkgs, ...}: let
-  deploy-container = pkgs.writeScriptBin "deploy-nixos-container" ''
-    pushd $2
-    nixos-container update $1 --flake $2#$3
-    git reset --hard HEAD
-    git clean -fdx
-    git reflog expire --expire=now --all
-    git repack -ad  # Remove dangling objects from packfiles
-    git prune       # Remove dangling loose objects
-    popd
-  '';
 in {
   imports = [
     # ./nix-serve.nix
@@ -42,42 +32,13 @@ in {
       
     ];
   };
-  # Deployment User
+  
-  users.users.hydra-deploy = {
-    isNormalUser = true;
-    home = "/var/lib/hydra/deploy";
-    description = "Hydra Deployment User";
-    extraGroups = [ "hydra" ];
-    packages = [
-      deploy-container
-    ];
-  };
-  # TODO: Configure authorizedKeys between
-  # hydra-queue-runner and hydra-deploy
-  security.sudo.extraRules = [
-    {
-      users = ["hydra-deploy"];
-      commands = [
-        {
-          command = "${deploy-container}/bin/deploy-nixos-container *";
-          options = ["NOPASSWD"];
-        }
-      ];
-    }
-  ];
-  networking.nat = {
-    enable = true;
-    internalInterfaces = [
-      "ve-newalan"
-      "ve-handyhelper"
-    ];
-    externalInterface = "enp0s25";
-    enableIPv6 = true;
-  };
-
   nix.buildMachines = [
     { hostName = "localhost";
-      system = "x86_64-linux";
+      systems = [
+        "x86_64-linux"
+        "riscv64-linux"
+      ];
       supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"];
       maxJobs = 8;
     }

machines/universeair/configuration.nix

@@ -43,8 +43,7 @@ in
       };
     };
 
-    fonts.fontDir.enable = true;
+    fonts.packages = with pkgs; [
-    fonts.fonts = with pkgs; [
       julia-mono
       bqn386
     ];
@@ -61,7 +60,7 @@ in
     };
 
     environment.systemPackages = (with pkgs; [
-      mac-emacs
+      me-emacs
       (aspellWithDicts (p: with p;[
         en
         en-computers
@@ -106,10 +105,9 @@ in
         "zoom-for-it-admins"
         "libreoffice"
         "microsoft-office"
-        "prismlauncher"
         "kicad"
         "tailscale"
-        "wine-stable"
+        "r" "rstudio"
       ];
       # Apps to install outside of nix for when wanting to test/run
       # things that... aren't used by other people who use nix, like
@@ -117,6 +115,7 @@ in
       brews = [
         "poetry"
         "python@3.11"
+        "pygments"
         # sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
 	# /Library/Java/JavaVirtualMachines/openjdk.jdk
         "openjdk"

machines/universedesktop/desktop/dwl.nix

@@ -73,6 +73,18 @@ in {
     MOZ_ENABLE_WAYLAND=0;
     GTK_THEME="Adwaita-dark";
   };
+  
+  xdg.portal.wlr = {
+    enable = true;
+    settings = {
+      screencast = {
+        output_name = "DP-2";
+        max_fps = 30;
+        chooser_type = "simple";
+        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+      };
+    };
+  };
 
   environment.systemPackages = with pkgs; [
     dwl

machines/universedesktop/programs/desktop.nix

@@ -24,11 +24,20 @@
       nextcloud-client
       libsForQt5.kdeconnect-kde
 
-      webcord
+      vesktop
       slack
       signal-desktop
       zoom-us
 
       anki
+      (pkgs.wrapOBS {
+        plugins = with pkgs.obs-studio-plugins; [
+          wlrobs
+          obs-backgroundremoval
+          obs-vkcapture
+          input-overlay
+          obs-pipewire-audio-capture
+        ];
+      })
   ];
 }