From 06427b694c011bb08a44207045a5699fca58db5c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 15 Oct 2024 10:10:28 -0500
Subject: [PATCH] Building jovian

---
 flake.lock                | 45 +++++++++++++++++++++++++++++++++++++++
 flake.nix                 | 35 ++++++++++++++++++++++++++++++
 modules/nixos/default.nix |  4 ++--
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index 838341c..1691673 100644
--- a/flake.lock
+++ b/flake.lock
@@ -505,6 +505,28 @@
         "type": "github"
       }
     },
+    "jovian": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728974938,
+        "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "rev": "23170582b0658e6afd913149a58863af3a57b376",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jovian-Experiments",
+        "ref": "development",
+        "repo": "Jovian-NixOS",
+        "type": "github"
+      }
+    },
     "libpng": {
       "flake": false,
       "locked": {
@@ -538,6 +560,28 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "jovian",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1690328911,
+        "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
+        "owner": "zhaofengli",
+        "repo": "nix-github-actions",
+        "rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "ref": "matrix-name",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1709479366,
@@ -643,6 +687,7 @@
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
         "hyprland": "hyprland",
+        "jovian": "jovian",
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index 751d19b..d58908d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,9 @@
     slippi.inputs.nixpkgs.follows = "nixpkgs-unstable";
     slippi.inputs.home-manager.follows = "home-manager-unstable";
 
+    jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development";
+    jovian.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
     # nnf.url = "github:thelegy/nixos-nftables-firewall?rev=71fc2b79358d0dbacde83c806a0f008ece567b7b";
 
     mobile-nixos = {
@@ -71,6 +74,7 @@
     home-manager-unstable,
     helix,
     hardware,
+    jovian,
     mobile-nixos,
     # nnf,
     # hyprland,
@@ -391,6 +395,37 @@
         ];
       };
 
+      steamdeck1 = nixpkgs-unstable.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = with nixosModules; [
+          home-manager-unstable-defaults
+
+          outputs.diskoConfigurations.standard
+          hardware.nixosModules.common-pc-ssd
+          common
+          gaming
+          graphical-workstation
+          plasma6
+
+          jovian.outputs.nixosModules.jovian
+
+          {
+            networking.hostName = "steamdeck1";
+            boot.loader.systemd-boot.enable = true;
+            boot.loader.efi.canTouchEfiVariables = true;
+            hardware.bluetooth.enable = true;
+            networking.networkmanager.enable = true;
+
+            home-manager.users.daniel = {
+              imports = with homeManagerModules; [
+                firefox-no-tabs
+                linux-desktop-environment-config
+              ];
+            };
+          }
+        ];
+      };
+
       foxtrot = nixpkgs-unstable.lib.nixosSystem {
         system = "x86_64-linux";
         modules = with nixosModules; [
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 08f4550..b9973c9 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -352,7 +352,7 @@
   };
 
   cross-compiler = {config, ...}: {
-    boot.binfmt.emulatedSystems = ["aarch64-linux"];
+    boot.binfmt.emulatedSystems = ["aarch64-linux" "i686-linux"];
   };
 
   default-nix-configuration-and-overlays = {
@@ -377,7 +377,7 @@
         trusted-users = ["root" "daniel"];
         experimental-features = lib.mkDefault ["nix-command" "flakes"];
 
-        extra-platforms = ["aarch64-linux"];
+        extra-platforms = ["i686-linux" "aarch64-linux"];
 
         substituters = [
           # TODO: dedupe with flake's config? is that even necessary?