opencode: ditch chatgpt

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

.gitattributes

@@ -1,4 +1,2 @@
-etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt
+/system/secrets/** filter=git-crypt diff=git-crypt
-etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt
+/home-manager/secrets/** filter=git-crypt diff=git-crypt
-etcnixos/secrets/disk-password filter=git-crypt diff=git-crypt
-etcnixos/secrets/password-hash filter=git-crypt diff=git-crypt

etcnixos/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" ];
-    };
-  };
-}

etcnixos/hardware_desktop.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-{
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/ff51be5a-b87b-4e6a-9c1d-796ceeaca153";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/3D37-E610";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
-  fileSystems."/media/games" = {
-    device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
-    fsType = "f2fs";
-    options = [ "nofail" ];
-  };
-
-}

etcnixos/system-mreow.nix

@@ -1,55 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  username,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./common.nix
-    ./hardware_laptop.nix
-
-    inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
-  ];
-
-  # completely and utterly broken
-  /*
-    hardware.framework.laptop13.audioEnhancement = {
-      enable = true;
-
-      # seems audio doesn't work without this
-      hideRawDevice = false;
-    };
-  */
-
-  # PST
-  # time.timeZone = lib.mkForce "America/Los_Angeles";
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
-        user = username;
-      };
-    };
-  };
-
-  system.activationScripts = {
-    # FIX: https://github.com/NixOS/nix/issues/2982
-    "profile-channel-dummy".text = ''
-      #!/bin/sh
-      mkdir -p /nix/var/nix/profiles/per-user/root/channels
-    '';
-  };
-
-  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
-  # if I move to another lock screen program, i will have to replace `swaylock`
-  security.pam.services.swaylock = { };
-
-  # disable framework kernel module
-  # https://github.com/NixOS/nixos-hardware/issues/1330
-  hardware.framework.enableKmod = false;
-}

etcnixos/system-yarn.nix

@@ -1,77 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  username,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./common.nix
-    ./hardware_desktop.nix
-    ./no-rgb.nix
-    ./vr.nix
-
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
-  ];
-  networking.hostId = "abf570f9";
-  boot = {
-    kernelModules = [
-      # kernel module for case fan control
-      "nct6775"
-    ];
-  };
-
-  # services.openssh = {
-  #   enable = true;
-  #   ports = [ 22 ];
-  #   settings = {
-  #     PasswordAuthentication = true;
-  #     AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
-  #     UseDns = true;
-  #     X11Forwarding = false;
-  #     PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
-  #   };
-  # };
-
-  programs.steam = {
-    remotePlay.openFirewall = true;
-    localNetworkGameTransfers.openFirewall = true;
-  };
-
-  # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT
-  environment.systemPackages = with pkgs; [
-    lact
-  ];
-  systemd.packages = with pkgs; [ lact ];
-  systemd.services.lactd.wantedBy = [ "multi-user.target" ];
-
-  systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\"";
-
-  # control case fans with gpu temperature
-  # I have case fans attached to my gpu for better cooling
-  hardware.fancontrol = {
-    enable = false;
-    config =
-      let
-        select_hwmon = "hwmon/hwmon[[:print:]]*";
-        gpu_path = "/sys/bus/pci/drivers/amdgpu/0000:0c:00.0/${select_hwmon}";
-        mobo_path = "/sys/devices/platform/nct6775.656/${select_hwmon}";
-        fan_speed = "${mobo_path}/pwm4";
-      in
-      ''
-        INTERVAL=10
-        FCTEMPS=${fan_speed}=${gpu_path}/temp1_input
-        FCFANS= ${fan_speed}=${mobo_path}/fan4_input
-        MINTEMP=${fan_speed}=40
-        MAXTEMP=${fan_speed}=80
-        MINSTART=${fan_speed}=150
-        MINSTOP=${fan_speed}=0
-        MAXPWM=${fan_speed}=255
-      '';
-  };
-
-  systemd.services.fancontrol.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\"";
-}

etcnixos/vm.nix

@@ -1,61 +0,0 @@
-{
-  pkgs,
-  username,
-  lib,
-  ...
-}:
-{
-  programs.virt-manager.enable = true;
-
-  users.groups.libvirtd.members = [ username ];
-
-  virtualisation.libvirtd = {
-    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;
-
-  users.users."${username}".extraGroups = [ "libvirtd" ];
-
-  # boot.kernelPatches = [
-  #   {
-  #     name = "undetected-kvm";
-  #     patch = pkgs.fetchurl {
-  #       url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
-  #       sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
-  #     };
-  #   }
-  # ];
-}

flake.lock

@@ -1,12 +1,34 @@
 {
   "nodes": {
+    "blueprint": {
+      "inputs": {
+        "nixpkgs": [
+          "llm-agents",
+          "nixpkgs"
+        ],
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1771437256,
+        "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=",
+        "owner": "numtide",
+        "repo": "blueprint",
+        "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "blueprint",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
-        "lastModified": 1754269165,
+        "lastModified": 1771121070,
-        "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
+        "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
+        "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1",
         "type": "github"
       },
       "original": {
@@ -15,6 +37,28 @@
         "type": "github"
       }
     },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1770019181,
+        "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -22,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746728054,
+        "lastModified": 1768920986,
-        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "rev": "de5708739256238fb912c62f03988815db89ec9a",
         "type": "github"
       },
       "original": {
@@ -39,11 +83,11 @@
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1760602791,
+        "lastModified": 1771637851,
-        "narHash": "sha256-voIvrHMgs2zFNtYDxVnyBpmSCE3NFZAhhcZsUneDMLw=",
+        "narHash": "sha256-GmrqCINhfdO3EthpVG8ZsoTdfzj3vaEdz9soJwiI2HY=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "f9664ae058d67b8d97cb8a9c40744fefc3e5479f",
+        "rev": "ac649cce2abd1eb9d6d3f161928f9a7665b63310",
         "type": "github"
       },
       "original": {
@@ -62,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762308713,
+        "lastModified": 1771728721,
-        "narHash": "sha256-EaX+Yu/nsPDe+1rv2RSPP/zc5Jotc0HD3XzQVA7LxnI=",
+        "narHash": "sha256-03w1Ka71dJlerySoIT5ZGm/+bx0qONZIjELY4ghkxIo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "80b800345a4bbe611aafb9f722b2928a12b93222",
+        "rev": "d7e50ce0c6e1ca698217a251d432799683d23831",
         "type": "github"
       },
       "original": {
@@ -78,11 +122,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1733328505,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -91,24 +135,55 @@
         "type": "github"
       }
     },
-    "flake-parts": {
+    "flake-compat_2": {
-      "inputs": {
+      "flake": false,
-        "nixpkgs-lib": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1754091436,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "hercules-ci",
+        "owner": "NixOS",
-        "repo": "flake-parts",
+        "repo": "flake-compat",
-        "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
+        "owner": "NixOS",
-        "repo": "flake-parts",
+        "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"
       }
     },
@@ -116,7 +191,7 @@
       "inputs": {
         "nixpkgs": [
           "lanzaboote",
-          "pre-commit-hooks-nix",
+          "pre-commit",
           "nixpkgs"
         ]
       },
@@ -141,39 +216,102 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1771683283,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "impermanence": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769548169,
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
+    "jovian-nixos": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772169624,
+        "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=",
+        "owner": "Titaniumtown",
+        "repo": "Jovian-NixOS",
+        "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444",
+        "type": "github"
+      },
+      "original": {
+        "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",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
+        "pre-commit": "pre-commit",
         "rust-overlay": [
           "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1762205063,
+        "lastModified": 1771492583,
-        "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
+        "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
+        "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4",
         "type": "github"
       },
       "original": {
@@ -182,6 +320,28 @@
         "type": "github"
       }
     },
+    "llm-agents": {
+      "inputs": {
+        "blueprint": "blueprint",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1771730908,
+        "narHash": "sha256-AkmTeSJSGniBsCbc+Oy5emrQflyTzUweOVcQLf69z1A=",
+        "owner": "numtide",
+        "repo": "llm-agents.nix",
+        "rev": "352ee8c439a3c2c7987f6cfaebddcf87c924959a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "llm-agents.nix",
+        "type": "github"
+      }
+    },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -196,11 +356,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1762307471,
+        "lastModified": 1771638124,
-        "narHash": "sha256-tfT7MtW77rOtu3nfClgJm8FO1E/esoGY7xy+QZ3ob9c=",
+        "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "0abb5bca37e977cd4d04f95a35b7091adfeea1c3",
+        "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034",
         "type": "github"
       },
       "original": {
@@ -229,11 +389,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762146685,
+        "lastModified": 1771305475,
-        "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=",
+        "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943",
+        "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
         "type": "github"
       },
       "original": {
@@ -251,14 +411,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1762245876,
+        "lastModified": 1771663801,
-        "narHash": "sha256-xEZqTOyPCX1vjpW42JFPiUQfi/XmB5z+MqF4q+Ka1gw=",
+        "narHash": "sha256-gh0OVgAERhv1uSXzTgd0p7GioEG1Jg44FVxc72aM//A=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "c0aaa1fabedf4d9b63d4321e7eb7b52fc96a3267",
+        "rev": "0bf7a181e28a8c3d1e89b18f79b15d516f2fb670",
         "type": "github"
       },
       "original": {
@@ -269,11 +429,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1754777568,
+        "lastModified": 1768656715,
-        "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=",
+        "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e",
+        "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
         "type": "github"
       },
       "original": {
@@ -282,13 +442,35 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "jovian-nixos",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729697500,
+        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
+        "owner": "zhaofengli",
+        "repo": "nix-github-actions",
+        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "ref": "matrix-name",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762267440,
+        "lastModified": 1771423359,
-        "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=",
+        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15",
+        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
         "type": "github"
       },
       "original": {
@@ -300,26 +482,65 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761999846,
+        "lastModified": 1771369470,
-        "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "pre-commit-hooks-nix": {
+    "noctalia": {
       "inputs": {
-        "flake-compat": [
+        "nixpkgs": [
-          "lanzaboote",
+          "nixpkgs"
-          "flake-compat"
+        ]
-        ],
+      },
+      "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",
         "gitignore": "gitignore",
         "nixpkgs": [
           "lanzaboote",
@@ -327,11 +548,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750779888,
+        "lastModified": 1770726378,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
         "type": "github"
       },
       "original": {
@@ -342,15 +563,22 @@
     },
     "root": {
       "inputs": {
+        "deploy-rs": "deploy-rs",
         "disko": "disko",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
+        "impermanence": "impermanence",
+        "jovian-nixos": "jovian-nixos",
+        "json2steamshortcut": "json2steamshortcut",
         "lanzaboote": "lanzaboote",
+        "llm-agents": "llm-agents",
         "niri": "niri",
         "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "noctalia": "noctalia",
+        "oh-my-opencode": "oh-my-opencode",
         "rust-overlay": "rust-overlay",
         "zen-browser": "zen-browser"
       }
@@ -362,11 +590,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762310305,
+        "lastModified": 1771729765,
-        "narHash": "sha256-EW7xlGJnCW3mKujn/F8me52NXB4nBtabArsRNwehtHM=",
+        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4e8e5dfb8e649d3e05d9a173ce9a9cb0498e89c2",
+        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
         "type": "github"
       },
       "original": {
@@ -390,6 +618,105 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "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"
+      }
+    },
+    "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": [
+          "llm-agents",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770228511,
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "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"
+      }
+    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
@@ -410,11 +737,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1762302024,
+        "lastModified": 1771195969,
-        "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=",
+        "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2",
+        "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
         "type": "github"
       },
       "original": {
@@ -433,11 +760,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762310635,
+        "lastModified": 1771719171,
-        "narHash": "sha256-yA6dIqFGGHzSFGaFtCDQP70X++2V9d6T8KI7eAnwbWc=",
+        "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "3a02f3ff6dc3708329e95f17beaa8f30f09d0894",
+        "rev": "2a71f2e720db962f2522b38704e23e11163e91ae",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "System nixOS flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
@@ -13,7 +13,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -52,6 +52,43 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.emacs-overlay.follows = "emacs-overlay";
     };
+
+    impermanence = {
+      url = "github:nix-community/impermanence";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    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";
+    };
+
+    llm-agents = {
+      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 =
@@ -61,6 +98,8 @@
       lanzaboote,
       nixos-hardware,
       home-manager,
+      deploy-rs,
+      jovian-nixos,
       ...
     }@inputs:
     let
@@ -70,9 +109,11 @@
         "mreow"
         "yarn"
       ];
+      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:
         config
@@ -83,6 +124,7 @@
                 inputs
                 username
                 hostname
+                niri-package
                 ;
             };
             modules = [
@@ -93,17 +135,31 @@
                   # home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
                   home-manager.extraSpecialArgs = {
-                    inherit inputs hostname username;
+                    inherit
+                      inputs
+                      hostname
+                      username
+                      niri-package
+                      ;
                     homeDirectory = "/home/${username}";
                     stateVersion = config.system.stateVersion;
                   };
                   home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
                 }
               )
-              ./etcnixos/system-${hostname}.nix
+              ./system/system-${hostname}.nix
             ];
           };
         }
       ) { } hostnames;
+
+      # Deploy-rs configuration for yarn host only
+      deploy.nodes.yarn = {
+        hostname = "desktop";
+        profiles.system = {
+          sshUser = "root";
+          path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.yarn;
+        };
+      };
     };
 }

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
@@ -62,7 +64,7 @@
 
         #fonts
         noto-fonts
-        noto-fonts-emoji
+        noto-fonts-color-emoji
         liberation_ttf
 
         #for ebook reading

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"
@@ -114,6 +114,7 @@ in
   imports = [
     ./progs/fish.nix
     ./progs/helix.nix
+    ./progs/opencode.nix
     (
       { ... }:
       {
@@ -146,7 +147,7 @@ in
         sshfs
 
         # nix formatter
-        nixfmt-rfc-style
+        nixfmt-tree
 
         # serial viewer
         minicom
@@ -157,9 +158,9 @@ in
         ffmpeg-full
 
         # microcontroller tooling
-        probe-rs
+        probe-rs-tools
 
-        (python312.withPackages (
+        (python313.withPackages (
           ps: with ps; [
             mypy # type checking
             types-requests # add types for requests methods
@@ -217,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"]
   '';
@@ -226,20 +227,21 @@ in
   programs.git = {
     enable = true;
     package = pkgs.git;
-    userName = "Simon Gardling";
-    userEmail = "titaniumtown@proton.me";
-
-    # better way to view diffs
-    delta.enable = true;
 
     lfs.enable = true;
 
-    extraConfig = {
+    ignores = [ ".sisyphus" ];
+
+    settings = {
       init = {
         # master -> main
         defaultBranch = "main";
       };
       push.autoSetupRemote = true;
+      user = {
+        name = "Simon Gardling";
+        email = "titaniumtown@proton.me";
+      };
     };
 
     # gpg signing keys
@@ -248,4 +250,10 @@ in
       signByDefault = true;
     };
   };
+
+  # better way to view diffs
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
 }

home-manager/progs/doom.d/init.el

@@ -143,7 +143,7 @@
        json              ; At least it ain't XML
        ;;janet             ; Fun fact: Janet is me!
        (java +lsp)         ; the poster child for carpal tunnel syndrome
-       (javascript +lsp)    ; all(hope(abandon(ye(who(enter(here))))))
+       (javascript +lsp +tree-sitter)    ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
@@ -188,7 +188,7 @@
        ;;emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
-       (rss +org)        ; emacs as an RSS reader
+       ;;(rss +org)        ; emacs as an RSS reader
 
        :config
        ;;literate

home-manager/progs/emacs.nix

@@ -23,13 +23,21 @@
     enable = true;
     doomDir = ./doom.d;
     emacs = pkgs.emacs-unstable-pgtk;
-    extraPackages = epkgs: [
+    extraPackages =
-      epkgs.dracula-theme
+      epkgs:
-
+      with epkgs;
-      pkgs.shellcheck
+      [
+        dracula-theme
+        treesit-grammars.with-all-grammars
+      ]
+      ++ (with pkgs; [
+        shellcheck
+        shfmt
 
         # for file search
-      pkgs.fd
+        fd
-    ];
+
+        pandoc
+      ]);
   };
 }

home-manager/progs/eww/config/scripts/power_bat.rs

@@ -0,0 +1,58 @@
+#!/usr/bin/env rust-script
+
+use std::{fmt, fs::read_to_string, str::FromStr};
+
+const BASE_PATH: &str = "/sys/class/power_supply/BAT1/";
+const CURRENT_NOW_PATH: &str = "current_now";
+const VOLTAGE_NOW_PATH: &str = "voltage_now";
+const STATUS_PATH: &str = "status";
+const FACTOR: f32 = 1e6_f32;
+
+#[derive(Debug)]
+enum Status {
+    Charging,
+    Discharging,
+    NotCharging,
+}
+
+impl FromStr for Status {
+    type Err = &'static str;
+
+    fn from_str(input: &str) -> Result<Status, Self::Err> {
+        match input {
+            "Charging" => Ok(Status::Charging),
+            "Discharging" => Ok(Status::Discharging),
+            "Not charging" => Ok(Status::NotCharging),
+            _ => Err("unknown state"),
+        }
+    }
+}
+
+impl fmt::Display for Status {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Debug::fmt(self, f)
+    }
+}
+
+fn fetch_and_trim_into<T: FromStr<Err = impl fmt::Debug>>(path: &str) -> T {
+    let mut content = read_to_string(BASE_PATH.to_owned() + path).unwrap();
+    content.pop();
+    T::from_str(&content).unwrap()
+}
+
+fn fetch_bat_info(path: &str) -> f32 {
+    let value: f32 = fetch_and_trim_into(path);
+    value / FACTOR
+}
+
+fn main() {
+    let current_now: f32 = fetch_bat_info(CURRENT_NOW_PATH);
+    let voltage_now: f32 = fetch_bat_info(VOLTAGE_NOW_PATH);
+    let watts: f32 = current_now * voltage_now;
+    let status: Status = fetch_and_trim_into(STATUS_PATH);
+
+    println!(
+        "voltage: {:.4}\ncurrent: {:.4}\nwatts: {:.4}\nstatus: {}",
+        voltage_now, current_now, watts, status
+    );
+}

home-manager/progs/eww/config/statusbar.yuck

@@ -79,7 +79,7 @@
     :text "${bluetooth-name} 󰂯")))
 
 ; `FNR == 1 + head -c 30` so the name doesn't explode the screen
-(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk 'FNR == 1 {print substr($0,1,30)}'`)
+(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '$1 == "Device" {print $0}' | cut -d' ' -f3-`)
 
 (defwidget time []
   (box
@@ -92,8 +92,7 @@
 
 (defpoll time :interval "1s" `date +'{"long":"%a %b %e %H:%M:%S %Z %Y","hour":"%H","minute":"%M"}'`)
 
-; TODO: make this a package or something, not using rust-script
+(defpoll powerstats :interval "2s" `power_bat`)
-(defpoll powerstats :interval "2s" `~/Documents/power_bat.rs`)
 
 (defwidget battery []
   (box :space-evenly false

home-manager/progs/eww/eww.nix

@@ -1,13 +1,40 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 {
   home.packages = with pkgs; [
     zsh
     bluez
     brightnessctl
+    (callPackage ./power_bat.nix { })
   ];
 
   programs.eww = {
     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/eww/power_bat.nix

@@ -0,0 +1,4 @@
+{ pkgs, lib, ... }:
+pkgs.writeShellScriptBin "power_bat" ''
+  exec ${lib.getExe pkgs.rust-script} ${./config/scripts/power_bat.rs} "$@"
+''

home-manager/progs/niri.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   inputs,
+  niri-package,
   ...
 }:
 let
@@ -22,7 +23,7 @@ in
   ];
 
   programs.niri = {
-    package = pkgs.niri-unstable;
+    package = niri-package;
     settings = {
       prefer-no-csd = true;
 
@@ -59,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

@@ -0,0 +1,206 @@
+{
+  config,
+  lib,
+  pkgs,
+  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.stdenv.targetPlatform.system}.opencode;
+    enable = true;
+    rules = ''
+      You are an intelligent and observant agent.
+      If instructed to commit, disable gpg signing.
+      You are on nixOS, if you don't have access to a tool, you can access it via the `nix-shell` command.
+
+      ## Think deeply about everything.
+      When given a problem, break it down, abstract it out, understand the fundamentals, then solve it in the real world.
+
+      ## 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.
+      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 = 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 = { };
+      plugin = [ "oh-my-opencode" ];
+      provider = {
+        openrouter = {
+          models = {
+            "openai/gpt-oss-20b:free" = { };
+          };
+          options = {
+            # TODO! use agenix here instead
+            apiKey = "{file:${../secrets/openrouter_api_key}}";
+          };
+        };
+      };
+    };
+  };
+}

system/common.nix

@@ -6,40 +6,42 @@
   system,
   hostname,
   inputs,
+  niri-package,
   ...
 }:
 {
   imports = [
-    ./declarative-nm.nix
+    ./vm.nix
-    # ./vm.nix
     ./steam.nix
     ./networking.nix
 
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
     inputs.disko.nixosModules.disko
     inputs.lanzaboote.nixosModules.lanzaboote
+
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+    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;
-
-  nixpkgs.config.allowUnfree = true;
-
   # allow overclocking (I actually underclock but lol)
-  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF";
+  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF";
 
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
-  services.greetd = {
+  services.kmscon.enable = true;
+
+  # Add niri to display manager session packages
+  services.displayManager.sessionPackages = [ niri-package ];
+
+  programs = {
+    gamescope = {
       enable = true;
-    settings = {
+      capSysNice = true;
-      default_session = {
-        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
-        user = username;
     };
+    steam = {
+      enable = true;
+      gamescopeSession.enable = true;
     };
   };
 
@@ -66,7 +68,7 @@
 
   nix = {
     # optimize the store
-    optimise.automatic = false;
+    optimise.automatic = true;
 
     # enable flakes!
     settings.experimental-features = [
@@ -102,6 +104,7 @@
     };
 
     initrd = {
+      systemd.enable = true;
       compressor = "zstd";
       availableKernelModules = [
         "xhci_pci"
@@ -119,6 +122,13 @@
       "msr"
       "btusb"
     ];
+
+    kernelParams = [
+      # 1gb huge pages
+      "hugepagesz=1G"
+      "hugepages=3"
+    ];
+
   };
 
   environment.etc = {
@@ -154,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
@@ -190,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;
@@ -215,8 +232,6 @@
   services.gvfs.enable = true;
   programs.gphoto2.enable = true;
 
-  programs.adb.enable = true;
-
   # Enable thermal data
   services.thermald.enable = true;
 
@@ -229,7 +244,7 @@
 
   # System packages
   environment.systemPackages = with pkgs; [
-    mullvad-vpn
+    # mullvad-vpn is provided by services.mullvad-vpn.enable
 
     #secureboot ctl
     sbctl
@@ -246,6 +261,9 @@
 
     # needed for home-manager
     git
+
+    tmux
+    android-tools
   ];
 
   # wayland with electron/chromium applications

system/disk_yarn.nix

@@ -0,0 +1,52 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              type = "EF00";
+              size = "500M";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            persistent = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/persistent";
+              };
+            };
+            nix = {
+              size = "200G";
+              content = {
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/nix";
+              };
+            };
+          };
+        };
+      };
+    };
+    nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "defaults"
+          "size=2G"
+          "mode=755"
+        ];
+      };
+    };
+  };
+
+  fileSystems."/persistent".neededForBoot = true;
+  fileSystems."/nix".neededForBoot = true;
+}

system/impermanence.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  lib,
+  username,
+  ...
+}:
+{
+  environment.persistence."/persistent" = {
+    hideMounts = true;
+    directories = [
+      "/var/log"
+      "/var/lib/systemd/coredump"
+      "/var/lib/nixos"
+      "/var/lib/systemd/timers"
+    ];
+
+    files = [
+      "/etc/ssh/ssh_host_ed25519_key"
+      "/etc/ssh/ssh_host_ed25519_key.pub"
+      "/etc/ssh/ssh_host_rsa_key"
+      "/etc/ssh/ssh_host_rsa_key.pub"
+      "/etc/machine-id"
+    ];
+  };
+
+  # 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 = [
+    "d /etc 755 root"
+  ];
+}

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/steam.nix

@@ -21,5 +21,8 @@
 
   environment.systemPackages = with pkgs; [
     steamtinkerlaunch
+    mangohud
+    goverlay
+    yad
   ];
 }

system/system-mreow.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  pkgs,
+  lib,
+  username,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ./common.nix
+    ./disk_mreow.nix
+
+    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";
+
+  # PST
+  # time.timeZone = lib.mkForce "America/Los_Angeles";
+
+  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
+  # if I move to another lock screen program, i will have to replace `swaylock`
+  security.pam.services.swaylock = { };
+
+  # Greetd display manager
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.tuigreet} --time";
+        user = username;
+      };
+    };
+  };
+}

system/system-yarn.nix

@@ -0,0 +1,175 @@
+{
+  config,
+  pkgs,
+  lib,
+  username,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ./disk_yarn.nix
+    ./common.nix
+    ./impermanence.nix
+    ./no-rgb.nix
+    ./vr.nix
+
+    inputs.impermanence.nixosModules.impermanence
+    inputs.jovian-nixos.nixosModules.default
+  ];
+
+  fileSystems."/media/games" = {
+    device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
+    fsType = "f2fs";
+    options = [ "nofail" ];
+  };
+
+  systemd.targets = {
+    sleep.enable = false;
+    suspend.enable = false;
+    hibernate.enable = false;
+    hybrid-sleep.enable = false;
+  };
+
+  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 ];
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "yes";
+    };
+  };
+
+  users.users.${username}.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH" # laptop
+  ];
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH" # laptop
+  ];
+
+  programs.steam = {
+    remotePlay.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+  };
+
+  # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT
+  environment.systemPackages = with pkgs; [
+    lact
+  ];
+  systemd.packages = with pkgs; [ lact ];
+  systemd.services.lactd.wantedBy = [ "multi-user.target" ];
+
+  systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\"";
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steamdeck-hw-theme"
+      "steam-jupiter-unwrapped"
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "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 = {
+      enable = true;
+      autoStart = true;
+      desktopSession = "niri";
+      user = username;
+    };
+  };
+
+  # 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

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  username,
+  lib,
+  ...
+}:
+{
+  # 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 ];
+
+  virtualisation.libvirtd = {
+    enable = true;
+
+    package = pkgs.libvirt;
+  };
+
+  virtualisation.spiceUSBRedirection.enable = true;
+
+  users.users."${username}".extraGroups = [ "libvirtd" ];
+
+  # boot.kernelPatches = [
+  #   {
+  #     name = "undetected-kvm";
+  #     patch = pkgs.fetchurl {
+  #       url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
+  #       sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
+  #     };
+  #   }
+  # ];
+}

system/vr.nix

@@ -14,15 +14,6 @@
     enable = true;
     openFirewall = true;
 
-    package = (
-      # https://github.com/NixOS/nixpkgs/pull/391367
-      pkgs.wivrn.overrideAttrs (old: {
-        cmakeFlags = old.cmakeFlags ++ [
-          (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${pkgs.opencomposite}/lib/opencomposite")
-        ];
-      })
-    );
-
     # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
     # will automatically read this and work with wivrn
     defaultRuntime = true;
@@ -51,7 +42,7 @@
           }
         ];
 
-        application = [ pkgs.wlx-overlay-s ];
+        application = [ pkgs.wayvr ];
       };
     };
   };