From 7b7e8683b3dd907fdc6c2c92c40a2fa723c3b7e1 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Fri, 27 Dec 2024 13:09:22 +0000
Subject: [PATCH] tohru: get scoutshonour games from their own repo instead of
 NUR

---
 flake.lock              | 24 +++++++++++++++++++++++-
 flake.nix               | 38 +++++++++++++++++++++++---------------
 hosts/tohru/default.nix |  8 +++++---
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5649a79..7f25a1f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -344,7 +344,29 @@
         "nixpkgs-unstable-small": "nixpkgs-unstable-small",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
-        "randomcat": "randomcat"
+        "randomcat": "randomcat",
+        "scoutshonour": "scoutshonour"
+      }
+    },
+    "scoutshonour": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735301893,
+        "narHash": "sha256-d95MCTUYMCcOQv4LpmWxPuVnx7McezXYs2Idw8u8ngI=",
+        "ref": "main",
+        "rev": "f447cd380ea1fb81a0ff8f292b6bbdf0be9c9520",
+        "revCount": 23,
+        "type": "git",
+        "url": "https://git.qenya.tel/qenya/nix-scoutshonour"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.qenya.tel/qenya/nix-scoutshonour"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index b9177b7..290d9a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,12 +57,17 @@
     };
 
     birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main";
+
+    scoutshonour = {
+      url = "git+https://git.qenya.tel/qenya/nix-scoutshonour?ref=main";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
+  outputs = inputs@{ self, nixpkgs, nixpkgs-small, colmena, ... }: {
     nixosConfigurations = self.outputs.colmenaHive.nodes;
     colmenaHive = colmena.lib.makeHive self.outputs.colmena;
-    
+
     # The name of this output type is not standardised. I have picked
     # "homeManagerModules" as the discussion here suggests it's the most common:
     # https://github.com/nix-community/home-manager/issues/1783
@@ -71,7 +76,7 @@
     # https://github.com/NixOS/nix/pull/10858
     homeManagerModules = {
       "qenya".imports = [
-        plasma-manager.homeManagerModules.plasma-manager
+        inputs.plasma-manager.homeManagerModules.plasma-manager
         ./home/qenya
       ];
 
@@ -88,7 +93,10 @@
           orm = import nixpkgs-small { system = "x86_64-linux"; };
           kalessin = import nixpkgs-small { system = "aarch64-linux"; };
         };
-        specialArgs = { inherit self; };
+        specialArgs = {
+          inherit self;
+          inherit inputs;
+        };
       };
 
       defaults = { config, lib, pkgs, ... }: {
@@ -98,16 +106,16 @@
         deployment.buildOnTarget = lib.mkDefault true;
 
         imports = [
-          lix-module.nixosModules.default
-          home-manager.nixosModules.home-manager
-          nur.nixosModules.nur
-          { nixpkgs.overlays = [ nur.overlay ]; }
-          agenix.nixosModules.default
-          birdsong.nixosModules.default
-          actual.nixosModules.default
+          inputs.lix-module.nixosModules.default
+          inputs.home-manager.nixosModules.home-manager
+          inputs.nur.nixosModules.nur
+          { nixpkgs.overlays = [ inputs.nur.overlay ]; }
+          inputs.agenix.nixosModules.default
+          inputs.birdsong.nixosModules.default
+          inputs.actual.nixosModules.default
           ./common
           ./services
-          (builtins.toPath "${randomcat}/services/default.nix")
+          (builtins.toPath "${inputs.randomcat}/services/default.nix")
         ];
       };
 
@@ -130,9 +138,9 @@
       in
       pkgs.mkShell {
         packages = [
-          colmena.packages.${system}.colmena
-          agenix.packages.${system}.default
-          plasma-manager.packages.${system}.rc2nix
+          inputs.colmena.packages.${system}.colmena
+          inputs.agenix.packages.${system}.default
+          inputs.plasma-manager.packages.${system}.rc2nix
         ];
       };
   };
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index cebd1cb..cde1a8d 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
   imports = [
@@ -31,6 +31,8 @@
     "networkmanager" # UI wifi configuration
     "dialout" # access to serial ports
   ];
+
+  nixpkgs.overlays = [ inputs.scoutshonour.overlays.default ];
   home-manager.users.qenya = { pkgs, ... }: {
     home.packages = with pkgs; [
       keepassxc
@@ -41,8 +43,8 @@
       # games
       openttd
       prismlauncher
-      nur.repos.qenya.digital-a-love-story
-      nur.repos.qenya.dont-take-it-personally-babe
+      scoutshonour.digital-a-love-story
+      scoutshonour.dont-take-it-personally-babe
     ];
   };