From 1f135eafcb0c27a6027269077d3272f2a4e9985d Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Fri, 9 Aug 2024 20:11:51 -0400
Subject: [PATCH] Cache Stuffs?

---
 flake.nix              |  3 ++-
 hosts/envy/default.nix | 41 ++++++++++++++++++++++++-----------------
 hosts/envy/netbird.nix | 11 +++++++++++
 3 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 hosts/envy/netbird.nix

diff --git a/flake.nix b/flake.nix
index ab7a137..1d28c28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     lix = {
-      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1";
+      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.91.0";
       flake = false;
     };
     lix-module = {
@@ -48,6 +48,7 @@
     {
       nix.settings.extra-substituters = [
         "https://cache.lix.systems"
+        "https://cache.nix.org"
       ];
 
       nix.settings.trusted-public-keys = [
diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index 84168ee..8a74d0f 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -49,38 +49,30 @@ inputs.nixpkgs.lib.nixosSystem {
       audio.enable = true;
       gui.enable = true;
 
-      # Make sure OpenSSH is using a proper ed25519 key.
-      services.openssh = {
-        enable = true;
-        hostKeys = [
-          {
-            path = "/etc/ssh/ssh_host_ed25519_key";
-            type = "ed25519";
-          }
-        ];
-      };
-
+      services.openssh.enable = true;
       services.flatpak.enable = true;
       # Apps
       discord.enable = true;
       element.enable = true;
       firefox.enable = true;
       kitty.enable = true;
-      netbird.enable = true;
-      openrgb.enable = false;
-      prusa-slicer.enable = false;
+      # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?)
+      openrgb.enable = true;
+      prusa-slicer.enable = true;
       spotifyd.enable = true;
       thunderbird.enable = true;
       # Gaming
-      steam.enable = false;
+      steam.enable = true;
       # Programming Stuff
       nixpkgs-fmt.enable = true;
       python3.enable = true;
       vscode.enable = true;
       # Utilities
       # git is not optional
-      docker.enable = false;
+      docker.enable = true;
       yubikey.enable = true;
+      kdeconnect.enable = true;
+      tailscale.enable = true;
 
       # TODO: Move this out
       home-manager.users.annika = {
@@ -90,9 +82,24 @@ inputs.nixpkgs.lib.nixosSystem {
             enableBashIntegration = true;
             nix-direnv.enable = true;
           };
-          bash.enable = true;
+          bash = {
+            enable = true;
+            shellAliases = {
+              s = "kitten ssh";
+              la = "ls -a";
+              ll = "ls -l";
+              lal = "ls -la";
+              cls = "clear && ls";
+            };
+          };
         };
       };
+
+      nix.gc = {
+        automatic = true;
+        randomizedDelaySec = "14m";
+        options = "--delete-older-than 10d";
+      };
     }
   ];
 }
diff --git a/hosts/envy/netbird.nix b/hosts/envy/netbird.nix
new file mode 100644
index 0000000..28c6408
--- /dev/null
+++ b/hosts/envy/netbird.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+{
+  sops.secrets."netbird/setup_keys/end_user" = { };
+  netbird = {
+    enable = true;
+    opts = {
+      management_url = "https://netbird.moosenet.work:443";
+      admin_url = "https://netbird.moosenet.work";
+    };
+  };
+}