From 70a3dcd2b1a91847aaf984d07cb975bfc730a20c Mon Sep 17 00:00:00 2001
From: noe <git@kat.cafe>
Date: Sun, 21 Apr 2024 10:44:19 -0400
Subject: [PATCH] s-e: add emotes

---
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  2 +-
 nixos/hosts/sapphic-engineer/akkoma.nix |  2 ++
 overlays/default.nix                    |  8 ++++----
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 30d8c29..8a3b49f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -434,6 +434,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1713710068,
+        "narHash": "sha256-/bVbflmdRdAmYOcv/daxtl2pG+d/F84SG9jD5047cGw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "41992852aa6862dcd63681b0c0433be3818a8ea0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1713564160,
@@ -615,6 +631,7 @@
         "iceshrimp-withdrawal": "iceshrimp-withdrawal",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
diff --git a/flake.nix b/flake.nix
index f7a1168..1987435 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     # Home manageKr
     home-manager = {
diff --git a/nixos/hosts/sapphic-engineer/akkoma.nix b/nixos/hosts/sapphic-engineer/akkoma.nix
index c74140d..6006064 100644
--- a/nixos/hosts/sapphic-engineer/akkoma.nix
+++ b/nixos/hosts/sapphic-engineer/akkoma.nix
@@ -27,6 +27,8 @@ in {
     enable = true;
     initSecrets = lib.mkForce false;
 
+    package = pkgs.master.akkoma;
+
     config = with (pkgs.formats.elixirConf { }).lib; {
       ":pleroma" =  {
         ":instance" = {
diff --git a/overlays/default.nix b/overlays/default.nix
index bacd776..dba01e3 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -30,9 +30,9 @@
       config.allowUnfree = true;
     };
 
-    # master = import inputs.nixpkgs-unstable {
-    #   system = final.system;
-    #   config.allowUnfree = true;
-    # };
+    master = import inputs.nixpkgs-unstable {
+      system = final.system;
+      config.allowUnfree = true;
+    };
   };
 }