From 83885191dbd75ecc9d882266a02a852b474b7c62 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Thu, 30 May 2024 10:53:05 +0200
Subject: [PATCH] Replace my shit flatpak module with nix-flatpak

---
 flake.nix                       |  4 ++
 home/christoph/default.nix      | 71 ++++++++++++++++++++++++---------
 home/modules/default.nix        |  2 +
 home/modules/neovim/default.nix |  8 ++--
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9b267ef0..3102dc04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,8 @@
     firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme";
     firefox-gnome-theme.flake = false;
 
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
+
     # adwaita-for-steam.url = "github:tkashkin/Adwaita-for-Steam";
     # adwaita-for-steam.flake = false;
 
@@ -104,6 +106,7 @@
 
         extraModules = [
           # hyprland.nixosModules.default # NOTE: NixOS includes system module
+          # inputs.nix-flatpak.nixosModules.nix-flatpak
         ];
       };
 
@@ -116,6 +119,7 @@
 
         extraModules = [
           # hyprland.nixosModules.default # NOTE: NixOS includes system module
+          # inputs.nix-flatpak.nixosModules.nix-flatpak
         ];
       };
     };
diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 80d6b9e6..fa990999 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -69,20 +69,20 @@ rec {
 
     fish.enable = true;
 
-    flatpak = {
-      enable = true;
-      autoUpdate = true;
-      autoPrune = true;
-      fontFix = true; # TODO: This doesn't work reliably...
-      iconFix = false;
+    # flatpak = {
+    #   enable = false;
+    #   autoUpdate = true;
+    #   autoPrune = true;
+    #   fontFix = true; # TODO: This doesn't work reliably...
+    #   iconFix = false;
 
-      flatseal.enable = true;
-      discord.enable = true;
-      spotify.enable = false; # Can't login because browser doesn't open
-      bottles.enable = false;
-      obsidian.enable = false; # Extremely low graph draw performance?
-      jabref.enable = false;
-    };
+    #   flatseal.enable = true;
+    #   discord.enable = true;
+    #   spotify.enable = true;
+    #   bottles.enable = false;
+    #   obsidian.enable = false; # Extremely low graph draw performance?
+    #   jabref.enable = false;
+    # };
 
     helix.enable = true;
 
@@ -175,10 +175,10 @@ rec {
       };
     };
 
-    # neovim = {
-    #   enable = false;
-    #   alias = true;
-    # };
+    neovim = {
+      enable = false;
+      alias = true;
+    };
 
     nextcloud = {
       enable = true;
@@ -376,10 +376,11 @@ rec {
     cool-retro-term
     ventoy-full # Bootable USB for many ISOs
     # geekbench
-    spotify
+    # spotify # NOTE: Uses flatpak
+    neovide
 
     sqlitebrowser # To modify tables
-    dbeaver # To import/export data + diagrams
+    dbeaver-bin # To import/export data + diagrams
     hoppscotch # Test APIs
 
     # Xooooorg/Desktop environment stuff
@@ -879,6 +880,38 @@ rec {
 
   services = {
     # kdeconnect.enable = true; # Note: This does not setup the firewall at all
+
+    flatpak = {
+      packages = [
+        "com.github.tchx84.Flatseal"
+        "com.discordapp.Discord"
+        "com.spotify.Client"
+      ];
+
+      uninstallUnmanaged = true;
+
+      update.auto = {
+        enable = true;
+        onCalendar = "weekly"; # Default value
+      };
+
+      overrides = {
+        global = {
+          # Force Wayland by default
+          Context.sockets = ["wayland" "!x11" "!fallback-x11"];
+
+          Context.filesystems = ["/nix/store:ro"];
+
+          Environment = {
+            # Fix un-themed cursor in some Wayland apps
+            XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
+
+            # Force correct theme for some GTK apps
+            # GTK_THEME = "Adwaita:dark";
+          };
+        };
+      };
+    };
   };
 
   # Nicely reload system units when changing configs
diff --git a/home/modules/default.nix b/home/modules/default.nix
index d1c73241..f967ffb1 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -27,5 +27,7 @@
     ./rofi
     ./vscode
     ./waybar
+
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
   ];
 }
diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix
index a60cf8fc..20af5ed8 100644
--- a/home/modules/neovim/default.nix
+++ b/home/modules/neovim/default.nix
@@ -14,10 +14,10 @@ in {
 
   config = mkIf cfg.enable {
     # TODO: Configure by option
-    home.sessionVariables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
+    # home.sessionVariables = {
+    #   EDITOR = "nvim";
+    #   VISUAL = "nvim";
+    # };
 
     programs.neovim = {
       enable = true;