From c986c811fd7352910efcb96183ea7daa0b162465 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Thu, 17 Jul 2025 18:13:02 -0700
Subject: [PATCH] Added slack, buildable netextender, default jetbrains mono
 font

---
 modules/application-groups/media.nix       |  2 +-
 modules/application-groups/social.nix      |  5 +-
 modules/applications/netextender/flake.nix | 71 ++++++++++++++++++++++
 modules/system/fonts.nix                   | 12 +++-
 users/caperren/caperren.nix                | 10 +++
 users/caperren/dotfiles/waybar/style.css   |  1 +
 6 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 modules/applications/netextender/flake.nix

diff --git a/modules/application-groups/media.nix b/modules/application-groups/media.nix
index 57263c7..8d0eca7 100644
--- a/modules/application-groups/media.nix
+++ b/modules/application-groups/media.nix
@@ -42,7 +42,7 @@ in {
   environment.systemPackages = with pkgs; [
 
     audacity
-    darktable
+#    darktable  # Currently failing to build
     deadbeef
     glava
     obs-studio
diff --git a/modules/application-groups/social.nix b/modules/application-groups/social.nix
index 7b55cb8..3f21a3d 100644
--- a/modules/application-groups/social.nix
+++ b/modules/application-groups/social.nix
@@ -1,9 +1,8 @@
 { pkgs, ... }:
 {
-
   environment.systemPackages = with pkgs; [
-    telegram-desktop
     discord
+    slack
+    telegram-desktop
   ];
-
 }
diff --git a/modules/applications/netextender/flake.nix b/modules/applications/netextender/flake.nix
new file mode 100644
index 0000000..06dff3a
--- /dev/null
+++ b/modules/applications/netextender/flake.nix
@@ -0,0 +1,71 @@
+# TODO: This was hacked together until it worked...Clean it up before merging
+{
+  description = "SonicWall NetExtender Flake";
+
+  outputs =
+    { self, nixpkgs, ... }:
+    let
+      systems = [ "x86_64-linux" ];
+      neVersion = "10.3.0-21";
+      neUrl = "https://software.sonicwall.com/NetExtender/NetExtender-linux-amd64-${neVersion}.tar.gz";
+
+      # ✅ Define the overlay function directly
+      overlay = final: prev: {
+        netextender = prev.stdenv.mkDerivation rec {
+          pname = "netextender";
+          version = neVersion;
+          src = prev.fetchurl {
+            url = neUrl;
+            sha256 = "sha256-pnF/KRQMAcPnTj0Ni+sKKkw+H72WHf2iYVkWsWNCndc=";
+          };
+
+          nativeBuildInputs = [
+            prev.autoPatchelfHook
+            prev.makeWrapper
+          ];
+          buildInputs = [
+            prev.openssl_3
+            prev.zlib
+            prev.gtk2
+            prev.pango
+            prev.cairo
+            prev.xorg.libX11
+          ];
+
+          unpackPhase = "tar -xzf $src";
+          installPhase = ''
+            mkdir -p $out/bin
+            BIN_CLI=$(find . -type f -iname nxcli -perm -111 | head -n1)
+            BIN_SVC=$(find . -type f -iname neservice -perm -111 | head -n1)
+            install -Dm755 "$BIN_CLI" $out/bin/nxcli
+            install -Dm755 "$BIN_SVC" $out/bin/neservice
+            ln -sf nxcli $out/bin/netextender
+            ln -sf neservice $out/bin/nxservice
+            for exe in nxcli neservice; do
+              wrapProgram $out/bin/$exe \
+                --prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath buildInputs}
+            done
+          '';
+        };
+      };
+    in
+    {
+      overlays = {
+        x86_64-linux = overlay;
+      };
+
+      packages = {
+        x86_64-linux =
+          let
+            pkgs = import nixpkgs {
+              system = "x86_64-linux";
+              overlays = [ overlay ];
+            };
+          in
+          {
+            default = pkgs.netextender;
+            netextender = pkgs.netextender;
+          };
+      };
+    };
+}
diff --git a/modules/system/fonts.nix b/modules/system/fonts.nix
index 95fd68c..66640ed 100644
--- a/modules/system/fonts.nix
+++ b/modules/system/fonts.nix
@@ -1,8 +1,16 @@
 { config, pkgs, ... }:
 {
   fonts.fontDir.enable = true;
-  fonts.fontconfig.enable = true;
-  fonts.fontconfig.antialias = true;
+  fonts.fontconfig = {
+    enable = true;
+    antialias = true;
+    defaultFonts = {
+      monospace = [ "JetBrains Mono" ];
+      sansSerif = [ "JetBrains Mono" ];
+      serif = [ "JetBrains Mono" ];
+    };
+  };
+
   fonts.packages = with pkgs; [
     noto-fonts
     noto-fonts-emoji
diff --git a/users/caperren/caperren.nix b/users/caperren/caperren.nix
index 5f1dfad..ccf4cd3 100644
--- a/users/caperren/caperren.nix
+++ b/users/caperren/caperren.nix
@@ -37,6 +37,10 @@ in
       userEmail = "caperren@gmail.com";
     };
 
+    programs.kitty = {
+      font.name = "JetBrains Mono";
+    };
+
     home.file.".config/hypr/hypridle.conf".source = ./dotfiles/hypridle/hypridle.conf;
     home.file.".config/hypr/hyprpaper.conf".source = ./dotfiles/hyprpaper/hyprpaper.conf;
     home.file.".config/hypr/backgrounds/black.png".source = ./dotfiles/hyprpaper/black.png;
@@ -65,10 +69,16 @@ in
         name = "Bibata-Modern-Ice";
         package = pkgs.bibata-cursors;
       };
+
+      font.name = "JetBrains Mono 11";
     };
 
     home.sessionVariables = {
       GTK_THEME = "Adwaita-dark";
     };
+
+    xresources.properties = {
+      "Xft.font" = "JetBrains Mono";
+    };
   };
 }
diff --git a/users/caperren/dotfiles/waybar/style.css b/users/caperren/dotfiles/waybar/style.css
index a7145ee..9b0e3dd 100644
--- a/users/caperren/dotfiles/waybar/style.css
+++ b/users/caperren/dotfiles/waybar/style.css
@@ -1,6 +1,7 @@
 * {
     border: none;
     border-radius: 0;
+    font-family: "JetBrains Mono", monospace;
     font-size: 14px;
     box-shadow: none;
     text-shadow: none;