From ef93b433b86886e84249c11b661a145857698bbc Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Thu, 8 Jun 2023 11:45:08 -0500
Subject: [PATCH] Installed flatpak + apps I usually install as flatpaks

---
 system/configuration.nix | 9 ++++++---
 user/app/games/games.nix | 6 ++++--
 user/home.nix            | 6 ++++--
 user/wm/picom/picom.conf | 3 +++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/system/configuration.nix b/system/configuration.nix
index a04c9dd..2967b92 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -6,9 +6,8 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-   #   ./style/stylix.nix
+    [ ./hardware-configuration.nix
+      #./style/stylix.nix
     ];
 
   nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
@@ -17,6 +16,10 @@
                 ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  # Need some flatpaks
+  services.flatpak.enable = true;
+  xdg.portal.enable = true;
   
   # Doas instead of sudo
   security.doas.enable = true;
diff --git a/user/app/games/games.nix b/user/app/games/games.nix
index 4bc2eff..32b19ee 100644
--- a/user/app/games/games.nix
+++ b/user/app/games/games.nix
@@ -14,12 +14,12 @@ in
 {
   home.packages = with pkgs; [
     # Games
-    #TODO need flatpak steam
     gamehub
     myRetroarch
     airshipper
     qjoypad
-    # TODO need flatpak minecraft
+    prismlauncher
+    #TODO need flatpak steam - I don't have this declaratively yet
   ];
   # The following 2 declarations allow retroarch to be imported into gamehub
   # Set retroarch core directory to ~/.local/bin/libretro
@@ -29,4 +29,6 @@ in
     url = "https://github.com/libretro/libretro-core-info/archive/refs/tags/v1.15.0.tar.gz";
     sha256 = "004kgbsgbk7hn1v01jg3vj4b6dfb2cp3kcp5hgjyl030wqg1r22q";
   };
+  # To get steam to import into gamehub, first install it as a flatpak, then
+  # Set steam directory to ~/.var/app/com.valvesoftware.Steam/.steam
 }
diff --git a/user/home.nix b/user/home.nix
index 839b2d5..a1c6e35 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -75,9 +75,9 @@
     libmediainfo
     mediainfo-gui
     freetube
-    # TODO need ytsub somehow (sarowish/ytsub)
     audio-recorder
     pavucontrol
+    gtkcord4
 
     # Command Line
     neofetch lolcat cowsay
@@ -133,12 +133,13 @@
     
     # TODO Configure pipewire audio server
 
-    # Virtual Machines
+    # Virtual Machines and wine
     libvirt
     virt-manager
     qemu_full
     lxc
     swtpm
+    bottles
 
     # Security
     keepassxc
@@ -215,6 +216,7 @@
 
   home.sessionVariables = {
     EDITOR = "emacsclient";
+    XDG_DATA_DIRS = "$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; # lets flatpak work
   };
 
   # extra packages
diff --git a/user/wm/picom/picom.conf b/user/wm/picom/picom.conf
index 78320ff..e21f3cd 100644
--- a/user/wm/picom/picom.conf
+++ b/user/wm/picom/picom.conf
@@ -198,6 +198,9 @@ opacity-rule = [
   "90:class_g    = 'xmobar'",
   "90:class_g    = 'firefox'",
   "90:class_g    = 'librewolf'",
+  "90:class_g    = 'gtkcord4'",
+  "90:class_g    = 'bottles'",
+  "90:class_g    = 'PrismLauncher'",
   "90:class_g    = 'Navigator'",
   "90:class_g    = 'Rofi'",
   "90:class_g    = 'Geary'",