configuration.nix

@@ -83,6 +83,7 @@ in
 
   programs.dconf.enable = true;
   programs.xwayland.enable = true;
+  xdg.portal.enable = true;
 
   # exclude packages from plasma5
   environment.plasma5.excludePackages = with pkgs.libsForQt5; [
@@ -146,6 +147,8 @@ in
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
+  programs.java.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = (with pkgs; [
@@ -215,6 +218,8 @@ in
   # networking.firewall.enable = false;
 
   environment.sessionVariables = rec {
+    _JAVA_OPTIONS = "-Dawt.useSystemAAFontSettings=lcd";
+
     # rust
     CARGO_TERM_COLOR = "always";
     RUST_BACKTRACE = "1";

core/default.nix

@@ -1,8 +1,6 @@
 {
     imports = [
-        ./java.nix
         ./dotnet.nix
         ./printing.nix
-        ./xdg.nix
     ];
 }

core/java.nix

@@ -1,9 +0,0 @@
-{ pkgs, config, ... }: {
-
-    # enable smooth font rendering
-    environment.sessionVariables = rec {
-        _JAVA_OPTIONS = "-Dawt.useSystemAAFontSettings=lcd";
-    };
-
-    programs.java.enable = true;
-}

core/xdg.nix

@@ -1,15 +0,0 @@
-{ pkgs, config, ... }: {
-
-    xdg.portal = {
-        enable = true;
-        extraPortals = [
-            pkgs.xdg-desktop-portal-gtk
-            pkgs.xdg-desktop-portal-kde
-        ];
-    };
-
-    environment.systemPackages = with pkgs; [
-        pkgs.xdg-desktop-portal-gtk
-        pkgs.xdg-desktop-portal-kde
-    ];
-}

dev/default.nix

@@ -5,6 +5,5 @@
         ./docker-rootless.nix
         ./platformio.nix
         ./qemu.nix
-        ./latex.nix
     ];
 }

dev/latex.nix

@@ -1,7 +0,0 @@
-{ pkgs, config, ... }: {
-
-    environment.systemPackages = with pkgs; [
-        # LaTeX and tlmgr
-        texlive.combined.scheme-small
-    ];
-}

hardware/amdgpu.nix

@@ -1,20 +0,0 @@
-{ pkgs, config, ... }: {
-
-    # Make the kernel use the correct driver early
-    boot.initrd.kernelModules = [ "amdgpu" ];
-
-    # For 32 bit applications
-    hardware.opengl.driSupport32Bit = true;
-
-    # AMDVLK drivers can be used in addition to the Mesa RADV drivers
-    hardware.opengl.extraPackages = with pkgs; [
-        amdvlk
-        rocmPackages.clr.icd
-    ];
-
-    environment.systemPackages = with pkgs; [
-        nvtop-amd
-        clinfo
-        rocmPackages.clr
-    ];
-}

hardware/default.nix

@@ -1,5 +0,0 @@
-{
-    imports = [
-        ./amdgpu.nix
-    ];
-}

users/servostar/user.nix

@@ -40,6 +40,9 @@
       discord
       signal-desktop
 
+      # LaTeX and tlmgr
+      texlive.combined.scheme-full
+
       godot_4
 
       # command line tools
@@ -51,6 +54,7 @@
       btop
       htop
       tmux
+      nvtop-amd
       asciiquarium
       pipes
       tldr