update

modules/base/default.nix

@@ -5,8 +5,9 @@
         inputs.home-manager.nixosModules.home-manager
         inputs.nvf.nixosModules.default
 
-        ./nvf     
+        ./nvf
         ./branding.nix
+        ./filesystems.nix
         ./garbage.nix
         ./locale.nix
         ./nix.nix

modules/base/filesystems.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+    boot.supportedFilesystems = [
+        "exfat"
+    ];
+
+    environment.systemPackages = with pkgs; [
+        exfat
+    ];
+}

modules/desktop/default.nix

@@ -30,4 +30,7 @@
     fonts.packages = with pkgs; [
         montserrat
     ];
+
+    programs.appimage.enable = true;
+    programs.fuse.enable = true;
 }

modules/development/default.nix

@@ -5,6 +5,7 @@ in
 {
     imports = [
         ./direnv.nix
+        ./java.nix
         ./packages.nix
         ./virt-manager.nix
     ];

modules/development/home/vscode.nix

@@ -31,6 +31,7 @@ in
                     bradlc.vscode-tailwindcss
                     dbaeumer.vscode-eslint
                     mesonbuild.mesonbuild
+                    ms-vscode.cmake-tools
                 ];
                 userSettings = {
                     "chat.agent.enabled" = false;

modules/development/java.nix

@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+let
+    hasGui = config.services.dbus.implementation == "dbus";
+    openjfx_jdk = pkgs.openjfx.override {
+        withWebKit = true;
+    };
+in
+{
+    config = lib.mkIf hasGui
+    {
+        programs.java = {
+            enable = true;
+            package = pkgs.jdk21.override {
+                enableJavaFX = true;
+                inherit openjfx_jdk;
+            };
+        };
+
+        environment.systemPackages = with pkgs; [
+            gradle
+            netbeans
+            dejavu_fonts
+        ];
+
+        programs.nix-ld = {
+            enable = true;
+            libraries = (with pkgs; [
+                libxrender
+                libxi
+                libxcursor
+                libxtst
+                
+                alsa-lib
+                libjack2
+                libpulseaudio
+                pipewire
+
+                ## glfw
+                libGL
+                libx11
+                libxcursor
+                libxext
+                libxrandr
+                libxxf86vm
+                freetype
+                libxft
+            ]);
+        };
+    };
+}

modules/development/packages.nix

@@ -11,5 +11,12 @@ in
         just
         nodejs
         gcc
-    ] ++ (if hasGui then [pkgs.wireshark-qt] else []);
+
+        # Distrobox
+        distrobox
+        distrobox-tui
+    ] ++ (if hasGui then with pkgs; [
+        wireshark
+        kontainer
+    ] else []);
 }