From 2015647f67ef99094d5788eb292f0d8535ef0813 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Thu, 18 Dec 2025 19:12:29 -0800
Subject: [PATCH] octoflake?

---
 desktop/dev.nix |  4 ++--
 flake.nix       | 37 ++++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/desktop/dev.nix b/desktop/dev.nix
index 3f43552..dec2d09 100644
--- a/desktop/dev.nix
+++ b/desktop/dev.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, lib, ... }:
+{ config, pkgs, pkgs-unstable, lib, octofriend, ... }:
 
 {
 
@@ -8,7 +8,7 @@
    (python3.withPackages(ps: with ps; [ pandas requests python-dotenv pip uv ]))
   nodejs
   putty                   # SSH/Telnet client
-  octofriend-nix.packages.x86_64-linux.default
+  octofriend-nix.packages.${pkgs.system}.default
   ];
 
   programs.nix-ld.enable = true;
diff --git a/flake.nix b/flake.nix
index 6c363a1..751c06b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,30 +14,33 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    hyprland.url = "github:hyprwm/Hyprland";
+    octofriend = {
+      url = "path:./appflakes/octofriend";
+    };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, plasma-manager, hyprland }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, plasma-manager, octofriend }:
     let
       system = "x86_64-linux";
       
-      # Common specialArgs for all systems
-      commonSpecialArgs = {
-        pkgs-unstable = import nixpkgs-unstable {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
-      
-      # Helper function to create a system configuration
-      mkSystem = { modules, hardware ? [] }: nixpkgs.lib.nixosSystem {
+
+    commonSpecialArgs = {
+      pkgs-unstable = import nixpkgs-unstable {
         inherit system;
-        specialArgs = commonSpecialArgs;
-        modules = [
-          home-manager.nixosModules.home-manager
-        ] ++ hardware ++ modules;
+        config.allowUnfree = true;
       };
-      
+
+      inherit octofriend-nix;
+    };
+
+    mkSystem = { modules, hardware ? [] }: nixpkgs.lib.nixosSystem {
+      inherit system;
+      specialArgs = commonSpecialArgs;
+      modules = [
+        home-manager.nixosModules.home-manager
+      ] ++ hardware ++ modules;
+    };
+  };      
       # Common desktop modules
       commonDesktopModules = [
         ./systems/common.nix