From d08a592542097089994bf487c0f4f8ad4dd4bd7b Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Sun, 1 Jun 2025 20:25:28 +0200
Subject: [PATCH] Home: System update

---
 home/christoph/default.nix           | 23 +++++-----
 home/christoph/nixinator/default.nix | 68 +++++++++++++++++++++++-----
 home/modules/fish/default.nix        |  2 +-
 3 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 16ebb3f4..c5f808d1 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -321,7 +321,6 @@ rec {
       sshfs # Mount remote directories via SSH
 
       # GUI apps
-      ventoy-full # Bootable USB for many ISOs
       signal-desktop
       anki
       font-manager # Previews fonts, but doesn't set them
@@ -481,15 +480,15 @@ rec {
       yazi-plugins = pkgs.fetchFromGitHub {
         owner = "yazi-rs";
         repo = "plugins";
-        rev = "5186af7984aa8cb0550358aefe751201d7a6b5a8"; # NOTE: Refresh after system updates depending on the yazi version
-        hash = "sha256-Cw5iMljJJkxOzAGjWGIlCa7gnItvBln60laFMf6PSPM=";
+        rev = "63f9650e522336e0010261dcd0ffb0bf114cf912"; # NOTE: Refresh after system updates depending on the yazi version
+        hash = "sha256-ZCLJ6BjMAj64/zM606qxnmzl2la4dvO/F5QFicBEYfU=";
       };
 
       yazi-starship = pkgs.fetchFromGitHub {
         owner = "Rolv-Apneseth";
         repo = "starship.yazi";
-        rev = "6c639b474aabb17f5fecce18a4c97bf90b016512";
-        sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A=";
+        rev = "6a0f3f788971b155cbc7cec47f6f11aebbc148c9";
+        sha256 = "sha256-q1G0Y4JAuAv8+zckImzbRvozVn489qiYVGFQbdCxC98=";
       };
     in {
       enable = true;
@@ -573,7 +572,7 @@ rec {
 
     flatpak = {
       # FlatHub stable is only added by default if no custom remotes are specified
-      remotes = [
+      remotes = lib.mkOptionDefault [
         {
           name = "flathub";
           location = "https://flathub.org/repo/flathub.flatpakrepo";
@@ -588,19 +587,18 @@ rec {
         "com.github.tchx84.Flatseal"
 
         "com.spotify.Client"
-        # "md.obsidian.Obsidian" # NOTE: Installed via package
 
         # NOTE: Also change discord-ipc-0 below
-        "com.discordapp.DiscordCanary"
-        # "com.discordapp.Discord"
+        "com.discordapp.Discord"
+        # "com.discordapp.DiscordCanary"
         # "dev.vencord.Vesktop"
 
         # "com.google.Chrome"
-        # "com.parsecgaming.parsec"
+        # "md.obsidian.Obsidian" # NOTE: Installed via package
       ];
 
       uninstallUnmanaged = true;
-      # uninstallUnused = true; # TODO: Available since 0.6.0
+      uninstallUnused = true; # TODO: Available since 0.6.0
 
       update.auto = {
         enable = true;
@@ -628,7 +626,8 @@ rec {
 
   systemd.user.tmpfiles.rules = [
     # Fix Discord rich presence for Flatpak
-    "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
+    "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
+    # "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
   ];
 
   # Nicely reload system units when changing configs
diff --git a/home/christoph/nixinator/default.nix b/home/christoph/nixinator/default.nix
index f052a94c..cb2a1937 100644
--- a/home/christoph/nixinator/default.nix
+++ b/home/christoph/nixinator/default.nix
@@ -1,5 +1,10 @@
 # Here goes the stuff that will only be enabled on the desktop
-{pkgs, ...}: {
+{
+  pkgs,
+  nixosConfig,
+  config,
+  ...
+}: {
   imports = [
     ../../modules
   ];
@@ -60,24 +65,63 @@
       jetbrains.pycharm-professional
       jetbrains.idea-ultimate
       jetbrains.webstorm
-      code-cursor # why not
 
-      # unityhub
-      # jetbrains.rider
-      # (with dotnetCorePackages;
-      #   combinePackages [
-      #     sdk_6_0_1xx
-      #     sdk_7_0_3xx
-      #     sdk_8_0_2xx
-      #   ]) # For Rider/Unity
-      # mono # For Rider/Unity
+      unityhub
+      jetbrains.rider
+      (with dotnetCorePackages;
+        combinePackages [
+          # sdk_6_0_1xx # Is EOL
+          # sdk_7_0_3xx # Is EOL
+          sdk_8_0_3xx
+          sdk_9_0_3xx
+        ]) # For Rider/Unity
+      mono # For Rider/Unity
 
       blender
       # godot_4
       obs-studio
       kdePackages.kdenlive
       krita
-      # makemkv
+      makemkv
+
+      steam-devices-udev-rules
     ];
+
+    services = {
+      flatpak = {
+        packages = [
+          "com.valvesoftware.Steam"
+          "org.freedesktop.Platform.VulkanLayer.gamescope"
+          "org.freedesktop.Platform.VulkanLayer.MangoHud"
+          "net.davidotek.pupgui2"
+          "org.prismlauncher.PrismLauncher"
+          "com.usebottles.bottles"
+          "io.github.lawstorant.boxflat"
+        ];
+
+        overrides = {
+          "com.valvesoftware.Steam".Context = {
+            filesystems = [
+              "${config.home.homeDirectory}/Games"
+              "/var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE"
+            ];
+          };
+
+          "net.davidotek.pupgui2".Context = {
+            filesystems = [
+              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
+              "${config.home.homeDirectory}/Games"
+            ];
+          };
+
+          "com.usebottles.bottles".Context = {
+            filesystems = [
+              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
+              "${config.home.homeDirectory}/Games"
+            ];
+          };
+        };
+      };
+    };
   };
 }
diff --git a/home/modules/fish/default.nix b/home/modules/fish/default.nix
index f1339dd9..cce7f427 100644
--- a/home/modules/fish/default.nix
+++ b/home/modules/fish/default.nix
@@ -194,7 +194,7 @@ in {
             gcl = "git clone";
           })
 
-          (abbrify pkgs.gping {ping = "gping";})
+          # (abbrify pkgs.gping {ping = "gping";})
 
           (abbrify pkgs.lazygit {lg = "lazygit";})