opencode: ditch chatgpt

PR located here: https://github.com/Jovian-Experiments/Jovian-NixOS/pull/550

flake.lock

@@ -6,14 +6,14 @@
           "llm-agents",
           "nixpkgs"
         ],
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1763308703,
-        "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=",
+        "lastModified": 1771437256,
+        "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=",
         "owner": "numtide",
         "repo": "blueprint",
-        "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f",
+        "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33",
         "type": "github"
       },
       "original": {
@@ -24,11 +24,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1765739568,
-        "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
+        "lastModified": 1771121070,
+        "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
+        "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1766051518,
-        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
+        "lastModified": 1770019181,
+        "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
+        "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746728054,
-        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "lastModified": 1768920986,
+        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "rev": "de5708739256238fb912c62f03988815db89ec9a",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1765960743,
-        "narHash": "sha256-zR+EfDMcyAWPSkkXauzaEcbzsKUoDMwNVVtJvsQSXqo=",
+        "lastModified": 1771637851,
+        "narHash": "sha256-GmrqCINhfdO3EthpVG8ZsoTdfzj3vaEdz9soJwiI2HY=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "0dfb874b57690dbbddd8167792de5ea9ff9a7d76",
+        "rev": "ac649cce2abd1eb9d6d3f161928f9a7665b63310",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766195763,
-        "narHash": "sha256-lplNDhZG8lf9o2ZFyOHVxjSnYs4M+bmSbzEhrnNm4LY=",
+        "lastModified": 1771728721,
+        "narHash": "sha256-03w1Ka71dJlerySoIT5ZGm/+bx0qONZIjELY4ghkxIo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "f4ad950dd72c8eb510de4887d52b620d1fe7a96e",
+        "rev": "d7e50ce0c6e1ca698217a251d432799683d23831",
         "type": "github"
       },
       "original": {
@@ -138,19 +138,55 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "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"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -180,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766171975,
-        "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=",
+        "lastModified": 1771683283,
+        "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5",
+        "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
         "type": "github"
       },
       "original": {
@@ -194,12 +230,20 @@
       }
     },
     "impermanence": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1737831083,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "lastModified": 1769548169,
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
         "type": "github"
       },
       "original": {
@@ -216,19 +260,41 @@
         ]
       },
       "locked": {
-        "lastModified": 1766137899,
-        "narHash": "sha256-G4UMKyt6iLlK3eeFQuIKKG+9FwattDMmtYsoF0+b4zk=",
-        "owner": "Jovian-Experiments",
+        "lastModified": 1772169624,
+        "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=",
+        "owner": "Titaniumtown",
         "repo": "Jovian-NixOS",
-        "rev": "d9879776a2ba5def8cf5e73c05b3f62563f77a71",
+        "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444",
         "type": "github"
       },
       "original": {
-        "owner": "Jovian-Experiments",
+        "owner": "Titaniumtown",
+        "ref": "pr/fix-sddm-switch-to-desktop",
         "repo": "Jovian-NixOS",
         "type": "github"
       }
     },
+    "json2steamshortcut": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763116114,
+        "narHash": "sha256-0gI7PnQUDZTFjhHgg0eP1SCJOvW5gw3sQ2UAMspipnQ=",
+        "owner": "ChrisOboe",
+        "repo": "json2steamshortcut",
+        "rev": "b829fe2871fd1736d2406724e4abbb492527cb08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ChrisOboe",
+        "repo": "json2steamshortcut",
+        "type": "github"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -236,14 +302,16 @@
           "nixpkgs"
         ],
         "pre-commit": "pre-commit",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": [
+          "rust-overlay"
+        ]
       },
       "locked": {
-        "lastModified": 1766146127,
-        "narHash": "sha256-6bA+9FNE7bWOUanW6Mujcbzhm9A74dCTUBX5/bA0RVQ=",
+        "lastModified": 1771492583,
+        "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "b8c5ab2bd227f840bc8e1944631fe718b19c3336",
+        "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4",
         "type": "github"
       },
       "original": {
@@ -261,11 +329,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1766209986,
-        "narHash": "sha256-z7O0jxXUC+M8ALwKqyx7s1HfYXM74af4jBJCgPaYZfE=",
+        "lastModified": 1771730908,
+        "narHash": "sha256-AkmTeSJSGniBsCbc+Oy5emrQflyTzUweOVcQLf69z1A=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "21a32502df27ce76bf199415c01e6e4af88a3504",
+        "rev": "352ee8c439a3c2c7987f6cfaebddcf87c924959a",
         "type": "github"
       },
       "original": {
@@ -288,11 +356,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1766209779,
-        "narHash": "sha256-aYOnrT1M5xxqn1Ka66jh9JspE9GejyX16bgA2Fex9dQ=",
+        "lastModified": 1771638124,
+        "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "3a174fe817fc39f09267a464d0ba93606aac7277",
+        "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034",
         "type": "github"
       },
       "original": {
@@ -321,11 +389,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1766207058,
-        "narHash": "sha256-7E45lo+Yt4zaOlrCQWGSGwvFKzS5MxlP0gPCkggy+8w=",
+        "lastModified": 1771305475,
+        "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "7a237e519c69ec493851ffac169abb3aa917a7b3",
+        "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
         "type": "github"
       },
       "original": {
@@ -343,14 +411,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1766047659,
-        "narHash": "sha256-8jebwDZJbJ7rnZ7lJR22m9WsJk6ZPJtozK6HxpNeAEg=",
+        "lastModified": 1771663801,
+        "narHash": "sha256-gh0OVgAERhv1uSXzTgd0p7GioEG1Jg44FVxc72aM//A=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "d53bcf25afb8d0cc056217a85dc4cc07d639cc88",
+        "rev": "0bf7a181e28a8c3d1e89b18f79b15d516f2fb670",
         "type": "github"
       },
       "original": {
@@ -361,11 +429,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1754777568,
-        "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=",
+        "lastModified": 1768656715,
+        "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e",
+        "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
         "type": "github"
       },
       "original": {
@@ -398,11 +466,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "lastModified": 1771423359,
+        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
         "type": "github"
       },
       "original": {
@@ -414,11 +482,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -428,6 +496,48 @@
         "type": "github"
       }
     },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771732280,
+        "narHash": "sha256-pwfFptl7m1Xu+I7eSjapRfIBtVH9rsLpzuaCouraz9U=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "341c5ee138d688ac1a7ffb1543ce2a3c9801aa34",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
+    "oh-my-opencode": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770618333,
+        "narHash": "sha256-7Y9e2nrsi4yKwBXZ7RUF1B5FN4RJUT4rYI1SvA0vDEw=",
+        "owner": "yebei199",
+        "repo": "oh-my-opencode",
+        "rev": "bde5264e4c3a91ded482acd35c8ed239d21d1de2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yebei199",
+        "ref": "nix",
+        "repo": "oh-my-opencode",
+        "type": "github"
+      }
+    },
     "pre-commit": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -438,11 +548,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765464257,
-        "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
+        "lastModified": 1770726378,
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
         "type": "github"
       },
       "original": {
@@ -459,6 +569,7 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "jovian-nixos": "jovian-nixos",
+        "json2steamshortcut": "json2steamshortcut",
         "lanzaboote": "lanzaboote",
         "llm-agents": "llm-agents",
         "niri": "niri",
@@ -466,43 +577,24 @@
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay_2",
+        "noctalia": "noctalia",
+        "oh-my-opencode": "oh-my-opencode",
+        "rust-overlay": "rust-overlay",
         "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
-          "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1765680428,
-        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
+        "lastModified": 1771729765,
+        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1766198367,
-        "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3",
+        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
         "type": "github"
       },
       "original": {
@@ -556,6 +648,36 @@
         "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"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -564,11 +686,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766000401,
-        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
+        "lastModified": 1770228511,
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {
@@ -615,11 +737,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1765935116,
-        "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=",
+        "lastModified": 1771195969,
+        "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4",
+        "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
         "type": "github"
       },
       "original": {
@@ -638,11 +760,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766204826,
-        "narHash": "sha256-NccmxYNOUHLLehsBLaeZ3QtVlDfIW1FDBe3W/kIDwa0=",
+        "lastModified": 1771719171,
+        "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "4563d0ffdf586368f1bec1a39cc20c9b12b73884",
+        "rev": "2a71f2e720db962f2522b38704e23e11163e91ae",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,6 +7,7 @@
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-overlay.follows = "rust-overlay";
     };
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -54,6 +55,8 @@
 
     impermanence = {
       url = "github:nix-community/impermanence";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
 
     deploy-rs = {
@@ -62,7 +65,12 @@
     };
 
     jovian-nixos = {
-      url = "github:Jovian-Experiments/Jovian-NixOS";
+      url = "github:Titaniumtown/Jovian-NixOS/pr/fix-sddm-switch-to-desktop";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -70,6 +78,17 @@
       url = "github:numtide/llm-agents.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # wait for https://github.com/code-yeongyu/oh-my-opencode/pull/921 to be merged
+    oh-my-opencode = {
+      url = "github:yebei199/oh-my-opencode/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    json2steamshortcut = {
+      url = "github:ChrisOboe/json2steamshortcut";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -93,7 +112,7 @@
       niri-package = inputs.niri.packages.${system}.niri-unstable;
     in
     {
-      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
+      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
 
       nixosConfigurations = nixpkgs.lib.foldl' (
         config: hostname:

home-manager/desktop.nix

@@ -10,13 +10,16 @@
     ./progs/niri.nix
 
     # statusbar
-    ./progs/eww/eww.nix
+    # ./progs/eww/eww.nix
 
     # lockscreen
     ./progs/swaylock.nix
 
     # notification daemon
     ./progs/dunst.nix
+
+    # noctalia desktop shell
+    ./progs/noctalia.nix
   ];
 
   home.packages = with pkgs; [

home-manager/gui.nix

@@ -18,6 +18,7 @@
     pkg:
     builtins.elem (lib.getName pkg) [
       "apple_cursor"
+      "grayjay"
     ];
 
   home.packages =
@@ -34,6 +35,7 @@
       [
         tor-browser
         inputs.zen-browser.packages."${system}".twilight
+        grayjay
       ]
 
       # music library management

home-manager/home-yarn.nix

@@ -9,6 +9,7 @@
   imports = [
     ./gui.nix
     ./desktop.nix
+    inputs.json2steamshortcut.homeModules.default
   ];
 
   home.packages = with pkgs; [
@@ -26,4 +27,18 @@
       obs-pipewire-audio-capture
     ];
   };
+
+  services.steam-shortcuts = {
+    enable = true;
+    overwriteExisting = true;
+    steamUserId = lib.strings.toInt (lib.strings.trim (builtins.readFile ./secrets/steam-user-id));
+    shortcuts = [
+      {
+        AppName = "Prism Launcher";
+        Exe = "${pkgs.prismlauncher}/bin/prismlauncher";
+        Icon = "${pkgs.prismlauncher}/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg";
+        Tags = [ "Game" ];
+      }
+    ];
+  };
 }

home-manager/no-gui.nix

@@ -10,7 +10,7 @@
 }:
 let
   rust_pkgs = with pkgs; [
-    (rust-bin.stable.latest.default.override ({
+    (rust-bin.nightly.latest.default.override ({
       extensions = [
         "rust-src"
         "rust-analyzer"
@@ -147,7 +147,7 @@ in
         sshfs
 
         # nix formatter
-        nixfmt-rfc-style
+        nixfmt-tree
 
         # serial viewer
         minicom
@@ -160,7 +160,7 @@ in
         # microcontroller tooling
         probe-rs-tools
 
-        (python312.withPackages (
+        (python313.withPackages (
           ps: with ps; [
             mypy # type checking
             types-requests # add types for requests methods
@@ -218,7 +218,7 @@ in
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''
-    [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
+    [target.${lib.strings.removeSuffix "-linux" pkgs.stdenv.hostPlatform.system}-unknown-linux-gnu]
     linker = "${lib.getExe pkgs.clang}"
     rustflags = ["-Clink-arg=-Wl,--no-rosegment"]
   '';
@@ -230,6 +230,8 @@ in
 
     lfs.enable = true;
 
+    ignores = [ ".sisyphus" ];
+
     settings = {
       init = {
         # master -> main

home-manager/progs/emacs.nix

@@ -25,8 +25,10 @@
     emacs = pkgs.emacs-unstable-pgtk;
     extraPackages =
       epkgs:
+      with epkgs;
       [
-        epkgs.dracula-theme
+        dracula-theme
+        treesit-grammars.with-all-grammars
       ]
       ++ (with pkgs; [
         shellcheck

home-manager/progs/eww/eww.nix

@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 {
   home.packages = with pkgs; [
     zsh
@@ -11,4 +16,25 @@
     enable = true;
     configDir = ./config;
   };
+
+  programs.niri.settings.spawn-at-startup = [
+    {
+      command = [
+        (lib.getExe config.programs.eww.package)
+        "-c"
+        "${config.programs.eww.configDir}"
+        "open"
+        "statusbar"
+      ];
+    }
+
+    # swaybg works on more than just sway (sets a wallpaper)
+    {
+      command = [
+        (lib.getExe pkgs.swaybg)
+        "-i"
+        "${../wallpaper.png}"
+      ];
+    }
+  ];
 }

home-manager/progs/niri.nix

@@ -60,27 +60,6 @@ in
 
       xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
 
-      spawn-at-startup = [
-        {
-          command = [
-            (lib.getExe config.programs.eww.package)
-            "-c"
-            "${config.programs.eww.configDir}"
-            "open"
-            "statusbar"
-          ];
-        }
-
-        # swaybg works on more than just sway (sets a wallpaper)
-        {
-          command = [
-            (lib.getExe pkgs.swaybg)
-            "-i"
-            "${../wallpaper.png}"
-          ];
-        }
-      ];
-
       window-rules = [
         { draw-border-with-background = false; }
         {

home-manager/progs/noctalia.nix

@@ -0,0 +1,92 @@
+{
+  pkgs,
+  inputs,
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    inputs.noctalia.homeModules.default
+  ];
+
+  programs.noctalia-shell = {
+    enable = true;
+    settings = {
+      bar = {
+        position = "top";
+        floating = true;
+        backgroundOpacity = 0.93;
+      };
+      general = {
+        animationSpeed = 1.5;
+        radiusRatio = 1.2;
+      };
+      colorSchemes = {
+        darkMode = true;
+        useWallpaperColors = true;
+      };
+      location = {
+        weatherEnabled = false;
+      };
+      wallpaper = {
+        enabled = true;
+      };
+    };
+  };
+
+  home.file.".cache/noctalia/wallpapers.json" = {
+    text = builtins.toJSON {
+      defaultWallpaper = "${../wallpaper.png}";
+      wallpapers = { };
+    };
+  };
+
+  programs.niri.settings = {
+    spawn-at-startup = [
+      {
+        command = [
+          "noctalia-shell"
+        ];
+      }
+    ]; # place noctalia overview wallpaper on the backdrop layer
+    layer-rules = [
+      {
+        matches = [
+          { namespace = "^noctalia-overview*"; }
+        ];
+        place-within-backdrop = true;
+      }
+    ];
+
+    # allow notification actions and window activation from noctalia
+    debug = {
+      honor-xdg-activation-with-invalid-serial = [ ];
+    };
+
+    binds =
+      with config.lib.niri.actions;
+      let
+        noctalia =
+          cmd:
+          [
+            "noctalia-shell"
+            "ipc"
+            "call"
+          ]
+          ++ (lib.splitString " " cmd);
+
+      in
+      {
+
+        # noctalia shell keybinds
+        "Mod+D".action = spawn (noctalia "launcher toggle");
+        "Mod+A".action = spawn (noctalia "controlCenter toggle");
+        "Mod+Escape".action = spawn (noctalia "sessionMenu toggle");
+        "Mod+Shift+X".action = spawn (noctalia "lockScreen lock");
+        "Mod+N".action = spawn (noctalia "notifications toggleHistory");
+
+      };
+  };
+
+}

home-manager/progs/opencode.nix

@@ -5,9 +5,105 @@
   inputs,
   ...
 }:
+let
+  # what model should be used in place of haiku?
+  haiku-model = "zai-coding-plan/glm-5";
+
+  opus-model = "zai-coding-plan/glm-5";
+
+  ohMyOpencodeConfig = {
+    "$schema" =
+      "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
+    agents = {
+      sisyphus.model = opus-model;
+      sisyphus-junior.model = opus-model;
+      oracle = opus-model;
+      librarian.model = haiku-model;
+      explore.model = haiku-model;
+      multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking";
+
+      prometheus.model = opus-model;
+      metis.model = opus-model;
+      momus = opus-model;
+      atlas.model = opus-model;
+    };
+    categories = {
+      visual-engineering.model = "openrouter/google/gemini-3-pro";
+      ultrabrain = opus-model;
+      artistry = {
+        model = "openrouter/google/gemini-3-pro";
+        variant = "max";
+      };
+      quick.model = haiku-model;
+      deep.model = opus-model;
+      writing.model = "openrouter/google/gemini-3-flash-preview";
+    };
+  };
+in
 {
+  home.packages =
+    let
+      ohMyOpencode =
+        let
+          orig = inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system};
+          fixed-node_modules = orig.node_modules.overrideAttrs (_: {
+            outputHash = "sha256-qq/eEoxFELVdt4qaJkrw8XNZ/Ph/RJdsyIp7LteQE5A=";
+          });
+        in
+        orig.oh-my-opencode.overrideAttrs (_: {
+          buildPhase = ''
+            cp -r ${fixed-node_modules}/node_modules .
+            chmod -R u+w node_modules
+            patchShebangs node_modules/
+            export HOME=$(mktemp -d)
+            bun run build
+          '';
+        });
+    in
+    [
+      ohMyOpencode
+      pkgs.playwright-driver.browsers
+    ];
+
+  home.sessionVariables = {
+    PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}";
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+  };
+
+  xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig;
+
+  xdg.configFile."opencode/skills/playwright.md".text =
+    let
+      browsers = pkgs.playwright-driver.browsers;
+      chromiumDir = builtins.head (
+        builtins.filter (n: builtins.match "chromium-[0-9]+" n != null) (
+          builtins.attrNames browsers.passthru.entries
+        )
+      );
+      chromiumPath = "${browsers}/${chromiumDir}/chrome-linux64/chrome";
+    in
+    ''
+      ---
+      name: playwright
+      description: "MUST USE for any browser-related tasks. Browser automation via Playwright MCP - verification, browsing, information gathering, web scraping, testing, screenshots, and all browser interactions."
+      mcp:
+        playwright:
+          command: npx
+          args:
+            - "@playwright/mcp@latest"
+            - "--executable-path"
+            - "${chromiumPath}"
+            - "--user-data-dir"
+            - "${config.home.homeDirectory}/.cache/playwright-mcp"
+      ---
+
+      # Playwright Browser Automation
+
+      This skill provides browser automation capabilities via the Playwright MCP server.
+    '';
+
   programs.opencode = {
-    package = inputs.llm-agents.packages.${pkgs.system}.opencode;
+    package = inputs.llm-agents.packages.${pkgs.stdenv.targetPlatform.system}.opencode;
     enable = true;
     rules = ''
       You are an intelligent and observant agent.
@@ -20,32 +116,84 @@
       ## Misc
       For long-running commands, make sure you set the timeout of the Bash tool provided to a larger value.
       Do NOT read secret files. Do not directly read files that are api keys or are contextually sensitive.
+      Do NOT run `skill_mcp [mcp_name=playwright, tool_name=browser_install]` as browsers are provided by NixOS via PLAYWRIGHT_BROWSERS_PATH.
 
       ## Behavior
       Do not be sycophantic in your responses.
       Do not use emojis unless explicitly asked to. This includes in code.
-      ALWAYS test code before returning to the user with something you think works. Always verify your work.
+      Use Test Driven Development methodology.
 
       ## Nix
       For using `nix build` append `-L` to get better visibility into the logs.
       If you get an error that a file can't be found, always try to `git add` the file before trying other troubleshooting steps.
+
+
+      ## Android UI Interaction Workflow Summary
+      1. Taking Screenshots
+      adb exec-out screencap -p > /tmp/screen.png
+      Captures the current screen state as a PNG image.
+
+      2. Analyzing Screenshots
+      I delegate screenshot analysis to an explore agent rather than analyzing images directly:
+      mcp_task(subagent_type="explore", prompt="Analyze /tmp/screen.png. What screen is this? What elements are visible?")
+      The agent describes the UI, identifies elements, and estimates Y coordinates.
+
+      3. Getting Precise Element Coordinates
+      UI Automator dump - extracts the full UI hierarchy as XML:
+      adb shell uiautomator dump /sdcard/ui.xml && adb pull /sdcard/ui.xml /tmp/ui.xml
+      Then grep for specific elements:
+      # Find by text
+      grep -oP 'text="Login".*?bounds="[^"]*"' /tmp/ui.xml
+      # Find by class
+      grep -oP 'class="android.widget.EditText".*?bounds="[^"]*"' /tmp/ui.xml
+      Bounds format: [left,top][right,bottom] → tap center: ((left+right)/2, (top+bottom)/2)
+
+      4. Tapping Elements
+      adb shell input tap X Y
+      Where X, Y are pixel coordinates from the bounds.
+
+      5. Text Input
+      adb shell input text "some_text"
+      Note: Special characters need escaping (\!, \;, etc.)
+
+      6. Other Gestures
+      # Swipe/scroll
+      adb shell input swipe startX startY endX endY duration_ms
+      # Key events
+      adb shell input keyevent KEYCODE_BACK
+      adb shell input keyevent KEYCODE_ENTER
+
+      7. WebView Limitation
+      - UI Automator can see WebView content if accessibility is enabled
+      - Touch events on iframe content (like Cloudflare Turnstile) often fail due to cross-origin isolation
+      - Form fields in WebViews work if you get exact bounds from the UI dump
+
+      Typical Flow
+      1. Take screenshot → analyze with explore agent (get rough layout)
+      2. Dump UI hierarchy → grep for exact element bounds
+         - NEVER ASSUME COORDINATES. You must ALWAYS check first.
+         - Do this before ANY tap action as elements on the screen may of changed.
+      3. Calculate center coordinates from bounds
+      4. Tap/interact
+      5. Wait → screenshot → verify result
     '';
     settings = {
       theme = "opencode";
 
-      model = "openrouter/mistralai/devstral-2512:free";
+      model = opus-model;
       # small model used for titles
       small_model = "openrouter/openai/gpt-oss-20b:free";
 
       autoshare = false;
+      # note: this updates opencode (and plugins like oh-my-opencode) at launch,
+      # bypassing the version pinned in flake.lock
       autoupdate = true;
-      agent = {
-      };
+      agent = { };
+      plugin = [ "oh-my-opencode" ];
       provider = {
         openrouter = {
           models = {
             "openai/gpt-oss-20b:free" = { };
-            "mistralai/devstral-2512:free" = { };
           };
           options = {
             # TODO! use agenix here instead

system/common.nix

@@ -11,8 +11,7 @@
 }:
 {
   imports = [
-    ./declarative-nm.nix
-    # ./vm.nix
+    ./vm.nix
     ./steam.nix
     ./networking.nix
 
@@ -24,11 +23,6 @@
     inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
-  # use tuned instead of tlp or ppd
-  services.power-profiles-daemon.enable = false;
-  services.tlp.enable = false;
-  services.tuned.enable = true;
-
   # allow overclocking (I actually underclock but lol)
   hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF";
 
@@ -110,6 +104,7 @@
     };
 
     initrd = {
+      systemd.enable = true;
       compressor = "zstd";
       availableKernelModules = [
         "xhci_pci"
@@ -127,6 +122,13 @@
       "msr"
       "btusb"
     ];
+
+    kernelParams = [
+      # 1gb huge pages
+      "hugepagesz=1G"
+      "hugepages=3"
+    ];
+
   };
 
   environment.etc = {
@@ -162,6 +164,12 @@
 
     # power statistics
     upower.enable = true;
+
+    # power profiles for noctalia shell
+    power-profiles-daemon.enable = true;
+
+    # geolocation (uses beacondb.net by default)
+    geoclue2.enable = true;
   };
 
   # EST
@@ -198,7 +206,8 @@
 
   # Enable sound with pipewire.
   services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio
-  security.rtkit.enable = true;
+  # BUG! disable rtkit in order to fix mumble: https://github.com/NixOS/nixpkgs/issues/392992#issuecomment-2799867278
+  security.rtkit.enable = false;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -223,8 +232,6 @@
   services.gvfs.enable = true;
   programs.gphoto2.enable = true;
 
-  programs.adb.enable = true;
-
   # Enable thermal data
   services.thermald.enable = true;
 
@@ -237,7 +244,7 @@
 
   # System packages
   environment.systemPackages = with pkgs; [
-    mullvad-vpn
+    # mullvad-vpn is provided by services.mullvad-vpn.enable
 
     #secureboot ctl
     sbctl
@@ -256,6 +263,7 @@
     git
 
     tmux
+    android-tools
   ];
 
   # wayland with electron/chromium applications

system/declarative-nm.nix

@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-# from: https://discourse.nixos.org/t/imperative-declarative-wifi-networks-with-wpa-supplicant/12394/6
-let
-  cfg = config.networking.networkmanager;
-
-  getFileName = lib.stringAsChars (x: if x == " " then "-" else x);
-
-  createWifi = ssid: opt: {
-    name = "NetworkManager/system-connections/${getFileName ssid}.nmconnection";
-    value = {
-      mode = "0400";
-      source = pkgs.writeText "${ssid}.nmconnection" ''
-        [connection]
-        id=${ssid}
-        type=wifi
-
-        [wifi]
-        ssid=${ssid}
-
-        [wifi-security]
-        ${lib.optionalString (opt.psk != null) ''
-          key-mgmt=wpa-psk
-          psk=${opt.psk}''}
-      '';
-    };
-  };
-
-  keyFiles = lib.mapAttrs' createWifi config.networking.wireless.networks;
-in
-{
-  config = lib.mkIf cfg.enable {
-    environment.etc = keyFiles;
-
-    systemd.services.NetworkManager-predefined-connections = {
-      restartTriggers = lib.mapAttrsToList (name: value: value.source) keyFiles;
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${pkgs.coreutils}/bin/true";
-        ExecReload = "${pkgs.networkmanager}/bin/nmcli connection reload";
-      };
-      reloadIfChanged = true;
-      wantedBy = [ "multi-user.target" ];
-    };
-  };
-}

system/impermanence.nix

@@ -21,12 +21,15 @@
       "/etc/ssh/ssh_host_rsa_key.pub"
       "/etc/machine-id"
     ];
-
-    users.${username} = {
-      directories = [
-        "."
-      ];
   };
+
+  # Bind mount entire home directory from persistent storage
+  # (impermanence doesn't support "." so we do this directly)
+  fileSystems."/home/${username}" = {
+    device = "/persistent/home/${username}";
+    fsType = "none";
+    options = [ "bind" ];
+    neededForBoot = true;
   };
 
   systemd.tmpfiles.rules = [

system/networking.nix

@@ -17,10 +17,10 @@
       wifi = {
         scanRandMacAddress = true;
         # fix suspend issue
-        powersave = false;
-      };
+        # powersave = false;
       };
 
-    wireless.networks = import ./secrets/wifi-passwords.nix;
+      ensureProfiles.profiles = import ./secrets/wifi-passwords.nix;
+    };
   };
 }

system/system-mreow.nix

@@ -14,6 +14,12 @@
     inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
   ];
 
+  # Disable PSR, PSR-SU, and Panel Replay to fix display hangs and corruption.
+  # Panel Replay requires PSR/PSR-SU to also be disabled to avoid issues.
+  # This overrides nixos-hardware's 0x10 with 0x410 (last value wins in kernel cmdline).
+  # https://github.com/NixOS/nixos-hardware/pull/1692
+  boot.kernelParams = lib.mkAfter [ "amdgpu.dcdebugmask=0x410" ];
+
   hardware.framework.laptop13.audioEnhancement.rawDeviceName =
     lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";
 

system/system-yarn.nix

@@ -33,6 +33,22 @@
 
   networking.hostId = "abf570f9";
 
+  # Static IP for consistent SSH access
+  networking.networkmanager.ensureProfiles.profiles.enp7s0-static = {
+    connection = {
+      id = "enp7s0-static";
+      type = "ethernet";
+      interface-name = "enp7s0";
+      autoconnect = true;
+    };
+    ipv4 = {
+      method = "manual";
+      address1 = "192.168.1.223/24,192.168.1.1";
+      dns = "1.1.1.1;9.9.9.9;";
+    };
+    ipv6.method = "disabled";
+  };
+
   services.openssh = {
     enable = true;
     ports = [ 22 ];
@@ -75,6 +91,71 @@
       "steam-run"
     ];
 
+  # Override jovian-stubs to disable steamos-update kernel check
+  # This prevents Steam from requesting reboots for "system updates"
+  # Steam client updates will still work normally
+  nixpkgs.overlays = [
+    (final: prev: {
+      jovian-stubs = prev.stdenv.mkDerivation {
+        name = "jovian-stubs-no-update";
+        dontUnpack = true;
+        installPhase = ''
+          mkdir -p $out/bin
+
+          # steamos-update: always report "no update available" (exit 7)
+          # This disables the kernel mismatch check that triggers reboot prompts
+          cat > $out/bin/steamos-update << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $* (system updates disabled)"
+          exit 7
+          STUB
+
+          # steamos-reboot: reboot the system
+          cat > $out/bin/steamos-reboot << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          systemctl reboot
+          STUB
+
+          # steamos-select-branch: no-op stub
+          cat > $out/bin/steamos-select-branch << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # steamos-factory-reset-config: no-op stub
+          cat > $out/bin/steamos-factory-reset-config << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # steamos-firmware-update: no-op stub
+          cat > $out/bin/steamos-firmware-update << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # pkexec: pass through to real pkexec
+          cat > $out/bin/pkexec << 'STUB'
+          #!/bin/sh
+          exec /run/wrappers/bin/pkexec "$@"
+          STUB
+
+          # sudo: pass through to doas
+          cat > $out/bin/sudo << 'STUB'
+          #!/bin/sh
+          exec /run/wrappers/bin/doas "$@"
+          STUB
+
+          chmod 755 $out/bin/*
+        '';
+      };
+    })
+  ];
+
   jovian = {
     devices.steamdeck.enable = false;
     steam = {
@@ -85,6 +166,10 @@
     };
   };
 
+  # Jovian-NixOS requires sddm
+  # https://github.com/Jovian-Experiments/Jovian-NixOS/commit/52f140c07493f8bb6cd0773c7e1afe3e1fd1d1fa
+  services.displayManager.sddm.wayland.enable = true;
+
   # Disable gamescope from common.nix to avoid conflict with jovian-nixos
   programs.gamescope.enable = lib.mkForce false;
 }

system/vm.nix

@@ -5,6 +5,14 @@
   ...
 }:
 {
+  # android virtualization
+  virtualisation.waydroid = {
+    enable = true;
+
+    # https://github.com/NixOS/nixpkgs/pull/466473
+    package = pkgs.waydroid-nftables;
+  };
+
   programs.virt-manager.enable = true;
 
   users.groups.libvirtd.members = [ username ];
@@ -13,36 +21,6 @@
     enable = true;
 
     package = pkgs.libvirt;
-
-    qemu = {
-      package = (
-        pkgs.qemu_kvm.overrideAttrs (old: {
-          patches = old.patches ++ [
-            # amd?
-            (pkgs.fetchpatch {
-              url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch";
-              sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA=";
-            })
-
-            # or intel!
-            /*
-              (pkgs.fetchpatch {
-                url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch";
-                sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg=";
-              })
-            */
-          ];
-        })
-      );
-
-      ovmf.packages = lib.mkForce [
-        (pkgs.OVMF.overrideAttrs (old: {
-          secureBoot = true;
-          tpmSupport = true;
-          # TODO! add patches from: https://github.com/Scrut1ny/Hypervisor-Phantom/tree/main/Hypervisor-Phantom/patches/EDK2
-        })).fd
-      ];
-    };
   };
 
   virtualisation.spiceUSBRedirection.enable = true;

system/vr.nix

@@ -42,7 +42,7 @@
           }
         ];
 
-        application = [ pkgs.wlx-overlay-s ];
+        application = [ pkgs.wayvr ];
       };
     };
   };