Disable hydra/checks

Flake lock file updates:

• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/6bc76b872374845ba9d645a2f012b764fecd765f' (2025-06-05)
  → 'github:serokell/deploy-rs/9c870f63e28ec1e83305f7f6cb73c941e699f74f' (2025-11-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/e4bf85da687027cfc4a8853ca11b6b86ce41d732' (2025-07-21)
  → 'github:nix-community/home-manager/f35d0cb75f0669ac8de18d774b336d3d3560bcde' (2025-11-06)
• Updated input 'lix-module':
    'b90bf629bb.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D' (2025-01-18)
  → 'b90bf629bb.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D&rev=b90bf629bbd835e61f1317b99e12f8c831017006' (2025-01-18)
• Updated input 'me-emacs':
    'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=14454885f19e63584cc3ce557e97488541f15883' (2025-03-20)
  → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=71bb31643363b4a42948505d41f4e1c83a21c868' (2025-09-04)
• Updated input 'microvm':
    'github:astro/microvm.nix/5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf' (2025-07-21)
  → 'github:astro/microvm.nix/1d05a3c26dbb9d4b1cd644e10713a70d8740cb6a' (2025-11-03)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=37c8663fab86fdb202fece339ef7ac7177ffc201' (2025-06-30)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=c5d5786d3dc938af0b279c542d1e43bce381b4b9' (2025-10-03)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/e04a388232d9a6ba56967ce5b53a8a6f713cdfcf' (2025-06-30)
  → 'github:LnL7/nix-darwin/b8c7ac030211f18bd1f41eae0b815571853db7a2' (2025-11-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19)
  → 'github:NixOS/nixpkgs/b3d51a0365f6695e7dd5cdf3e180604530ed33b4' (2025-11-02)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/2c8def626f54708a9c38a5861866660395bb3461' (2025-07-15)
  → 'github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3' (2025-10-20)
• Updated input 'sops-nix/nixpkgs':
    'github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c' (2025-04-17)
  → 'github:NixOS/nixpkgs/3cbe716e2346710d6e1f7c559363d14e11c32a43' (2025-10-16)

flake.lock

@@ -1,38 +1,51 @@
 {
   "nodes": {
-    "emacs-overlay": {
+    "deploy-rs": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-compat": "flake-compat",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "me-emacs",
+        "utils": "utils"
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1692037570,
+        "lastModified": 1762286984,
-        "narHash": "sha256-bvj/wfLLFTc8cWAwhN8tgShiy8ekPWt1+gWlEH7W4zY=",
+        "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
-        "owner": "nix-community",
+        "owner": "serokell",
-        "repo": "emacs-overlay",
+        "repo": "deploy-rs",
-        "rev": "7a4b5bbc06182e2f704630cd77a614ab0d9c2f2e",
+        "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "serokell",
-        "repo": "emacs-overlay",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1731533236,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -43,14 +56,14 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1731533236,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -59,6 +72,39 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -66,11 +112,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721852138,
+        "lastModified": 1762458864,
-        "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
+        "narHash": "sha256-O8NI0pOf1GxPaBRhyspWZmtXLo0tzEEvOfMxNh3/8Jo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
+        "rev": "f35d0cb75f0669ac8de18d774b336d3d3560bcde",
         "type": "github"
       },
       "original": {
@@ -79,20 +125,54 @@
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737234286,
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737237494,
+        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
+        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
+      }
+    },
     "me-emacs": {
       "inputs": {
-        "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1720981146,
+        "lastModified": 1757014957,
-        "narHash": "sha256-UsyP+WaOY1S9p0EIGJOCBIQ7VSZ8HbN5Gs5wSp8prR8=",
+        "narHash": "sha256-iPw1uXPUb4mPSZ/Uneop+1veSN5fEYCrsJwq71zLADs=",
         "ref": "refs/heads/master",
-        "rev": "031084e3c685a5247536cc94b55d2887640658d3",
+        "rev": "71bb31643363b4a42948505d41f4e1c83a21c868",
-        "revCount": 68,
+        "revCount": 88,
         "type": "git",
         "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
       },
@@ -101,6 +181,28 @@
         "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
       }
     },
+    "microvm": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "spectrum": "spectrum"
+      },
+      "locked": {
+        "lastModified": 1762200934,
+        "narHash": "sha256-Bv4ZKRPsIc6W7qF1I2fevxFETqRNuG3XOsiRIfJ7YlQ=",
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "rev": "1d05a3c26dbb9d4b1cd644e10713a70d8740cb6a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -108,11 +210,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721719500,
+        "lastModified": 1762304480,
-        "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
+        "narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
+        "rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2",
         "type": "github"
       },
       "original": {
@@ -124,11 +226,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721562059,
+        "lastModified": 1743014863,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
+        "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+        "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -138,45 +256,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1691950488,
+        "lastModified": 1760596604,
-        "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=",
+        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "720e61ed8de116eec48d6baea1d54469b536b985",
+        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1721524707,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1721466660,
-        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
         "type": "github"
       },
       "original": {
@@ -188,24 +274,26 @@
     },
     "root": {
       "inputs": {
+        "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
+        "lix-module": "lix-module",
         "me-emacs": "me-emacs",
+        "microvm": "microvm",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3"
-        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1721688883,
+        "lastModified": 1760998189,
-        "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
         "type": "github"
       },
       "original": {
@@ -214,6 +302,22 @@
         "type": "github"
       }
     },
+    "spectrum": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1759482047,
+        "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=",
+        "ref": "refs/heads/main",
+        "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9",
+        "revCount": 996,
+        "type": "git",
+        "url": "https://spectrum-os.org/git/spectrum"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://spectrum-os.org/git/spectrum"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -243,6 +347,54 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -8,9 +8,16 @@
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    microvm.url = "github:astro/microvm.nix";
+    microvm.inputs.nixpkgs.follows = "nixpkgs";
+    deploy-rs.url = "github:serokell/deploy-rs";
   };
   
-  outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@inputs: let
+  outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager, lix-module, microvm, deploy-rs }@inputs: let
     overlays = import ./overlays/default.nix inputs;
     modules = import ./modules/default.nix inputs;
 
@@ -41,10 +48,12 @@
         modules =[
           ./machines/hippocampus/configuration.nix
           (overlays' [
-            overlays.hydra
             overlays.nvidiaContainer
           ])
           modules.sops
+          ({ pkgs, ...}: {
+            nix.package = pkgs.lix;
+          })
         ];
       };
       universedesktop = nixosSystem' {
@@ -54,6 +63,16 @@
             overlays.emacs
           ])
           modules.sops
+          # Broken w/ this nixpkgs input
+          # lix-module.nixosModules.default
+        ];
+      };
+      pericyte = nixosSystem' {
+        modules = [
+          ./machines/pericyte/configuration.nix
+          modules.sops
+          # lix-module.nixosModules.default
+          # microvm.nixosModules.host
         ];
       };
     };
@@ -65,6 +84,7 @@
             overlays.emacs
           ])
           modules.home-manager-darwin
+          # lix-module.nixosModules.default
         ];
       };
     };
@@ -82,5 +102,24 @@
         ];
       };
     };
+
+    deploy = {
+      nodes = {
+        pericyte = {
+          hostname = "opcp";
+          sshUser = "root";
+          profiles.system = {
+            user = "root";
+            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.pericyte;
+          };
+        };
+      };
+    };
+    # This is highly advised, and will prevent many possible mistakes
+    # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+
+    hydraJobs = {
+      # inherit (me-emacs) packages;
+    };
   };
 }

machines/hippocampus/backups/gitea.nix

@@ -1,6 +1,24 @@
-{ ... }: {
+{ pkgs, config, ... }: {
   services.gitea.dump = {
     enable = true;
     interval = "2:45";
   };
+  systemd.timers."gitea-clear-dump" = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnCalendar = "daily";
+      Persistent = true;
+      Unit = "gitea-clear-dump.service";
+    };
+  };
+
+  systemd.services."gitea-clear-dump" = {
+    script = ''
+      ${pkgs.findutils}/bin/find /var/lib/gitea/dump -type f -ctime +5 -exec rm -f {} \;
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      User = config.services.gitea.user;
+    };
+  };
 }

machines/hippocampus/configuration.nix

@@ -79,8 +79,10 @@
 
   # Configure keymap in X11
   services.xserver = {
+    xkb = {
       layout = "us";
-    xkbVariant = "";
+      variant = "";
+    };
   };
 
   # Enable CUPS to print documents.

machines/hippocampus/modules/headscale.nix

@@ -68,7 +68,7 @@ let
       partOf = ["headscale.service"];
 
       script = ''
-        ${cfg.package}/bin/headscale users create ${name}
+        ${pkgs.bash}/bin/bash -c '${cfg.package}/bin/headscale users create ${name} || true'
       '';
 
       serviceConfig = {
@@ -91,7 +91,7 @@ let
       partOf = ["headscale.service"];
 
       script = ''
-        ${cfg.package}/bin/headscale preauthkeys -u ${name} create \
+        ${cfg.package}/bin/headscale preauthkeys -u $(${cfg.package}/bin/headscale users -o json-line list | ${pkgs.jq}/bin/jq '.[] | select(.name=="${name}").id') create \
           ${lib.optionalString options.preAuthEphemeral "--ephemeral"} \
           ${lib.optionalString options.preAuthReusable "--reusable"} \
           --expiration ${options.preAuthExpiration} \

machines/hippocampus/nvidia.nix

@@ -6,7 +6,7 @@
   nixpkgs.config.nvidia.acceptLicense = true;
 
   services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   # Optionally, you may need to select the appropriate driver version for your specific GPU.
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;

machines/hippocampus/oci/Wireguard.ContainerFile

@@ -0,0 +1,5 @@
+FROM alpine:3.16
+RUN apk add --no-cache bash wireguard-tools jq curl git ncurses
+RUN git clone https://github.com/pia-foss/manual-connections /manual-connections
+WORKDIR /manual-connections
+CMD bash -c "/manual-connections/run_setup.sh && watch -n 60 curl ip.me"

machines/hippocampus/oci/jelly.nix

@@ -18,10 +18,12 @@
     in {
       containers = {
         wireguard = {
-          image = "thrnz/docker-wireguard-pia";
+          # Derived from the pia-wg.tar.gz
+          # which was built from the containerfile
+          image = "localhost/pia-wg:latest";
           volumes = [
             # "${configDir}/wireguard:/config"
-            "${configDir}/wireguard_pia:/pia"
+            # "${configDir}/wireguard_pia:/pia"
           ];
           ports = getPorts [
             "deluge"
@@ -35,12 +37,22 @@
           environment = {
             TZ = "America/Toronto";
        	    LOC = "ca";
+            PIA_DNS = "false"; # - true/false
+            PIA_PF = "false"; # - true/false
+            PIA_CONNECT = "true"; # - true/false; connect to VPN after configuration has been created. Set to false to only create configuration file. Only effective for wireguard protocol. Default true.
+            MAX_LATENCY = "0.2"; # - numeric value, in seconds
+            AUTOCONNECT = "true"; # - true/false; this will test for and select the server with the lowest latency, it will override PREFERRED_REGION
+            # PREFERRED_REGION = ""; # - the region ID for a PIA server
+            DIP_TOKEN = "n";
+            VPN_PROTOCOL = "wireguard"; # - wireguard or openvpn; openvpn will default to openvpn_udp_standard, but can also specify openvpn_tcp/udp_standad/strong
+            DISABLE_IPV6 = "no"; # - yes/no
           };
           extraOptions = [
-            "--cap-add=ALL"
+            "--privileged" "--dns=1.1.1.1"
-            "--pull=newer"
-            "--dns=1.1.1.1"
             "--env-file=${config.sops.secrets.jellyfin-pia.path}"
+            "--cap-add=NET_ADMIN,NET_RAW,SYS_MODULE"
+            "--cap-drop=MKNOD,AUDIT_WRITE"
+            "--sysctl=net.ipv4.ip_forward=1"
             "--sysctl=net.ipv4.conf.all.src_valid_mark=1"
             "--sysctl=net.ipv6.conf.lo.disable_ipv6=1"
             "--sysctl=net.ipv6.conf.all.disable_ipv6=1"

machines/hippocampus/riscv.nix

@@ -2,4 +2,5 @@
   boot.binfmt.emulatedSystems = [
     "riscv64-linux"
   ];
+  boot.binfmt.preferStaticEmulators = true;
 }

machines/hippocampus/secrets/pass.yaml

@@ -1,7 +1,7 @@
 nextcloud:
     adminPass: ENC[AES256_GCM,data:D2SAD/Somvw8abIm0KX4fWRfuQ==,iv:Y7K14yZZFcu97KVBd0219hwnGY4LEX2DNxxulSegr/8=,tag:aRJAlz1xvQxWodcE2bZLdQ==,type:str]
     s3secret: ENC[AES256_GCM,data:lIVuiZMh376MSuu13UPCu49Q64bVbk+WM/CUEIGzV0Q=,iv:J2vHalppWEupWK07zXsMoiH6avmpsgg0Cqcc7EkZVV4=,tag:pxKwiaH5SZa8Vh71gLGQWw==,type:str]
-jellyfin-pia: ENC[AES256_GCM,data:rbqpmm2EtxcMeJfjlGaJOwPCn4UAZaKsH8Zeztk7A6QiSw==,iv:8A6NHVHgKIL6iwLKgRrT6T3k0pgDI5lL5rDMN5/Egrw=,tag:P6Kh9cOnrB23Z7S72xBK7g==,type:str]
+jellyfin-pia: ENC[AES256_GCM,data:hOgUAr47FMd2QgzgXBeqv41Paqy6zn6tyWVDbF1JtqcTog/zZC4=,iv:opnxrycFszAhuMARcP48gKF6eL1ERNgWS68wO+s4CIM=,tag:fqimxKdTAh55ANKD3bp46w==,type:str]
 ddclient: ENC[AES256_GCM,data:a31MKnoEZXrj/s8z3+MP9jhQ5/sBjljZphXBJsWj5GU=,iv:YHKCartadDQa59aUf9Fw/KgdgMgsqsVLDAIh/KeqehQ=,tag:hUaUqjcX75xw6eC9axtQmw==,type:str]
 anki: ENC[AES256_GCM,data:hUBKr/s1DDorlmbHDUvHtVSumw==,iv:Ekjt6dsncinHhM+dV/mxOjErBQpgKtPOVbmwGRy9XOE=,tag:zvfV9z3QROgsk4eznmxqDw==,type:str]
 tandoor-secret: ENC[AES256_GCM,data:/clEIU38M7lJ6+JbFSKWb5kKSUvxdGYPq2Hl9TjgijZtYIYFOleJQ9PiT+d/osmY/r0=,iv:Nulu93V+s9RBmEDRs2LXJXy7l0O/AeU0CwwtTNLGw2c=,tag:brRyVaWeUGLx1nt0MtcIEw==,type:str]
@@ -14,10 +14,6 @@ restic:
     passwd: ENC[AES256_GCM,data:vUsAP5+iZo7U55xnUP7Cnk1OxnrO+paHKmT2cuc=,iv:GF7fybEQZIxHPm1Z6Sj5dn/zOR5dRVgikH8LILsTMIs=,tag:Mh61boRPsfHeiSfXmrEx5Q==,type:str]
     backblaze: ENC[AES256_GCM,data:IfWzuIYUrCGYpP68CPFi2vLqq9NVmiVyCE+Z8yi+cnaQwgwNL40lJEPL/U3d0lgsmrsV4GheNJ0oQ9tnrrJeBgZgwMl/CwXMctuUHo+cvVot/cNRd1vCdjRr7WUnw8737uxyW45OaaYbkZRa3NWEGDll1iFDWB2w4n5DTsomyO03tFZB5gckwQYmpjYmK4DcIWyTaEiDrznmkyM+sxoWv9pcTHZIIN7TCHHkzmlMzXXqJnoRfCpdVm/QF9jbrAYs,iv:tOa1FFyggm0ScoRdFk6tACOnQVcZMYaDqeJyX5SMKXc=,tag:EY5jQhZnLP6IzqY9garoEQ==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1crymppz88etsdjpckmtdhr397x5xg5wv8jt6tcj23gt2snq73pzs04fuve
           enc: |
@@ -28,8 +24,7 @@ sops:
             RVUzMlFya3Z0amdTUTJ5YjFRck5kZzQKoWZzExqzPRpQPL4CdqBalc1/dYtjBH6J
             LGR0oImfOWlIJwcaJLv/fc470UvXHHwIji9v/pbV7xMkgMjlJthaYg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-26T02:45:21Z"
+    lastmodified: "2025-07-19T19:15:37Z"
-    mac: ENC[AES256_GCM,data:t5+2iRUJprwwW8GRiQx/h8IOYjjhsq+954GDL2ujXiZVM3oBhESdeBi6aMMwsqABCr+PjP4gb4qHHbduxWlGSZlAh4HSiVwwizI8XV8HZqUqPKBJEqRThzcwznCk4DOGpf1PMbktBX/r50pDeoDcgShKka1bMY8kD385SVklgNE=,iv:EXFXz12HNTMRoW0gIrTEZPHhdTG2cxaWf65uTgT7nZ4=,tag:5XweTiLnO9N8eZb4EPkh6g==,type:str]
+    mac: ENC[AES256_GCM,data:RPGKe5f+5GUnGK3zybRrTnd8N4TprLWBEWLI2HI68Acf1MlJ1AMOWOhpi5xa0Hkxpah8D/d0CEH2ymaO5EBSUamPdYThI4g/4cxNBXboKnALSf91ZUty86/1+14TbI6vFCZ5ghjB4THxszGf47ajIDa/TjHx0yHFWDi7rpApmcw=,iv:ep/NlJfkIkQe5RJ4U2YfZ7/0S4vWqxjg+xrLLnJwfwI=,tag:c01jey2juzoPKux7n/0rug==,type:str]
-    pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.10.2

machines/hippocampus/servers/private.nix

@@ -13,15 +13,15 @@
     # ./private/grafana.nix
     
     # Home Monitoring and Control
-    ./private/homeassistant.nix
+    # ./private/homeassistant.nix
 
     # Minio S3 Object Storage
     ./private/miniio.nix
 
     # OctoPrint
-    ./private/octoprint.nix
+    # ./private/octoprint.nix
 
     # Samba Share
-    ./private/samba.nix
+    # ./private/samba.nix
   ];
 }

machines/hippocampus/servers/public.nix

@@ -6,9 +6,6 @@
     # Entrace to Control Pane of Private Network
     ./public/headscale.nix
 
-    # Location tracking of my Dad in Saskatchewan
-    ./public/hauk.nix
-    
     # Self Hosted Git Server
     ./public/gitea.nix
 
@@ -28,7 +25,7 @@
     ./public/nextcloud.nix
 
     # Rabb.it at home
-    ./public/watchthingz.nix
+    # ./public/watchthingz.nix
 
     # Pterodactyl Game Server
     ./public/pterodactyl.nix
@@ -47,5 +44,11 @@
 
     # Recipe Manager
     ./public/tandoor.nix
+
+    # Random Usage, specific port
+    ./public/random.nix
+
+    # Perfect Pitch Project
+    ./public/perfect_pitch.nix
   ];
 }

machines/hippocampus/servers/public/anki.nix

@@ -4,6 +4,8 @@
   sops.secrets.anki = { };
   services.anki-sync-server = {
     enable = true;
+    port   = 7333;
+    address = "0.0.0.0";
     users = [
       {
         username = "David";

machines/hippocampus/servers/public/gitea.nix

@@ -35,7 +35,7 @@ in {
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "gitea"
     ];

machines/hippocampus/servers/public/hauk.nix

@@ -1,14 +0,0 @@
-{pkgs, config, ...}:
-
-{
-  imports = [
-    ../../oci/hauk.nix
-  ];
-  services.caddy.virtualHosts = {
-    "crompton.cc" = {
-	    extraConfig = ''
-        reverse_proxy 127.0.0.1:7888
-      '';           
-    };
-  };
-}

machines/hippocampus/servers/public/headscale.nix

@@ -23,9 +23,12 @@
       ];
 
       # Give a name to each device
-      dns_config = {
+      dns = {
         base_domain = "tailnet";
         magic_dns = true;
+        nameservers.global = [
+          "1.1.1.1"
+        ];
       };
     };
   };

machines/hippocampus/servers/public/hydra.nix

@@ -17,7 +17,7 @@ in {
     '';
   };
   nix.extraOptions = ''
-    allowed-uris = https://github.com/ https://git.savannah.gnu.org/ https://git.syzygial.cc https://gitlab.com https://sr.ht github: gitlab:
+    allowed-uris = https://github.com/ https://git.savannah.gnu.org/ https://git.syzygial.cc https://gitlab.com https://sr.ht github: gitlab: https://git.lix.systems
   '';
   systemd.services.hydra = {
     serviceConfig = {

machines/hippocampus/servers/public/nextcloud.nix

@@ -13,17 +13,16 @@ in {
   
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud28;
+    package = pkgs.nextcloud32;
     hostName = "localhost";
-    extraOptions = {
+    settings = {
       trusted_domains = [
         "cloud.crompton.cc"
         "nextcloud.syzygial.cc"
       ];
     
       trusted_proxies = [
-        "cloud.crompton.cc"
+        "127.0.0.1"
-        "nextcloud.syzygial.cc"
       ];      
 
       overwriteprotocol = "https";
@@ -76,7 +75,7 @@ in {
     shell = pkgs.bashInteractive;
     packages = with pkgs; [
       # generate video thumbnails with preview generator
-      ffmpeg_5-headless
+      ffmpeg_7-headless
       # required for recognize app
       nodejs_20 # runtime and installation requirement
       nodejs_20.pkgs.node-pre-gyp # installation requirement
@@ -99,7 +98,7 @@ in {
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "nextcloud"
     ];

machines/hippocampus/servers/public/nextcloud/onlyoffice.nix

@@ -36,7 +36,7 @@
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "onlyoffice"
     ];

machines/hippocampus/servers/public/perfect_pitch.nix

@@ -0,0 +1,52 @@
+{config, pkgs, ...}:
+
+{
+  systemd.targets.machines.enable = true;
+  systemd.services."perfectpitch-container" = {
+    enable = true;
+    wantedBy = ["machines.target"];
+    environment = {
+      # SYSTEMD_NSPAWN_USE_CGNS = "0";
+    };
+    script = ''
+      exec ${config.systemd.package}/bin/systemd-nspawn --hostname perfectpitch \
+        --resolv-conf=off --system-call-filter="add_key keyctl bpf" --bind /dev/fuse \
+        -nbD /var/lib/machines/perfectpitch --machine perfectpitch
+    '';
+    postStart = ''
+      ${pkgs.iproute2}/bin/ip link set ve-perfectpitch up || true
+      ${pkgs.iproute2}/bin/ip addr add 10.2.0.0 dev ve-perfectpitch || true
+      ${pkgs.iproute2}/bin/ip route add 10.2.0.1 dev ve-perfectpitch || true
+    '';
+    serviceConfig = {
+      Type = "notify";
+      Slice = "machine.slice";
+      Delegate = true;
+      DeviceAllow = "/dev/fuse rwm";
+    };
+  };
+  networking.nat = {
+    enable = true;
+    # Check for hostBridge use vb instead of ve
+    internalInterfaces = ["ve-perfectpitch"];
+    externalInterface = "enp0s25";
+    enableIPv6 = true;
+    forwardPorts = [
+     { sourcePort = 8022;
+       destination = "10.2.0.1:22";
+       proto = "tcp";
+     }
+     { sourcePort = 8022;
+       destination = "10.2.0.1:22";
+       proto = "udp";
+     }
+    ];
+  };
+  services.caddy.virtualHosts = {
+    "pitch.crompton.cc" = {
+      extraConfig = ''
+        reverse_proxy 10.2.0.1:8080
+      '';
+    };
+  };
+}

machines/hippocampus/servers/public/pterodactyl.nix

@@ -32,11 +32,11 @@
     externalInterface = "enp0s25";
     enableIPv6 = true;
     forwardPorts = [
-     { sourcePort = "25565:28000";
+     { sourcePort = "25565:26000";
        destination = "10.1.0.1:25565-25600";
        proto = "tcp";
      }
-     { sourcePort = "25565:28000";
+     { sourcePort = "25565:26000";
        destination = "10.1.0.1:25565-25600";
        proto = "udp";
      }
@@ -52,11 +52,17 @@
   };
   services.caddy.virtualHosts = {
     "games.syzygial.cc:443" = {
+      serverAliases = [
+        "games.crompton.cc:443"
+      ];
       extraConfig = ''
         reverse_proxy 10.1.0.1:80
       '';
     };
     "games.syzygial.cc:9000" = {
+      serverAliases = [
+        "games.crompton.cc:9000"
+      ];
       extraConfig = ''
         reverse_proxy 10.1.0.1:9000
       '';

machines/hippocampus/servers/public/random.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }: {
+  services.caddy.virtualHosts = {
+    "pitch.syzygial.cc" = {
+	    extraConfig = ''
+        reverse_proxy 127.0.0.1:7123
+      '';
+    };
+  };
+}

machines/hippocampus/servers/public/syzygial.nix

@@ -10,5 +10,12 @@
         }        
       '';
     };
+    "crompton.cc" = {
+      extraConfig = ''
+        file_server {
+          root /srv/www/crompton
+        }        
+      '';
+    };
   };
 }

machines/hippocampus/servers/public/tandoor.nix

@@ -18,7 +18,8 @@ in {
   };
 
   systemd.services.tandoor-recipes = {
-    environment.GUNICORN_MEDIA = lib.mkForce null;
+    # https://github.com/TandoorRecipes/recipes/issues/3617
+    environment.GUNICORN_MEDIA = "1"; #lib.mkForce null;
     serviceConfig = {
       EnvironmentFile = config.sops.secrets.tandoor-pass.path;
     };
@@ -26,7 +27,7 @@ in {
 
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       tandoor_user
     ];

machines/hippocampus/servers/public/vaultwarden.nix

@@ -16,7 +16,7 @@
   };
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "vaultwarden"
     ];

machines/hippocampus/services.nix

@@ -1,5 +1,6 @@
 {
   imports = [
     ./services/tailscale.nix
+    ./services/dyndns.nix
   ];
 }

machines/hippocampus/services/dyndns.nix

@@ -2,7 +2,7 @@
   sops.secrets.ddclient = {};
   services.ddclient = {
     enable = true;
-    use = "web, web=dynamicdns.park-your-domain.com/getip";
+    usev4 = "webv4, web=dynamicdns.park-your-domain.com/getip";
     protocol = "namecheap";
     server = "dynamicdns.park-your-domain.com";
     username = "crompton.cc";

machines/pericyte/configuration.nix

@@ -0,0 +1,29 @@
+{ pkgs, inputs, ... }: {
+  imports = [
+    ./hardware-configuration.nix
+    "${inputs.nixpkgs}/nixos/modules/profiles/headless.nix"
+    "${inputs.nixpkgs}/nixos/modules/profiles/minimal.nix"
+
+    ./podman.nix
+    ./container-registry.nix
+    # ./microvm-configuration.nix
+    # ./k3s.nix
+  ];
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.systemPackages = with pkgs; [
+    git
+    btop
+    tmux
+    oci-cli
+  ];
+
+  boot.tmp.cleanOnBoot = true;
+  # zramSwap.enable = true;
+  networking.hostName = "pericyte";
+  networking.domain = "";
+  services.openssh.enable = true;
+  users.users.root.openssh.authorizedKeys.keys = [''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOaNNSV/wurGA8D7bT+WX4UlHdKqd9SFfVXvSalvHag5qYDPUIsGGkqSNj1dcong9qxrC8y7G7ybWhwRKTKXInXrq6EO4JkVkCSbVqrq8gIv66upsKltvmf0esiOdrpRgHoiup8JKaX93aUT27rykReT39mFwkJZDoD4ViNiK7QmbgDC/9pyGDSJykreSnBoxtczox8Zi+pwN8XMI4nRVdV9hppXMpj38/O3Qaq+oXdHJ2MVNy9D+TqxYofstFbzpJpEb2xA4QYnq/VVJFk8VaZlg3qxelwBJ1GNZO8TMkLA+6b07D3aISyEIQAONviNktPwRPiw903hsDyeKDunDx ssh-key-2025-03-31'' ];
+  system.stateVersion = "25.05";
+}

machines/pericyte/container-registry.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  services.dockerRegistry = {
+    enable  = true;
+    package = pkgs.distribution;
+  };
+}

machines/pericyte/hardware-configuration.nix

@@ -0,0 +1,18 @@
+{ modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+    device = "nodev";
+  };
+  fileSystems."/boot" = { device = "/dev/disk/by-uuid/FCE4-1F46"; fsType = "vfat"; };
+  fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
+  swapDevices = [
+    {
+      device = "/swapfile";
+    }
+  ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+  boot.initrd.kernelModules = [ "nvme" ];
+}

machines/pericyte/k3s.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+  networking.firewall = {
+    allowedTCPPorts = [
+      6443 # k3s: required so that pods can reach the API server (running on port 6443 by default)
+      # 2379 # k3s, etcd clients: required if using a "High Availability Embedded etcd" configuration
+      # 2380 # k3s, etcd peers: required if using a "High Availability Embedded etcd" configuration
+    ];
+    allowedUDPPorts = [
+      # 8472 # k3s, flannel: required if using multi-node for inter-node networking
+    ];
+  };
+  services.k3s = {
+    enable = true;
+    role = "server";
+    extraFlags = toString [
+      # "--debug" # Optionally add additional args to k3s
+    ];
+  };
+  environment.systemPackages = with pkgs; [
+    rancher
+  ];
+}

machines/pericyte/microvm-configuration.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  microvm.autostart = [
+    "vm-starbot"
+    "vm-starbot-dev"
+  ];
+}

machines/pericyte/podman.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }: {
+  # Enable common container config files in /etc/containers
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+
+  # Useful other development tools
+  environment.systemPackages = with pkgs; [
+    dive # look into docker image layers
+    skopeo # Inspect images
+    podlet # create quadlets (systemd units)
+    podman-tui # status of containers in the terminal
+    podman-compose # start group of containers for dev
+  ];
+}

machines/pericyte/test.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+  users.groups.peertube = { };
+  users.users.peertube = {
+    isSystemUser = true;
+    group = "peertube";
+    home = "/var/lib/peertube";
+    createHome = true;
+    uid = 2342;
+    subUidRanges = [
+      {
+        count = 65536;
+        startUid = 2147483646;
+      }
+    ];
+    subGidRanges = [
+      {
+        count = 65536;
+        startGid = 2147483647;
+      }
+    ];
+  };
+  virtualisation.oci-containers = {
+    backend = "podman";
+    # containers.peertube = {
+    #   image = "chocobozzz/peertube:latest";
+    #   ports = [ ];
+    #   podman = {
+    #     user = "peertube";
+    #   };
+    # };
+  };
+}

machines/universeair/app-fix.nix

@@ -11,7 +11,7 @@
     rm -rf "$nix_apps"
     mkdir -p "$nix_apps"
     find ${config.system.build.applications}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
-        while read src; do
+        while read -r src; do
             # Spotlight does not recognize symlinks, it will ignore directory we link to the applications folder.
             # It does understand MacOS aliases though, a unique filesystem feature. Sadly they cannot be created
             # from bash (as far as I know), so we use the oh-so-great Apple Script instead.

machines/universeair/configuration.nix

@@ -3,7 +3,7 @@ in
   {
     imports = [
       # Install Apps Detactable by Spotlight
-      ./app-fix.nix
+      # ./app-fix.nix
       # Tiling Window Manager
       ./yabai.nix
       # Shortcuts babe, not Automator
@@ -11,10 +11,12 @@ in
     ];
     nix.registry.nixpkgs.flake = inputs.nixpkgs;
     nixpkgs.config.allowUnfree = true;
-    # Auto upgrade nix package and the daemon service.
-    services.nix-daemon.enable = true;
     # nix.package = pkgs.nixUnstable;
     nix.settings.auto-optimise-store = false;
+    nix.settings.trusted-users = [
+      "root"
+      "universelaptop"
+    ];
 
     users.users.universelaptop = {
       name = "universelaptop";
@@ -65,8 +67,85 @@ in
       VISUAL = "emacs";
     };
 
+    nixpkgs.overlays = [
+      (final: prev: {
+        skia-aseprite = prev.skia-aseprite.overrideAttrs (old: {
+          postPatch = (old.postPatch or "") + ''
+            sed -i -e 's/"-march=armv7-a",//g' gn/skia/BUILD.gn
+          '';
+          buildInputs = old.buildInputs ++ [
+            final.xcbuild
+            final.darwin.apple_sdk.frameworks.ApplicationServices
+          ];
+          meta.maintainers = with pkgs.lib.maintainers; [
+            davidcromp
+          ];
+        });
+        aseprite = prev.aseprite.overrideAttrs (old: {
+          cmakeFlags = [
+            "-DENABLE_DESKTOP_INTEGRATION=OFF"
+            "-DENABLE_UPDATER=OFF"
+            "-DUSE_SHARED_CMARK=ON"
+            "-DUSE_SHARED_CURL=ON"
+            "-DUSE_SHARED_FMT=ON"
+            "-DUSE_SHARED_FREETYPE=ON"
+            "-DUSE_SHARED_GIFLIB=ON"
+            "-DUSE_SHARED_HARFBUZZ=ON"
+            "-DUSE_SHARED_JPEGLIB=ON"
+            "-DUSE_SHARED_LIBPNG=ON"
+            "-DPNG_ARM_NEON:STRING=on"
+            "-DUSE_SHARED_LIBWEBP=ON"
+            "-DUSE_SHARED_PIXMAN=ON"
+            "-DUSE_SHARED_TINYXML=ON"
+            "-DUSE_SHARED_WEBP=ON"
+            "-DUSE_SHARED_ZLIB=ON"
+            # Disable libarchive programs.
+            "-DENABLE_CAT=OFF"
+            "-DENABLE_CPIO=OFF"
+            "-DENABLE_TAR=OFF"
+            # UI backend.
+            "-DLAF_OS_BACKEND=skia"
+            "-DLAF_WITH_EXAMPLES=OFF"
+            "-DSKIA_DIR=${final.skia-aseprite}"
+            "-DSKIA_LIBRARY_DIR=${final.skia-aseprite}/lib"
+            "-DSKIA_LIBRARYR=${final.skia-aseprite}/lib/libskia.a"
+          ];
+          buildInputs = with pkgs; [
+            cmark
+            curl
+            fmt
+            fontconfig
+            freetype
+            giflib
+            glib
+            harfbuzzFull
+            libjpeg
+            libpng
+            libwebp
+            pcre2
+            pixman
+            skia-aseprite
+            tinyxml-2
+            zlib
+            
+            # MacOS:
+          ] ++ (with darwin.apple_sdk.frameworks; [
+            Cocoa
+            QuickLook
+            Quartz
+          ]);
+          
+          hardeningDisable = [
+            "format" # Darwin Specific
+          ];
+          meta.broken = false;
+        });
+      })
+    ];
+    
     environment.systemPackages = (with pkgs; [
       me-emacs
+      svgbob
       (aspellWithDicts (p: with p;[
         en
         en-computers
@@ -76,7 +155,7 @@ in
       texliveFull
       wget
 
-      xquartz
+      #xquartz
       kitty
       
       btop
@@ -90,9 +169,12 @@ in
       tailscale
       discord
       slack
-      inkscape
       gimp
+      # aseprite
       # TODO: Consider using Yabai??
+      
+      # Games
+      prismlauncher
     ]);
 
     homebrew = {
@@ -110,17 +192,20 @@ in
         "bitwarden"
         "zoom-for-it-admins"
         "libreoffice"
-        "microsoft-office"
-        "kicad"
         "tailscale"
-        "r" "rstudio"
+        "godot"
+        "pixelorama"
+        "blender"
+        "inkscape"
       ];
       # Apps to install outside of nix for when wanting to test/run
       # things that... aren't used by other people who use nix, like
       # python apps (which is why poetry is there)
       brews = [
         "poetry"
+        "pdm"
         "python@3.11"
+        "python@3.10"
         "pygments"
         # sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
 	# /Library/Java/JavaVirtualMachines/openjdk.jdk
@@ -135,4 +220,5 @@ in
     # Used for backwards compatibility, please read the changelog before changing.
     # $ darwin-rebuild changelog
     system.stateVersion = 4;
+    system.primaryUser = "universelaptop";
   }

machines/universeair/libresprite_TODO_PR.nix

@@ -0,0 +1,18 @@
+      (libresprite.overrideAttrs (old: {
+        src = pkgs.fetchFromGitHub {
+          owner = "LibreSprite";
+          repo = "LibreSprite";
+          rev = "c99d3666b17ff731824e3eccc79cf3ec48564ad5";
+          fetchSubmodules = true;
+          sha256 = "sha256-mdMdHQvl6Mt0oisZ4c/Wk6dvklq3Iyz05brbFxSIaj0=";
+        };
+        patches = [];
+        buildInputs = old.buildInputs ++ (with pkgs; [
+          libarchive
+          tinyxml-2
+        ]);
+        postPatch = ''
+          sed -i -e 's/if(''${CMAKE_SYSTEM_NAME} MATCHES "Darwin")/if(FALSE)/' CMakeLists.txt
+        '';
+        meta.broken = false;
+      }))

machines/universeair/skhd.nix

@@ -2,7 +2,7 @@
   services.skhd = {
     enable = true;
     skhdConfig = ''
-      cmd + shift - e : open '${pkgs.me-emacs}/Applications/Emacs.app'
+      cmd + shift - e : open '${(pkgs.me-emacs.override {withNativeCompilation = false;})}/Applications/Emacs.app'
       cmd + shift + ctrl - e : kitty -d ~ -1
     '';
   };

machines/universedesktop/configuration.nix

@@ -34,6 +34,9 @@
 
         # ccache, y'know for blenders and whatnots
         ./ccache.nix
+
+        # So we can run riscv 'natively'
+        ./riscv.nix
       ];
 
     fileSystems."/home/universe/tmp" = {
@@ -54,14 +57,15 @@
     networking.useDHCP = false;
     networking.interfaces.wlp6s0.useDHCP = true;
     # Fixes DNS issue with tailscale: https://github.com/tailscale/tailscale/issues/4254
-    services.resolved.enable = true;
+    #services.resolved.enable = true;
+    networking.resolvconf.enable = true;
 
     sops.secrets.wireless = { };
-    networking.wireless.environmentFile = config.sops.secrets.wireless.path;
+    networking.wireless.secretsFile = config.sops.secrets.wireless.path;
 
     networking.wireless.enable = true;
     networking.wireless.networks = {
-      "@SSID_HOME@".psk = "@PSK_HOME@";
+      "BELL422".pskRaw = "ext:PSK_HOME";
     };
 
     hardware.bluetooth.enable = true;

machines/universedesktop/desktop/0006-DontCrashWindowPos.patch

@@ -0,0 +1,25 @@
+diff --git a/src/wl_window.c b/src/wl_window.c
+index 5b491ff..f54b244 100644
+--- a/src/wl_window.c
++++ b/src/wl_window.c
+@@ -2236,16 +2236,16 @@ void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos)
+     // A Wayland client is not aware of its position, so just warn and leave it
+     // as (0, 0)
+ 
+-    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
+-                    "Wayland: The platform does not provide the window position");
++    fprintf(stderr,
++            "Wayland: The platform does not provide the window position");
+ }
+ 
+ void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos)
+ {
+     // A Wayland client can not set its position, so just warn
+ 
+-    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
+-                    "Wayland: The platform does not support setting the window position");
++    fprintf(stderr,
++            "Wayland: The platform does not support setting the window position");
+ }
+ 
+ void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height)

machines/universedesktop/desktop/default.nix

@@ -1,6 +1,9 @@
 { config, pkgs, lib, ... }: {
   imports = [
     ./audio.nix
-    ./displaymanager.nix
+    ./graphics.nix
+    # ./dwl.nix # Sadly, nVidia seems to be too broken too often on wayland
+    ./dwm.nix
+    # ./niri.nix
   ];
 }

machines/universedesktop/desktop/displaymanager.nix

@@ -1,41 +1,5 @@
-{ config, pkgs, lib, ... }: let
+{ ... }: {
-  empttyConf = pkgs.writeText "emptty-config" ''
-    TTY_NUMBER=7
-
-    WAYLAND_SESSIONS_PATH="${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"
-  '';
-in {
   imports = [
-    ./dwl.nix
+    ./emptty.nix
   ];
-  
-  services.displayManager = {
-    enable = true;
-    execCmd = "${pkgs.emptty}/bin/emptty -d";
-  };
-  systemd.services.display-manager = {
-    enable = true;
-    path = [pkgs.dwl];
-    serviceConfig = {
-      EnvironmentFile = empttyConf;
-      Type="idle";
-      TTYPath="/dev/tty7";
-      TTYReset="yes";
-      SendSIGHUP="yes";
-      KillMode="process";
-    };
-  };
-
-  environment.etc."emptty/conf".source = empttyConf;
-
-  services.displayManager.sessionPackages = [ pkgs.dwl ];
-
-  security.pam.services = {
-    emptty.text = ''
-      auth	substack	sshd
-      account	include	sshd
-      password	substack	sshd
-      session	include sshd
-    '';
-  };
 }

machines/universedesktop/desktop/dwl.nix

@@ -8,13 +8,26 @@ in {
     ./wayland.nix
   ];
 
+  services.displayManager.sessionPackages = [ pkgs.dwl ];
+  #services.gnome.gnome-keyring.enable = lib.mkDefault true;
+  systemd.packages = [ pkgs.dwl ];
+
   nixpkgs.overlays = [
     (final: prev: {
-      dwl = prev.dwl.overrideAttrs (old: let
+      wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
+        src = final.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "d305934ebe6852785a1f425ee96861f0b7280d76"; # 0.19-prev # 25-01-25
+          hash = "sha256-NnPSC5p/phTFe+nWp9vl8LUbmBO/RXSSUuDZ2boucXY=";
+        };
+      });
+      dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
         dwl-patches = pkgs.fetchgit {
           url = "https://codeberg.org/dwl/dwl-patches.git";
-          rev = "7f93815e9c9d50add8493e680b3057ed0cc6e8a0";
+          rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad";
-          hash = "sha256-LK1+WjAlguBvITPyS4oHXW5bNP19WUEfo87GFmyv8Js=";
+          hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws=";
         };
         patches = let
           dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
@@ -25,18 +38,18 @@ in {
           (dwl-patch "autostart")
         ];
       in {
-        version = "10-05-2024";
+        version = "21-09-2024";
         
         src = final.fetchFromGitea {
           domain = "codeberg.org";
           owner = "dwl";
           repo = "dwl";
-          rev = "9825c26cdd5dfed34022b77a8936c5d8f485e134";
+          rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc";
-          hash = "sha256-p7BhCbCduMNTEK5DYNGBYXf+9WU6WlRvR9VdOuSTrVU=";
+          hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY=";
         };
  
         patches = (old.patches or []) ++ patches;
-        postPatch = ''
+        postPatch = (old.postPatch or "") + ''
           export termcmd=${pkgs.foot}/bin/foot
           export editcmd=${launch_emacs}
           export menucmd=${pkgs.fuzzel}/bin/fuzzel
@@ -67,25 +80,33 @@ in {
     QT_QPA_PLATFORM="wayland-egl";
     QT_WAYLAND_DISABLE_WINDOW_DECORATIONS="1";
     __JAVA_AWT_WM_NONREPARENTING=1;
-    # Bug with Wayland: Fixed in 23.1
-    # Causes firefox & thunderbird to crash
-    # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646/diffs?commit_id=ee5d2250fd159689aae3f7d632a6226971bea85c
-    MOZ_ENABLE_WAYLAND=0;
     GTK_THEME="Adwaita-dark";
   };
   
-  xdg.portal.wlr = {
+  xdg.portal = {
-    enable = true;
+    enable = lib.mkDefault true;
-    settings = {
+    
-      screencast = {
+    configPackages = [ pkgs.dwl ];
-        output_name = "DP-2";
+    
-        max_fps = 30;
+    # Recommended by upstream, required for screencast support
-        chooser_type = "simple";
+    # https://github.com/YaLTeR/niri/wiki/Important-Software#portals
-        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+    extraPortals = [
-      };
+      pkgs.xdg-desktop-portal-gnome
+      pkgs.xdg-desktop-portal-gtk
+    ];
+
+    wlr.enable = true;
   };
+
+  security = {
+    polkit.enable = true;
+    pam.services.swaylock = { };
   };
 
+  services.graphical-desktop.enable = true;
+
+  services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
+
   environment.systemPackages = with pkgs; [
     dwl
     waybar

machines/universedesktop/desktop/dwl/st-config.def.h

@@ -0,0 +1,474 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char *font = "Liberation Mono:pixelsize=24:antialias=true:autohint=true";
+static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: scroll and/or utmp
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char *shell = "/bin/sh";
+char *utmp = NULL;
+/* scroll program: to enable use a string like "scroll" */
+char *scroll = NULL;
+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+char *vtiden = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: L" `'\"()[]{}"
+ */
+wchar_t *worddelimiters = L" ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* alt screens */
+int allowaltscreen = 1;
+
+/* allow certain non-interactive (insecure) window operations such as:
+   setting the clipboard text */
+int allowwindowops = 0;
+
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 2;
+static double maxlatency = 33;
+
+/*
+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking
+ * attribute.
+ */
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* default TERM value */
+char *termname = "st-256color";
+
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ *	it#$tabspaces,
+ *
+ * Secondly make sure your kernel is not expanding tabs. When running `stty
+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
+ *  running following command:
+ *
+ *	stty tabs
+ */
+unsigned int tabspaces = 8;
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+	/* 8 normal colors */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"blue2",
+	"magenta3",
+	"cyan3",
+	"gray90",
+
+	/* 8 bright colors */
+	"gray50",
+	"red",
+	"green",
+	"yellow",
+	"#5c5cff",
+	"magenta",
+	"cyan",
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default columns and rows numbers
+ */
+
+static unsigned int cols = 80;
+static unsigned int rows = 24;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
+ * Color used to display font attributes when fontconfig selected a font which
+ * doesn't match the ones requested.
+ */
+static unsigned int defaultattr = 11;
+
+/*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
+	/* mask                 button   function        argument       release */
+	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
+	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
+	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY Mod1Mask
+#define TERMMOD (ControlMask|ShiftMask)
+
+static Shortcut shortcuts[] = {
+	/* mask                 keysym          function        argument */
+	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
+	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
+	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
+	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
+	{ TERMMOD|ShiftMask,    XK_KP_Subtract, zoom,           {.f = -1} },
+	{ TERMMOD|ShiftMask,    XK_KP_Equal,    zoom,           {.f = +1} },
+	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
+	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
+	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
+	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use XK_ANY_MOD to match the key no matter modifiers state
+ * * Use XK_NO_MOD to match the key alone (no modifiers)
+ * appkey value:
+ * * 0: no value
+ * * > 0: keypad application mode enabled
+ * *   = 2: term.numlock = 1
+ * * < 0: keypad application mode disabled
+ * appcursor value:
+ * * 0: no value
+ * * > 0: cursor application mode enabled
+ * * < 0: cursor application mode disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any XK_ANY_MOD must be in the last
+ * position for a key.
+ */
+
+/*
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.
+ */
+static KeySym mappedkeys[] = { -1 };
+
+/*
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
+ */
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */
+static Key key[] = {
+	/* keysym           mask            string      appkey appcursor */
+	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
+	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
+	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
+	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
+	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
+	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
+	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
+	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
+	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
+	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
+	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
+	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
+	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
+	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
+	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
+	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
+	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
+	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
+	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
+	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
+	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
+	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
+	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
+	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
+	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
+	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
+	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
+	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
+	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
+	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
+	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
+	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
+	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
+	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
+	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
+	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
+	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
+	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
+	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
+	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
+	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
+	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
+	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
+	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
+	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
+	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
+	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
+	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
+	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
+	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
+	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
+	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
+	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
+	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
+	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
+	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
+	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
+	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
+	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
+	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
+	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
+	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
+	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
+	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
+	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
+	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
+	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
+	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
+	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
+	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
+	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
+	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
+	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
+	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
+	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
+	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
+	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
+	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
+	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
+	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
+	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
+	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
+	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
+	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
+	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
+	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
+	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
+	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
+	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
+	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
+	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
+	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
+	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
+	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
+	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
+	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
+	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
+	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
+	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
+	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
+	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
+	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
+	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
+	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
+	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
+	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
+	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
+	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
+	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
+	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
+	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
+	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
+	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
+	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
+	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
+	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
+	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
+	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
+	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
+	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
+	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
+	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
+	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
+	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
+	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
+	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
+	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
+	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
+	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
+	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
+	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
+	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
+	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
+	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
+	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
+	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
+	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
+	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
+	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
+	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
+	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
+	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
+	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
+	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
+	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
+	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
+	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
+	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
+	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
+	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
+	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
+	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
+	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
+	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
+	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
+	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
+	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
+	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
+	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
+	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
+	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
+	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
+	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
+	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
+	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
+	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
+	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
+	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
+	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
+	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
+	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
+	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
+	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
+	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
+	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
+	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
+	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
+	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
+	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
+	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
+	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
+	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
+	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
+	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
+	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
+	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
+	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
+	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
+	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
+	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
+	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
+	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
+	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
+	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
+	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
+	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
+	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
+};
+
+/*
+ * Selection types' masks.
+ * Use the same masks as usual.
+ * Button1Mask is always unset, to make masks match between ButtonPress.
+ * ButtonRelease and MotionNotify.
+ * If no match is found, regular selection is used.
+ */
+static uint selmasks[] = {
+	[SEL_RECTANGULAR] = Mod1Mask,
+};
+
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
+	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+	"`abcdefghijklmnopqrstuvwxyz{|}~";

machines/universedesktop/desktop/dwm.nix

@@ -0,0 +1,64 @@
+{ config, pkgs, lib, ... }: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      st = prev.st.override {
+        conf = builtins.readFile (pkgs.replaceVars ./dwm/st-config.def.h {});
+      };
+    })
+  ];
+  services.xserver.windowManager.dwm = {
+    enable = true;
+    package = let
+      launch_emacs = pkgs.writeScript "emacsclient-or-start" ''
+        #!${pkgs.bash}/bin/bash
+        emacsclient --create-frame --alternate-editor=""
+      '';
+    in pkgs.dwm.override {
+      conf = pkgs.replaceVars ./dwm/config.h {
+        dmenucmd="${pkgs.dmenu}/bin/dmenu_run";
+        termcmd="${pkgs.st}/bin/st";
+        editcmd="${launch_emacs}";
+        playcmd=pkgs.writeScript "playerctl-play-pause" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.playerctl}/bin/playerctl play-pause
+        '';
+        scrncmd=pkgs.writeScript "screenshot-region" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
+        '';
+      };
+      patches = [
+        ./dwm/fullscreen.patch
+      ];
+    };
+  };
+  services.xserver.enable = true;
+  # services.xserver.xrandrHeads should work, but alas
+  services.xserver.displayManager.setupCommands = ''
+    ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --auto --output DP-2 --auto --right-of DP-4 --primary --output HDMI-0 --auto --right-of DP-2;
+  '';
+  services.xserver.displayManager.lightdm = {
+	  enable = true;
+    background = "#000000";
+  };
+  services.xserver.config = lib.mkAfter ''
+Section "InputClass"
+        Identifier "joystick catchall"
+        MatchIsJoystick "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "joystick"
+        Option "StartKeysEnabled" "False"
+        Option "StartMouseEnabled" "False"
+EndSection
+  '';
+  environment.sessionVariables = {
+    GTK_THEME="Adwaita-dark";
+  };
+
+  environment.systemPackages = with pkgs; [
+    dmenu
+    xclip
+    pwvucontrol
+    st
+  ];
+}

machines/universedesktop/desktop/dwm/config.h

@@ -0,0 +1,124 @@
+#include <X11/XF86keysym.h>
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const unsigned int borderpx  = 1;        /* border pixel of windows */
+static const unsigned int snap      = 32;       /* snap pixel */
+static const int showbar            = 1;        /* 0 means no bar */
+static const int topbar             = 1;        /* 0 means bottom bar */
+static const char *fonts[]          = { "monospace:size=10" };
+static const char dmenufont[]       = "monospace:size=10";
+static const char col_gray1[]       = "#222222";
+static const char col_gray2[]       = "#444444";
+static const char col_gray3[]       = "#bbbbbb";
+static const char col_gray4[]       = "#eeeeee";
+static const char col_cyan[]        = "#005577";
+static const char *colors[][3]      = {
+	/*               fg         bg         border   */
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+	/* xprop(1):
+	 *	WM_CLASS(STRING) = instance, class
+	 *	WM_NAME(STRING) = title
+	 */
+	/* class      instance    title       tags mask     isfloating   monitor */
+	/* { "Gimp",     NULL,       NULL,       0,            1,           -1 }, */
+	{ "Firefox",  NULL,       NULL,       1 << 2,       0,           -1 },
+};
+
+/* layout(s) */
+static const float mfact     = 0.5; /* factor of master area size [0.05..0.95] */
+static const int nmaster     = 1;    /* number of clients in master area */
+static const int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+
+static const Layout layouts[] = {
+	/* symbol     arrange function */
+	{ "[]=",      tile },    /* first entry is default */
+	{ "><>",      NULL },    /* no layout function means floating behavior */
+	{ "[M]",      monocle },
+};
+
+/* key definitions */
+#define MODKEY Mod4Mask
+#define TAGKEYS(KEY,TAG) \
+	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "@dmenucmd@", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[]  = { "@termcmd@", NULL };
+static const char *editcmd[]  = { "@editcmd@", NULL };
+static const char *playcmd[]  = { "@playcmd@", NULL };
+static const char *scrncmd[]  = { "@scrncmd@", NULL };
+
+static const Key keys[] = {
+	/* modifier                     key        function        argument */
+	{ MODKEY,                       XK_r,      spawn,          {.v = dmenucmd } },
+	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = editcmd } },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY,                       XK_z,      zoom,           {0} },
+	{ MODKEY,                       XK_Tab,    view,           {0} },
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_space,  setlayout,        {0} },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating,   {0} },
+	{ MODKEY|ShiftMask,             XK_f,      togglefullscreen, {0} },
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_Print,  spawn,          {.v = scrncmd } },
+	{ 0,                            XF86XK_AudioPlay, spawn,   {.v = playcmd } },
+	TAGKEYS(                        XK_1,                      0)
+	TAGKEYS(                        XK_2,                      1)
+	TAGKEYS(                        XK_3,                      2)
+	TAGKEYS(                        XK_4,                      3)
+	TAGKEYS(                        XK_5,                      4)
+	TAGKEYS(                        XK_6,                      5)
+	TAGKEYS(                        XK_7,                      6)
+	TAGKEYS(                        XK_8,                      7)
+	TAGKEYS(                        XK_9,                      8)
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+	/* click                event mask      button          function        argument */
+	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
+	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
+	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
+	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
+	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
+	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
+	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
+	{ ClkTagBar,            0,              Button1,        view,           {0} },
+	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
+	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
+};
+

machines/universedesktop/desktop/dwm/fullscreen.patch

@@ -0,0 +1,25 @@
+diff --git a/dwm.c b/dwm.c
+index f1d86b2..17b595a 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -211,6 +211,7 @@ static void tagmon(const Arg *arg);
+ static void tile(Monitor *m);
+ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
++static void togglefullscreen(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+@@ -1735,6 +1736,12 @@ togglefloating(const Arg *arg)
+ 	arrange(selmon);
+ }
+ 
++void togglefullscreen(const Arg *arg)
++{
++  if(selmon->sel)
++    setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
++}
++
+ void
+ toggletag(const Arg *arg)
+ {

machines/universedesktop/desktop/dwm/st-config.def.h

@@ -0,0 +1,474 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char *font = "Liberation Mono:pixelsize=24:antialias=true:autohint=true";
+static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: scroll and/or utmp
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char *shell = "/bin/sh";
+char *utmp = NULL;
+/* scroll program: to enable use a string like "scroll" */
+char *scroll = NULL;
+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+char *vtiden = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: L" `'\"()[]{}"
+ */
+wchar_t *worddelimiters = L" ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* alt screens */
+int allowaltscreen = 1;
+
+/* allow certain non-interactive (insecure) window operations such as:
+   setting the clipboard text */
+int allowwindowops = 0;
+
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 2;
+static double maxlatency = 33;
+
+/*
+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking
+ * attribute.
+ */
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* default TERM value */
+char *termname = "st-256color";
+
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ *	it#$tabspaces,
+ *
+ * Secondly make sure your kernel is not expanding tabs. When running `stty
+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
+ *  running following command:
+ *
+ *	stty tabs
+ */
+unsigned int tabspaces = 8;
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+	/* 8 normal colors */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"blue2",
+	"magenta3",
+	"cyan3",
+	"gray90",
+
+	/* 8 bright colors */
+	"gray50",
+	"red",
+	"green",
+	"yellow",
+	"#5c5cff",
+	"magenta",
+	"cyan",
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default columns and rows numbers
+ */
+
+static unsigned int cols = 80;
+static unsigned int rows = 24;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
+ * Color used to display font attributes when fontconfig selected a font which
+ * doesn't match the ones requested.
+ */
+static unsigned int defaultattr = 11;
+
+/*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
+	/* mask                 button   function        argument       release */
+	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
+	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
+	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY Mod1Mask
+#define TERMMOD (ControlMask|ShiftMask)
+
+static Shortcut shortcuts[] = {
+	/* mask                 keysym          function        argument */
+	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
+	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
+	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
+	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
+	{ ControlMask|ShiftMask,    XK_KP_Subtract, zoom,           {.f = -1} },
+	{ ControlMask|ShiftMask,    XK_KP_Equal,    zoom,           {.f = +1} },
+	{ ControlMask,              XK_Home,        zoomreset,      {.f =  0} },
+	{ ControlMask|ShiftMask,              XK_C,           clipcopy,       {.i =  0} },
+	{ ControlMask|ShiftMask,              XK_V,           clippaste,      {.i =  0} },
+	{ ControlMask,              XK_Y,           selpaste,       {.i =  0} },
+	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use XK_ANY_MOD to match the key no matter modifiers state
+ * * Use XK_NO_MOD to match the key alone (no modifiers)
+ * appkey value:
+ * * 0: no value
+ * * > 0: keypad application mode enabled
+ * *   = 2: term.numlock = 1
+ * * < 0: keypad application mode disabled
+ * appcursor value:
+ * * 0: no value
+ * * > 0: cursor application mode enabled
+ * * < 0: cursor application mode disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any XK_ANY_MOD must be in the last
+ * position for a key.
+ */
+
+/*
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.
+ */
+static KeySym mappedkeys[] = { -1 };
+
+/*
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
+ */
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */
+static Key key[] = {
+	/* keysym           mask            string      appkey appcursor */
+	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
+	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
+	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
+	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
+	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
+	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
+	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
+	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
+	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
+	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
+	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
+	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
+	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
+	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
+	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
+	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
+	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
+	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
+	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
+	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
+	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
+	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
+	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
+	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
+	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
+	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
+	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
+	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
+	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
+	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
+	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
+	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
+	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
+	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
+	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
+	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
+	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
+	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
+	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
+	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
+	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
+	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
+	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
+	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
+	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
+	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
+	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
+	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
+	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
+	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
+	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
+	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
+	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
+	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
+	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
+	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
+	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
+	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
+	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
+	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
+	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
+	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
+	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
+	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
+	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
+	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
+	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
+	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
+	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
+	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
+	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
+	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
+	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
+	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
+	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
+	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
+	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
+	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
+	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
+	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
+	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
+	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
+	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
+	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
+	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
+	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
+	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
+	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
+	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
+	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
+	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
+	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
+	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
+	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
+	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
+	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
+	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
+	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
+	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
+	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
+	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
+	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
+	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
+	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
+	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
+	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
+	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
+	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
+	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
+	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
+	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
+	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
+	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
+	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
+	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
+	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
+	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
+	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
+	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
+	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
+	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
+	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
+	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
+	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
+	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
+	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
+	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
+	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
+	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
+	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
+	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
+	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
+	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
+	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
+	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
+	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
+	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
+	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
+	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
+	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
+	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
+	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
+	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
+	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
+	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
+	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
+	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
+	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
+	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
+	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
+	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
+	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
+	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
+	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
+	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
+	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
+	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
+	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
+	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
+	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
+	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
+	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
+	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
+	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
+	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
+	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
+	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
+	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
+	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
+	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
+	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
+	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
+	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
+	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
+	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
+	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
+	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
+	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
+	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
+	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
+	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
+	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
+	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
+	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
+	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
+	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
+	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
+	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
+	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
+	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
+	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
+	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
+	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
+	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
+	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
+	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
+	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
+	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
+	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
+	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
+	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
+};
+
+/*
+ * Selection types' masks.
+ * Use the same masks as usual.
+ * Button1Mask is always unset, to make masks match between ButtonPress.
+ * ButtonRelease and MotionNotify.
+ * If no match is found, regular selection is used.
+ */
+static uint selmasks[] = {
+	[SEL_RECTANGULAR] = Mod1Mask,
+};
+
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
+	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+	"`abcdefghijklmnopqrstuvwxyz{|}~";

machines/universedesktop/desktop/emptty.nix

@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }: let
+  empttyConf = pkgs.writeText "emptty-config" ''
+    TTY_NUMBER=7
+
+    WAYLAND_SESSIONS_PATH="${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"
+  '';
+in {
+  services.displayManager = {
+    enable = true;
+    execCmd = "${pkgs.emptty}/bin/emptty -d";
+  };
+  systemd.services.display-manager = {
+    enable = true;
+    path = [pkgs.dwl];
+    serviceConfig = {
+      EnvironmentFile = empttyConf;
+      Type="idle";
+      TTYPath="/dev/tty7";
+      TTYReset="yes";
+      SendSIGHUP="yes";
+      KillMode="process";
+    };
+  };
+
+  security.pam.services = {
+    emptty.text = ''
+      auth	substack	sshd
+      account	include	sshd
+      password	substack	sshd
+      session	include sshd
+    '';
+  };
+}

machines/universedesktop/desktop/gnome.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }: {
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+}

machines/universedesktop/desktop/graphics.nix

@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }: {  
+  hardware = {
+    graphics.enable = true;
+    graphics.enable32Bit = true;
+
+    nvidia = {
+      #modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+      nvidiaSettings = true;
+      open = true;
+      # package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
+      #package = let 
+      #  rcu_patch = pkgs.fetchpatch {
+      #    url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
+      #    hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
+      #  };
+      #in config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #  version = "535.154.05";
+      #  sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
+      #  sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
+      #  openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
+      #  settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
+      #  persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
+      #  patches = [ rcu_patch ];
+      #};
+    };
+  };
+}

machines/universedesktop/desktop/niri.nix

@@ -0,0 +1,106 @@
+{ config, pkgs, lib, ... }: let 
+  launch_emacs = pkgs.writeScript "emacsclient-or-start" ''
+    #!${pkgs.bash}/bin/bash
+    emacsclient --create-frame --alternate-editor=""
+  '';
+in {
+  imports = [
+    ./wayland.nix
+  ];
+
+  services.displayManager.sessionPackages = [ pkgs.dwl ];
+  #services.gnome.gnome-keyring.enable = lib.mkDefault true;
+  systemd.packages = [ pkgs.dwl ];
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
+        src = final.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "d305934ebe6852785a1f425ee96861f0b7280d76"; # 0.19-prev # 25-01-25
+          hash = "sha256-NnPSC5p/phTFe+nWp9vl8LUbmBO/RXSSUuDZ2boucXY=";
+        };
+      });
+      dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
+        dwl-patches = pkgs.fetchgit {
+          url = "https://codeberg.org/dwl/dwl-patches.git";
+          rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad";
+          hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws=";
+        };
+        patches = let
+          dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
+        in [
+          (dwl-patch "ipc")
+          (dwl-patch "restore-monitor")
+          (dwl-patch "regexrules")
+          (dwl-patch "autostart")
+        ];
+      in {
+        version = "21-09-2024";
+        
+        src = final.fetchFromGitea {
+          domain = "codeberg.org";
+          owner = "dwl";
+          repo = "dwl";
+          rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc";
+          hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY=";
+        };
+ 
+        patches = (old.patches or []) ++ patches;
+        postPatch = (old.postPatch or "") + ''
+          export termcmd=${pkgs.foot}/bin/foot
+          export editcmd=${launch_emacs}
+          export menucmd=${pkgs.fuzzel}/bin/fuzzel
+          export barcmd=${pkgs.waybar}/bin/waybar
+          export playcmd=${pkgs.writeScript "playerctl-play-pause" ''
+            #!${pkgs.bash}/bin/bash
+            ${pkgs.playerctl}/bin/playerctl play-pause
+          ''}
+          export scrncmd=${pkgs.writeScript "screenshot-region" ''
+           #!${pkgs.bash}/bin/bash
+           ${pkgs.slurp}/bin/slurp | ${pkgs.grim}/bin/grim -g - - | ${pkgs.wl-clipboard}/bin/wl-copy
+          ''}
+          substituteAll ${./dwl/config.def.h} ./config.def.h
+        '';
+        postInstall = ''
+          chmod ugo+x $out/share/wayland-sessions/dwl.desktop
+        '';
+        passthru.providedSessions = ["dwl"];
+      });
+    })
+  ];
+
+
+  security = {
+    polkit.enable = true;
+    pam.services.swaylock = { };
+  };
+
+  services.graphical-desktop.enable = true;
+
+  services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
+
+  environment.systemPackages = with pkgs; [
+    dwl
+    waybar
+    foot
+    pwvucontrol
+  ];
+}
+{ config, pkgs, lib, ... }: {
+  programs.niri.enable = true;
+
+  environment.sessionVariables = {
+    # Breaks WebCord
+    # NIXOS_OZONE_WL=1;
+    WLR_NO_HARDWARE_CURSORS=1;
+    SDL_VIDEODRIVER="wayland";
+    QT_QPA_PLATFORM="wayland-egl";
+    QT_WAYLAND_DISABLE_WINDOW_DECORATIONS="1";
+    __JAVA_AWT_WM_NONREPARENTING=1;
+    GTK_THEME="Adwaita-dark";
+  };
+
+}

machines/universedesktop/desktop/obs-wayland-window-projection.patch

@@ -0,0 +1,16 @@
+diff --git a/UI/window-projector.cpp b/UI/window-projector.cpp
+index e61f23182..a405e9f17 100644
+--- a/UI/window-projector.cpp
++++ b/UI/window-projector.cpp
+@@ -37,11 +37,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
+ 	// can skip it
+ 	windowHandle()->setProperty("isOBSProjectorWindow", true);
+ 
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
+-	// Prevents resizing of projector windows
+-	setAttribute(Qt::WA_PaintOnScreen, false);
+-#endif
+-
+ 	type = type_;
+ #ifdef __APPLE__
+ 	setWindowIcon(

machines/universedesktop/desktop/plasma.nix

@@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }: {
+  imports = [
+    ./wayland.nix
+    ./sddm.nix
+  ];
+  #services.xserver.displayManager.lightdm.enable = true;
+
+  # nVidia is broken with 6.12 currently
+  # boot.kernelPackages = pkgs.linuxPackages_6_11;
+
+  services.xserver.enable = true;
+  services.desktopManager.plasma6.enable = true;
+  
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+  ];
+
+  qt = {
+    enable = true;
+    platformTheme = "gnome";
+    style = "adwaita-dark";
+  };
+}

machines/universedesktop/desktop/sddm.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }: {
+  services.xserver.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+}

machines/universedesktop/desktop/wayland.nix

@@ -1,37 +1,34 @@
 { config, pkgs, lib, ... }: {
-  # Wayland support
+  nixpkgs.overlays = [
-  hardware = {
+    (final: prev: let
-    graphics.enable = true;
+      patches-src = pkgs.fetchFromGitHub {
-    graphics.enable32Bit = true;
+        owner = "BoyOrigin";
+        repo = "glfw-wayland";
+        rev = "2024-03-07";
+        hash = "sha256-kvWP34rOD4HSTvnKb33nvVquTGZoqP8/l+8XQ0h3b7Y=";
+      };
+      patch' = p: "${patches-src}/patches/${p}.patch";
+    in {
+      glfw3-minecraft = prev.glfw3-minecraft.overrideAttrs (old: {
+        patches = [ (builtins.head old.patches) ] ++ [
+          (patch' "0001-Key-Modifiers-Fix")
+          (patch' "0002-Fix-duplicate-pointer-scroll-events")
+          (patch' "0003-Implement-glfwSetCursorPosWayland")
+          (patch' "0004-Fix-Window-size-on-unset-fullscreen")
+          (patch' "0005-Avoid-error-on-startup")
+          ./0006-DontCrashWindowPos.patch
+        ];
+      });
 
-    nvidia = {
+      obs-studio = prev.obs-studio.overrideAttrs (old: {
-      modesetting.enable = true;
+        patches = (old.patches or []) ++ [
-      powerManagement.enable = false;
+          ./obs-wayland-window-projection.patch
-      powerManagement.finegrained = false;
+        ];
-      nvidiaSettings = true;
+      });
-      open = false;
+    })
-      package = let 
+  ];
-        rcu_patch = pkgs.fetchpatch {
-          url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
-          hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
-        };
-      in config.boot.kernelPackages.nvidiaPackages.mkDriver {
-        version = "535.154.05";
-        sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
-        sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
-        openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
-        settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
-        persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
-        patches = [ rcu_patch ];
-      };
-    };
-  };
   programs.xwayland.enable = true;
 
   environment.systemPackages = with pkgs; [
-    # Minecraft can behave oddly on wayland without this
-    glfw-wayland-minecraft
-    # Screen mirroring:
-    wdomirror
   ];
 }

machines/universedesktop/programs/art.nix

@@ -5,41 +5,9 @@
         python-final: python-prev: let
           py = python-prev;
         in {
-          opencamlib = py.toPythonModule (pkgs.stdenv.mkDerivation rec {
-            pname = "opencamlib";
-            version = "2019.07";
-            nativeBuildInputs = (with pkgs;[
-              cmake
-              git
-              doxygen
-              boost
-              texlive.combined.scheme-full
-            ]);
-            propagatedNativeBuildInputs = [
-              py.python
-              py.boost
-              py.vtk
-            ];
-            postPatch = ''
-              mkdir -p $out/${py.python.sitePackages}/{lib,ocl}
-              sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-              sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-            '';
-            cmakeFlags = [
-              "-DVERSION_STRING=2019.07"
-              "-DBUILD_CXX_LIB=ON"
-              "-DBUILD_PY_LIB=ON"
-              "-DUSE_PY_3=ON"
-              "-DCMAKE_BUILD_TYPE=Release"
-            ];
-            src = pkgs.fetchFromGitHub {
-              owner = "aewallin";
-              repo = "opencamlib";
-              rev = "2019.07";
-              sha256 = "1a8pxp1mh8x3bfsb0l97vgxrpk482p7q9jprkd4m9hv69vva2bdz";
-            };
-          });
           equation = py.buildPythonPackage {
+            pyproject = true;
+            build-system = [ py.setuptools ];
             pname = "Equation";
             version = "1.2.01";
             nativeBuildInputs = [
@@ -52,6 +20,8 @@
             };
           };
           morphio = py.toPythonModule ( pkgs.stdenv.mkDerivation rec {
+            pyproject = true;
+            build-system = [ py.setuptools ];
             pname = "MorphIO";
             version = "3.3.4";
             nativeBuildInputs = (with pkgs; [
@@ -85,20 +55,20 @@
     blender_cuda = prev.blender.override {
       cudaSupport = true;
     };
-    blender = final.blender_cuda.withPackages (p: with p; [
+#    blender = final.blender_cuda.withPackages (p: with p; [
-      # OpenCAMLib support
+#      # OpenCAMLib support
-      shapely
+#      shapely
-      equation
+#      equation
-      opencamlib
+#      opencamlib
-      # NeuroMorphoVis support
+#      # NeuroMorphoVis support
-      matplotlib
+#      matplotlib
-      seaborn
+#      seaborn
-      pandas
+#      pandas
-      pillow
+#      pillow
-      h5py
+#      h5py
-      morphio
+#      morphio
-      # TODO add BluePy support?
+#      # TODO add BluePy support?
-    ]);
+#    ]);
     # Update RX and Aseprite
     rx = prev.rx.overrideAttrs (old: {
       version = "git";
@@ -118,6 +88,7 @@
 
     rx
     aseprite-unfree
+    pixelorama
     gimp
     
     glaxnimate

machines/universedesktop/programs/cad.nix

@@ -1,10 +1,9 @@
 { lib, config, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     openscad
-    # https://github.com/NixOS/nixpkgs/pull/326595
+
-    (freecad.override {python3Packages = pkgs.python311.pkgs;})
+    freecad
-    # https://github.com/NixOS/nixpkgs/pull/325726
+    kicad
-    (kicad.override {python3 = pkgs.python311;})
 
     prusa-slicer
   ];

machines/universedesktop/programs/desktop.nix

@@ -24,9 +24,7 @@
       nextcloud-client
       libsForQt5.kdeconnect-kde
 
-      vesktop
+      discord
-      slack
-      signal-desktop
       zoom-us
 
       anki

machines/universedesktop/programs/games.nix

@@ -1,22 +1,15 @@
 { lib, config, pkgs, ... }: {
-  # For steam
+  # # For steam
-  services.flatpak.enable = true;
+  # services.flatpak.enable = true;
-  ## Flatpak requires this
+  # ## Flatpak requires this
   xdg.portal.enable = true;
   xdg.portal.wlr.enable = true;
   xdg.portal.config.common.default = "*";
+  # On X11: Steam requires a compositor for BigPicture
   programs.steam.enable = true;
   # Game compat
   programs.gamemode.enable = true;
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      prismlauncher = prev.prismlauncher.override {
-        withWaylandGLFW=true;
-      };
-    })
-  ];
-
   environment.systemPackages = with pkgs; [
     # For Steam
     protontricks

machines/universedesktop/programs/office.nix

@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    me-emacs
+    emacs
     texlive.combined.scheme-full
     pandoc
     libreoffice-qt

machines/universedesktop/programs/programming.nix

@@ -1,4 +1,10 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: let
+  mypython = let
+    packageOverrides = final: prev: {
+      matplotlib = prev.matplotlib.override {enableGtk3 = true;};
+    };
+  in pkgs.python3.override {inherit packageOverrides;};
+in {
   virtualisation = {
     podman = {
       enable = true;
@@ -9,7 +15,7 @@
     godot_4
     cbqn-replxx
 
-    (pkgs.python3.withPackages (p: (with p; [
+    (mypython.withPackages (p: (with p; [
       scipy
       numpy
       pandas
@@ -18,7 +24,7 @@
       beautifulsoup4
       tqdm
       matplotlib
-      pyqt5
+      colour
 
       ipython
       python-lsp-server

machines/universedesktop/programs/terminal.nix

@@ -9,7 +9,8 @@
     htop
     btop
     xclip
-    screen
+    tio
+    tmux
     usbutils
     man-pages
     man-pages-posix

machines/universedesktop/programs/video.nix

@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     vlc
-    ffmpeg_5-full
+    ffmpeg-full
   ];
 }

machines/universedesktop/riscv.nix

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

machines/universedesktop/secrets/secrets.yaml

@@ -1,4 +1,4 @@
-wireless: ENC[AES256_GCM,data:rOnpkuFvcy3/mNPGVQXm6gjEDkIkmEMNJyugSfKddnWAlqbMbVbBhy8UQg==,iv:7/ba9+kUxsLaVG6uxZjF4WBUGa5i0/FFRyGAhkATEg8=,tag:ZD+Xy69K/txJzC1C/CLDlg==,type:str]
+wireless: ENC[AES256_GCM,data:YR4idzvkgU7RRVeCqabyPWY42FgSqIxl8RX+y947crvLOHyk3CI=,iv:yorheNy2HE9YjWJWDN4AbxJw8lsKYKjdUw79tSy1mR0=,tag:1ofvUhNOLqxfQhNQPkN68Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +14,8 @@ sops:
             WS93Uzg1UkFSSGM1eUR1UG9WRFVCYVEKbnE6DuVqtkynqphNIybtVgfVFJtgm6vI
             XywmFg8F1dOq1xDz97oFBbzbJa1J9qsMjNlPxZkC04snM9msZm9v2g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-08T03:50:15Z"
+    lastmodified: "2024-10-15T23:18:01Z"
-    mac: ENC[AES256_GCM,data:1mZG+AFeBhilH8Zenvy+0YZM60CcCil7KfX02aEci8+0ne3g8y9jrbycCyR/E2wmB/FNYuNvwfwEWroHvooayeTZ09Wlh3D9RhTWPIHIj3s6aTmdV+OkcbfJt6tpuuSLcNcpHWnKF8EBKwPiZZnZSUuoGgEKAPiznV7qPLDYqLc=,iv:GnfojCZ4G6rHOTEYvt8AfAM2Vh1GUsGv3Aevcx9gkT8=,tag:bG/nckGVmSJx4SmsTLrUPg==,type:str]
+    mac: ENC[AES256_GCM,data:cpnUpYOTqPYHjtsbyFxuLH+1oPKAOJeKsR6B6WWux2/yX/+aXfXVDh2MW7EVCKgnnsuj6D6xhPbFU/Fawp+5G7aXIIR8yeGM4QHxJ6qmApWDWmD5SAf/R4E+EvFfID1FVEmZC+IGN7A+1y1GmO31yI6GqRCwFcmdo0ivg1DKo6s=,iv:0Dilkkit3ZDLLYABaJtXPEZVpfxDeoB7obTahMmZGA0=,tag:EHIHM7fj3QS6hGjpCLxrkg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.1