Merge branch 'main' of ssh://git.ghoscht.com:2222/ghoscht/nix-config

home/features/coding/intellij.nix

@@ -1,5 +1,9 @@
 {pkgs, ...}: {
-  home.packages = with pkgs.unstable; [
+  home.packages = [
-    (jetbrains.plugins.addPlugins jetbrains.idea-ultimate ["ideavim"])
+    (pkgs.unstable.jetbrains.plugins.addPlugins pkgs.unstable.jetbrains.idea-ultimate ["ideavim"])
   ];
+  home.sessionVariables = {
+    JAVA_HOME = "${pkgs.openjdk17}/lib/openjdk";
+    LD_LIBRARY_PATH = "${pkgs.libGL}/lib:${pkgs.gtk3}/lib:${pkgs.glib.out}/lib:${pkgs.xorg.libXtst}/lib";
+  };
 }

home/features/desktop/common/flatpak.nix

@@ -1,9 +1,4 @@
-{
+{inputs, ...}: {
-  inputs,
-  pkgs,
-  vars,
-  ...
-}: {
   imports = [inputs.flatpaks.homeManagerModules.default];
   services.flatpak = {
     remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo";
@@ -11,6 +6,7 @@
       "flathub:app/us.zoom.Zoom//stable"
       "flathub:app/com.discordapp.Discord//stable"
       "flathub:app/md.obsidian.Obsidian//stable"
+      "flathub:app/com.github.iwalton3.jellyfin-media-player//stable"
     ];
     overrides = {
       global = {
@@ -27,6 +23,11 @@
           "system-bus"
         ];
       };
+      "com.github.iwalton3.jellyfin-media-player" = {
+        environment = {
+          QT_XCB_GL_INTEGRATION = "xcb_egl";
+        };
+      };
     };
   };
 }

hosts/common/optional/desktop/gnome.nix

@@ -34,12 +34,12 @@
       (with pkgs; [
         # Ignored Packages
         gnome-tour
+        gedit
       ])
       ++ (with pkgs.gnome; [
         atomix
         epiphany
         geary
-        gedit
         gnome-characters
         gnome-contacts
         gnome-initial-setup