Bunch of updates:

- Fixed not having virt-manager
- Added Steam
- Removed old ssd mounts on apocalypse
- Fixed syncthing service
- Probably some spotify stuff

4 files changed, 60 insertions, 1 deletions

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index c3e0b45..4719b5d 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -17,6 +17,7 @@ in {
     ./x11.nix
     ./wayland.nix
     ./wms
+    ./steam.nix
   ];  
   options.addons.desktop = with types; {
       wmMeta = mkOption {
diff --git a/modules/desktop/steam.nix b/modules/desktop/steam.nix
new file mode 100644
index 0000000..f19130c
--- /dev/null
+++ b/modules/desktop/steam.nix
@@ -0,0 +1,50 @@
+{config, pkgs,lib, ...}: {
+  options.addons = {
+      steam.enable = lib.mkEnableOption "Enable steam on this machine"; 
+  };
+
+  config = lib.mkIf config.addons.steam.enable (lib.mkMerge [ 
+    ({
+      assertions = [
+        { 
+          assertion = config.addons.desktop.enable;
+          message = "You need a desktop environment to enable Steam!"; 
+        }
+      ];
+      programs.gamescope = {
+        enable = true;
+        capSysNice = true;
+      }; 
+      programs.steam = {
+        enable = true; 
+        # Done according to the wiki, talks about some unexpected values in a lambda? 
+        # Doesn't seem to be how overrides work 
+        # TODO: Figure out how overrides work
+        # package = pkgs.steam.override {
+        #   # withPrimus = true; 
+        #   extraPackages = with pkgs; [bumblebee glxinfo];
+        # }; 
+        
+        # Gamescope  
+        gamescopeSession.enable = true;
+
+        # Open firewall 
+        remotePlay.openFirewall = true; 
+        dedicatedServer.openFirewall = true; 
+        localNetworkGameTransfers.openFirewall = true; 
+      };
+
+      # Enable Appimage for some steam games 
+      programs.appimage.enable = true;
+      programs.appimage.binfmt = true;
+    }) 
+
+    (lib.mkIf config.addons.dssktop.x11.enable {
+
+    })
+    (lib.mkIf config.addons.dssktop.wayland.enable {
+
+    })
+
+  ]); 
+}
diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix
index 0b78daf..d7b9651 100644
--- a/modules/desktop/wayland.nix
+++ b/modules/desktop/wayland.nix
@@ -2,5 +2,12 @@
   options.addons.desktop.wayland.enable = lib.mkEnableOption "Enable wayland" ;
   config = lib.mkIf config.addons.desktop.wayland.enable {
     services.displayManager.sddm.wayland.enable = true;
+
+    xdg.portal = { 
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk 
+      ];
+    };
   };
 }
diff --git a/modules/virt.nix b/modules/virt.nix
index 416f1c4..feb27c7 100644
--- a/modules/virt.nix
+++ b/modules/virt.nix
@@ -13,7 +13,9 @@ in
       environment.systemPackages = with pkgs; [ 
         qemu 
       ]; 
+      programs.virt-manager.enable = true;
       virtualisation = {
+        spiceUSBRedirection.enable = true; 
         docker.enable = true;
         libvirtd = {
           enable = true;
@@ -28,7 +30,6 @@ in
       
     })
     (lib.mkIf cfg.guest {
-      virtualisation.spiceUSBRedirection.enable = true; 
       services.spice-vdagentd.enable = true; 
     })
   ]);