From e3b10a3e5d84f1e7212770e08e6db0e2fd4cb69d Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Sun, 19 May 2024 09:22:22 -0400
Subject: [PATCH] Netbird Config Hopefuly Not Crashing

---
 flake.lock                              | 46 ++++---------------------
 flake.nix                               |  6 ++--
 hosts/virt-nix/default.nix              |  1 +
 modules/common/applications/default.nix |  2 +-
 modules/common/programming/vscode.nix   |  2 +-
 5 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/flake.lock b/flake.lock
index 692fb92..07a9e90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "catppuccin-vsc": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1713966373,
-        "narHash": "sha256-8bMRH+z426e6zWcS15QZsQ8moSAKbEDjtBnAE10+DW8=",
-        "type": "tarball",
-        "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -112,15 +97,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712963716,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
-        "owner": "NixOS",
+        "lastModified": 1715288647,
+        "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=",
+        "owner": "auxolotl",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "fb0bb336c1365f5ab5250df84cb1406337f7d9d9",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "auxolotl",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -143,22 +128,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1715288647,
-        "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=",
-        "owner": "auxolotl",
-        "repo": "nixpkgs",
-        "rev": "fb0bb336c1365f5ab5250df84cb1406337f7d9d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "auxolotl",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1715413075,
         "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
@@ -176,17 +145,16 @@
     },
     "root": {
       "inputs": {
-        "catppuccin-vsc": "catppuccin-vsc",
         "home-manager": "home-manager",
         "lix": "lix",
         "lix-module": "lix-module",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 0ab5745..be56d58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,9 +23,9 @@
       url = "github:Mic92/sops-nix";
     };
 
-    catppuccin-vsc = {
-      url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
-    };
+    # catppuccin-vsc = {
+    #   url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
+    # };
 
   #   solaar = {
   #     url = "github:Svenum/Solaar-Flake/latest";
diff --git a/hosts/virt-nix/default.nix b/hosts/virt-nix/default.nix
index 939bf1e..30a3e81 100644
--- a/hosts/virt-nix/default.nix
+++ b/hosts/virt-nix/default.nix
@@ -71,6 +71,7 @@ inputs.nixpkgs.lib.nixosSystem {
       firefox.enable = true;
       nixpkgs-fmt.enable = true;
       vscode.enable = true;
+      netbird.enable = true;
     }
   ];
 }
diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix
index e0de7a7..a585c8f 100644
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@@ -3,6 +3,6 @@
   imports = [
     ./discord.nix
     ./firefox.nix
-    # ./netbird.nix
+    ./netbird.nix
   ];
 }
diff --git a/modules/common/programming/vscode.nix b/modules/common/programming/vscode.nix
index 36d8a5a..5ac583b 100644
--- a/modules/common/programming/vscode.nix
+++ b/modules/common/programming/vscode.nix
@@ -15,7 +15,7 @@
         enable = true;
         extensions = with pkgs.vscode-extensions; [
           bbenoist.nix
-          inputs.catppuccin-vsc
+          # inputs.catppuccin-vsc
         ];
       };
     };