From d2538ed1da614c7f95ea3d893d0ea28cfaab93fb Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Fri, 8 Dec 2023 08:59:18 -0700
Subject: [PATCH] Install sops.

---
 desktop/flake.lock | 60 ++++++++++++++++++++++++++++++++--------------
 desktop/flake.nix  | 20 ++++++++++++----
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/desktop/flake.lock b/desktop/flake.lock
index 8d22e2d..700efde 100644
--- a/desktop/flake.lock
+++ b/desktop/flake.lock
@@ -4,7 +4,9 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1701362005,
@@ -75,22 +77,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1700390070,
-        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1699596684,
         "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=",
@@ -106,11 +92,49 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1701568804,
+        "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "bootstrap": "bootstrap",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs",
+        "sops-nix": "sops-nix"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1701728052,
+        "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
       }
     },
     "systems": {
diff --git a/desktop/flake.nix b/desktop/flake.nix
index 96afc63..d92422f 100644
--- a/desktop/flake.nix
+++ b/desktop/flake.nix
@@ -2,31 +2,41 @@
   description = "NixOS Flake";
 
   inputs = {
-    bootstrap.url = "github:jrpotter/bootstrap/v0.1.2";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+
+    bootstrap = {
+      url = "github:jrpotter/bootstrap/v0.1.2";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, bootstrap, ... }:
+  outputs = { nixpkgs, bootstrap, home-manager, sops-nix, ... }:
     let
       system = "x86_64-linux";
     in
     {
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
         inherit system;
-        # Modules can be attribute sets or a function that returns an attribute set.
-        # https://nixos-and-flakes.thiscute.world/nixos-with-flakes/nixos-with-flakes-enabled
+
         modules = [
           ./configuration.nix
+          sops-nix.nixosModules.sops
           home-manager.nixosModules.home-manager
           {
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = true;
+
               users.jrpotter = import ./jrpotter;
+
               # Used to pass non-default parameters to submodules.
               extraSpecialArgs = {
                 inherit system;