From aae6b21116f81ae2121161e6e43e88891ee4837c Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Fri, 10 Oct 2025 21:17:46 -0700
Subject: [PATCH] feat: add doppler, update flake

---
 nix/flake.lock                 | 32 ++++++++++++++++++++++++++++++++
 nix/modules/commonPackages.nix |  4 ++++
 2 files changed, 36 insertions(+)

diff --git a/nix/flake.lock b/nix/flake.lock
index 60ee3af..b9f4c02 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -103,11 +103,19 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1758785683,
         "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
         "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70",
+=======
+        "lastModified": 1759833546,
+        "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=",
+        "owner": "nix-community",
+        "repo": "NixOS-WSL",
+        "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -119,11 +127,19 @@
     },
     "nixpkgs": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1758277210,
         "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
+=======
+        "lastModified": 1759733170,
+        "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -135,11 +151,19 @@
     },
     "nixpkgs_2": {
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1758791193,
         "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
+=======
+        "lastModified": 1759735786,
+        "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
@@ -166,11 +190,19 @@
         ]
       },
       "locked": {
+<<<<<<< Updated upstream
         "lastModified": 1759030640,
         "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=",
         "owner": "Mic92",
         "repo": "sops-nix",
         "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e",
+=======
+        "lastModified": 1759635238,
+        "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
+>>>>>>> Stashed changes
         "type": "github"
       },
       "original": {
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index 1d70744..26a2100 100644
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -64,7 +64,11 @@
       python3
       jdt-language-server
       gradle
+<<<<<<< Updated upstream
       cmake
+=======
+      doppler
+>>>>>>> Stashed changes
     ];
     programs.nix-ld.enable = lib.mkDefault true;
     programs.zsh.enable = lib.mkDefault true;