7 files changed, 30 insertions, 42 deletions
diff --git a/sys/srv/compat.nix b/sys/srv/compat.nix
index 5c08a9b..ab9560f 100644
--- a/sys/srv/compat.nix
+++ b/sys/srv/compat.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.sys.srv.compat;
+  cfg = config.sys.srv.compat;
 in
 {
-  options.szpont.sys.srv.compat.enable = lib.mkEnableOption "enables compatibility with windows & x11";
-
+  options.sys.srv.compat.enable = lib.mkEnableOption "enables compatibility with windows & x11";
   config = lib.mkIf cfg.enable {
     programs.xwayland = {
       enable = true;
@@ -14,6 +13,7 @@ in
     environment.sessionVariables = {
       NIXOS_OZONE_WL = "1";
       ELECTRON_ENABLE_WAYLAND = "1";
+      WINE_RT_PRIO = "1";
     };
 
     environment.systemPackages = with pkgs; [
diff --git a/sys/srv/docker.nix b/sys/srv/docker.nix
index 3baa689..0ed1541 100644
--- a/sys/srv/docker.nix
+++ b/sys/srv/docker.nix
@@ -1,15 +1,14 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, username, ... }:
 let
-  cfg = config.szpont.sys.srv.docker;
+  cfg = config.sys.srv.docker;
 in
 {
-  options.szpont.sys.srv.docker.enable = lib.mkEnableOption "docker container engine";
-
+  options.sys.srv.docker.enable = lib.mkEnableOption "enables the docker container engine";
   config = lib.mkIf cfg.enable {
     virtualisation.docker.enable = true;
 
     environment.systemPackages = [ pkgs.docker-compose ];
 
-    users.users.adam.extraGroups = [ "docker" ];
+    users.users.${username}.extraGroups = [ "docker" ];
   };
 }
diff --git a/sys/srv/files.nix b/sys/srv/files.nix
index bbd6ca8..9b5759e 100644
--- a/sys/srv/files.nix
+++ b/sys/srv/files.nix
@@ -1,16 +1,15 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.sys.srv.files;
+  cfg = config.sys.srv.files;
 in
 {
-  options.szpont.sys.srv.files = {
-    thunar.enable = lib.mkEnableOption "thunar file manager";
-    utils.enable = lib.mkEnableOption "compression and trash utilities";
+  options.sys.srv.files = {
+    thunar.enable = lib.mkEnableOption "enables the thunar file manager";
+    utils.enable = lib.mkEnableOption "enables compression and trash utilities";
   };
-
   config = lib.mkMerge [
     {
-      szpont.sys.srv.files.utils.enable = lib.mkDefault cfg.thunar.enable;
+      sys.srv.files.utils.enable = lib.mkDefault cfg.thunar.enable;
     }
 
     (lib.mkIf cfg.thunar.enable {
@@ -22,7 +21,10 @@ in
           thunar-vcs-plugin
         ];
       };
-      services.gnome.gnome-keyring.enable = true;
+      services = {
+        tumbler.enable = true;
+        gnome.gnome-keyring.enable = true;
+      };
       environment.systemPackages = with pkgs; [ file-roller ];
     })
 
diff --git a/sys/srv/gaming.nix b/sys/srv/gaming.nix
index 1eb5472..ee7f608 100644
--- a/sys/srv/gaming.nix
+++ b/sys/srv/gaming.nix
@@ -1,17 +1,15 @@
 { config, lib, pkgs, username, ... }:
 let
-  cfg = config.szpont.sys.srv.gaming;
+  cfg = config.sys.srv.gaming;
 in
 {
-  options.szpont.sys.srv.gaming = {
-    enable = lib.mkEnableOption "enables gaming stuff";
-    steam.enable = lib.mkEnableOption "enables steam stuff";
+  options.sys.srv.gaming = {
+    enable = lib.mkEnableOption "enables gaming utilities";
+    steam.enable = lib.mkEnableOption "enables steam utilities";
     vr.enable = lib.mkEnableOption "enables vr support";
   };
-
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
-      home-manager.users.${username}.szpont.hm.soft.gaming.enable = true;
       programs.gamescope.enable = true;
 
       programs.gamemode = {
@@ -23,6 +21,8 @@ in
         heroic
         prismlauncher
       ];
+
+      home-manager.users.${username}.hm.soft.mangohud.enable = true;
     })
 
     (lib.mkIf cfg.steam.enable {
diff --git a/sys/srv/kvm.nix b/sys/srv/kvm.nix
index 08c8578..2cf8c26 100644
--- a/sys/srv/kvm.nix
+++ b/sys/srv/kvm.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.sys.srv.kvm;
+  cfg = config.sys.srv.kvm;
 in
 {
-  options.szpont.sys.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager";
-
+  options.sys.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager";
   config = lib.mkIf cfg.enable {
     virtualisation.libvirtd = {
       enable = true;
@@ -14,8 +13,6 @@ in
 
     programs.virt-manager.enable = true;
 
-    users.users.adam.extraGroups = [ "libvirtd" ];
-
-    boot.initrd.kernelModules = [ "kvm-amd" ];
+    boot.initrd.kernelModules = lib.optional (config.sys.core.drivers.amd.enable or false) "kvm-amd";
   };
 }
diff --git a/sys/srv/nix-helper.nix b/sys/srv/nix-helper.nix
index fc81ddb..5eb3353 100644
--- a/sys/srv/nix-helper.nix
+++ b/sys/srv/nix-helper.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.sys.srv.nix-helper;
+  cfg = config.sys.srv.nix-helper;
 in
 {
-  options.szpont.sys.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper";
-
+  options.sys.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper";
   config = lib.mkIf cfg.enable {
     nix.settings = {
       trusted-users = [ "root" "adam" ];
diff --git a/sys/srv/ollama.nix b/sys/srv/ollama.nix
index 7cb90bf..11babd6 100644
--- a/sys/srv/ollama.nix
+++ b/sys/srv/ollama.nix
@@ -1,18 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.sys.srv.ollama;
+  cfg = config.sys.srv.ollama;
 in
 {
-  options.szpont.sys.srv.ollama = {
-    enable = lib.mkEnableOption "Ollama AI service";
-    
-    useRocm = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "whether to use ollama with ROCm support.";
-    };
-  };
-
+  options.sys.srv.ollama.enable = lib.mkEnableOption "Ollama AI service";
   config = lib.mkIf cfg.enable {
     fileSystems."/models" = {
       device = "/home/ollama";
@@ -22,7 +13,7 @@ in
 
     services.ollama = {
       enable = true;
-      package = if cfg.useRocm then pkgs.ollama-rocm else pkgs.ollama;
+      package = pkgs.ollama-rocm;
       
       user = "ollama";
       models = "/models";