From b1ae9aefa13d0102b4cc21695941258a69d85afd Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 17 Aug 2025 20:02:28 -0400
Subject: [PATCH] close to working

---
 clients/quadphone/gnome.nix                  |  7 ++++-
 clients/quadphone/hardware-configuration.nix |  2 ++
 clients/quadphone/overlays.nix               | 27 ++++++++++++++++++++
 clients/quadphone/ruby.nix                   | 11 --------
 flake.lock                                   |  8 +++---
 flake.nix                                    |  5 +++-
 modules/desktop/packages.nix                 |  1 +
 modules/{desktop => graphical}/insecure.nix  |  0
 modules/graphical/packages.nix               |  1 -
 9 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 clients/quadphone/overlays.nix
 delete mode 100644 clients/quadphone/ruby.nix
 rename modules/{desktop => graphical}/insecure.nix (100%)

diff --git a/clients/quadphone/gnome.nix b/clients/quadphone/gnome.nix
index f87e44f..18168d1 100644
--- a/clients/quadphone/gnome.nix
+++ b/clients/quadphone/gnome.nix
@@ -1,8 +1,13 @@
 {inputs, ...}: {
-  imports = [inputs.gnome-mobile.nixosModules.gnome-mobile];
+  nixpkgs.overlays = [inputs.gnome-mobile.overlays.default];
 
   i18n.inputMethod = {
     enable = true;
     type = "ibus";
   };
+
+  services.logind = {
+    powerKey = "ignore";
+    powerKeyLongPress = "poweroff";
+  };
 }
diff --git a/clients/quadphone/hardware-configuration.nix b/clients/quadphone/hardware-configuration.nix
index e7bcf63..c2b7c4b 100644
--- a/clients/quadphone/hardware-configuration.nix
+++ b/clients/quadphone/hardware-configuration.nix
@@ -15,6 +15,8 @@
       })
   ];
 
+  boot.initrd.allowMissingModules = true;
+
   nixpkgs.hostPlatform = "aarch64-linux";
   nixpkgs.config.allowBroken = true;
 }
diff --git a/clients/quadphone/overlays.nix b/clients/quadphone/overlays.nix
new file mode 100644
index 0000000..04fd5b4
--- /dev/null
+++ b/clients/quadphone/overlays.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  nixpkgs.overlays = [
+    (_: super: {
+      ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
+        NIX_RUSTFLAGS =
+          (old.NIX_RUSTFLAGS or "")
+          + " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}";
+      });
+      iniparser = super.iniparser.overrideAttrs (old: {
+        cmakeFlags = [
+          (lib.cmakeBool "BUILD_TESTING" false)
+        ];
+      });
+      gnome-user-share = super.gnome-user-share.overrideAttrs (old: {
+        postPatch = lib.optionalString (pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform) ''
+          substituteInPlace src/meson.build \
+            --replace-fail "cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]" "cargo_options += [ '--target-dir', meson.project_build_root() / 'src', '--target=${pkgs.stdenv.hostPlatform.rust.rustcTarget}' ]" \
+            --replace-fail "'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@'," "'cp', 'src' / '${pkgs.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(), '@OUTPUT@',"
+        '';
+      });
+    })
+  ];
+}
diff --git a/clients/quadphone/ruby.nix b/clients/quadphone/ruby.nix
deleted file mode 100644
index 95a4915..0000000
--- a/clients/quadphone/ruby.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (_: super: {
-      ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
-        NIX_RUSTFLAGS =
-          (old.NIX_RUSTFLAGS or "")
-          + " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}";
-      });
-    })
-  ];
-}
diff --git a/flake.lock b/flake.lock
index 89e8adb..a78d041 100644
--- a/flake.lock
+++ b/flake.lock
@@ -156,11 +156,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
-        "owner": "SenchoPens",
+        "lastModified": 1755473996,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SuperSandro2000",
         "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "e37d495352e3dde37c9977f6e7951a4a6d26599a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b1c27fd..46185d9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,10 @@
     };
     stylix = {
       url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        base16.url = "github:SuperSandro2000/base16.nix/patch-1";
+      };
     };
     ooye = {
       url = "git+https://cgit.rory.gay/nix/OOYE-module.git";
diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix
index b937a5d..a05db60 100644
--- a/modules/desktop/packages.nix
+++ b/modules/desktop/packages.nix
@@ -5,6 +5,7 @@
     inkscape
     r2modman
     libreoffice
+    authenticator
     cinny-desktop
     prismlauncher
     nexusmods-app-unfree
diff --git a/modules/desktop/insecure.nix b/modules/graphical/insecure.nix
similarity index 100%
rename from modules/desktop/insecure.nix
rename to modules/graphical/insecure.nix
diff --git a/modules/graphical/packages.nix b/modules/graphical/packages.nix
index b75ebef..c91cf7e 100644
--- a/modules/graphical/packages.nix
+++ b/modules/graphical/packages.nix
@@ -8,7 +8,6 @@
     resources
     wl-clipboard
     google-cursor
-    authenticator
     papirus-icon-theme
   ];
 }