From cf6f8131ed7479870931498bd6a7847e9f98b113 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Fri, 2 Dec 2022 21:31:37 +0700
Subject: [PATCH] sugarcane: update to raccoon

---
 flake.lock                  | 39 -------------------------------------
 flake.nix                   |  7 ++-----
 hosts/sugarcane/default.nix |  2 +-
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index b43cb71..4f15680 100644
--- a/flake.lock
+++ b/flake.lock
@@ -135,27 +135,6 @@
         "type": "github"
       }
     },
-    "home-manager-porcupine": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-porcupine"
-        ]
-      },
-      "locked": {
-        "lastModified": 1643735249,
-        "narHash": "sha256-hwX+qvF9fipwItm3V6M3mL3L0Iis+PY2DfXqnhPi+uQ=",
-        "owner": "LavaDesu",
-        "repo": "home-manager",
-        "rev": "ea795dd7acc9ce6069a786f6088a296f8e64c280",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LavaDesu",
-        "ref": "backport/gpg-agent",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "home-manager-raccoon": {
       "inputs": {
         "nixpkgs": [
@@ -341,22 +320,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-porcupine": {
-      "locked": {
-        "lastModified": 1659446231,
-        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-raccoon": {
       "locked": {
         "lastModified": 1669465383,
@@ -444,7 +407,6 @@
         "discover": "discover",
         "fast-syntax-highlighting": "fast-syntax-highlighting",
         "home-manager": "home-manager",
-        "home-manager-porcupine": "home-manager-porcupine",
         "home-manager-raccoon": "home-manager-raccoon",
         "hosts-blocklists": "hosts-blocklists",
         "linux-tkg": "linux-tkg",
@@ -453,7 +415,6 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-porcupine": "nixpkgs-porcupine",
         "nixpkgs-raccoon": "nixpkgs-raccoon",
         "nvim-treesitter": "nvim-treesitter",
         "packwiz": "packwiz",
diff --git a/flake.nix b/flake.nix
index 378346c..ab4cb5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,8 @@
 {
   inputs = {
     nixpkgs.url = "github:LavaDesu/nixpkgs/laba/remove-mono";
-    nixpkgs-porcupine.url = "github:NixOS/nixpkgs/nixos-21.11";
     nixpkgs-raccoon.url = "github:NixOS/nixpkgs/nixos-22.11";
     home-manager.url = "github:nix-community/home-manager";
-    home-manager-porcupine.url = "github:LavaDesu/home-manager/backport/gpg-agent";
     home-manager-raccoon.url = "github:nix-community/home-manager/release-22.11";
     neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
@@ -13,7 +11,6 @@
 
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager-porcupine.inputs.nixpkgs.follows = "nixpkgs-porcupine";
     home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon";
     neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
     nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
@@ -46,7 +43,7 @@
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-porcupine, nixpkgs-raccoon, ... } @ inputs:
+  outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-raccoon, ... } @ inputs:
     let
       overlays = (import ./overlays)
         ++ [(final: prev: {
@@ -78,7 +75,7 @@
           })
         ];
       }];
-      nixosConfigurations."sugarcane" = mkSystem nixpkgs-porcupine "sugarcane" "x86_64-linux" false [];
+      nixosConfigurations."sugarcane" = mkSystem nixpkgs-raccoon "sugarcane" "x86_64-linux" false [];
 
       packages."x86_64-linux" =
         let
diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix
index 0259c18..fb2a276 100644
--- a/hosts/sugarcane/default.nix
+++ b/hosts/sugarcane/default.nix
@@ -9,7 +9,7 @@
   };
   imports = with modules.system; [
     (modulesPath + "/profiles/qemu-guest.nix")
-    inputs.home-manager-porcupine.nixosModule
+    inputs.home-manager-raccoon.nixosModule
 
     base
     home-manager