From b9e7bdc0d33925b47a3280945b769dad8569b79e Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Wed, 28 Feb 2024 13:32:34 +1100
Subject: [PATCH] update flatpaks, never try gnome again

---
 home/bolt.nix     |  7 +++----
 home/home.nix     | 43 ++++++++++++++-----------------------------
 system/quiver.nix |  2 +-
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/home/bolt.nix b/home/bolt.nix
index 8d90350..d6e9c5b 100644
--- a/home/bolt.nix
+++ b/home/bolt.nix
@@ -10,12 +10,11 @@
     ./home.nix
   ];
 
-  home.packages = with pkgs; [
-    nicotine-plus
-  ];
-
   home = {
     username = "bolt";
     homeDirectory = "/home/bolt";
+    packages = with pkgs; [
+      nicotine-plus
+    ];
   };
 }
diff --git a/home/home.nix b/home/home.nix
index 6bba899..08f47d1 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -20,7 +20,6 @@ in {
     ./util/firefox-webapp.nix
     inputs.plasma-manager.homeManagerModules.plasma-manager
     ./programs/plasma.nix
-    # inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.nix-index-database.hmModules.nix-index
   ];
 
@@ -48,8 +47,6 @@ in {
 
       kooha
 
-      onlyoffice-bin
-
       croc
 
       xorg.xrdb
@@ -87,6 +84,8 @@ in {
     enableModule = true;
     packages = [
       "flathub:app/com.logseq.Logseq/x86_64/stable"
+      "flathub:app/md.obsidian.Obsidian/x86_64/stable"
+      "flathub:app/org.onlyoffice.desktopeditors/x86_64/stable"
     ];
     remotes = {
       "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
@@ -101,20 +100,6 @@ in {
       };
     };
   };
-  # services.flatpak.packages = [
-  #   "com.logseq.Logseq"
-  # ];
-  # services.flatpak.overrides = {
-  #   global = {
-  #     Context.sockets = [
-  #       "wayland"
-  #     ];
-  #     Environment."ELECTRON_OZONE_PLATFORM_HINT" = "auto";
-  #   };
-  #   "com.logseq.Logseq" = {
-  #     Application.command = "run.sh --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations";
-  #   };
-  # };
 
   programs.firefox.webapps = {
     teams = {
@@ -203,18 +188,18 @@ in {
     "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
   ];
 
-  # gtk = with pkgs.rice; {
-  #   enable = true;
-  #   theme = with gtk-theme; {
-  #     inherit package name;
-  #   };
-  #   iconTheme = with icons; {
-  #     inherit package name;
-  #   };
-  #   font = with fonts.sans; {
-  #     inherit name size package;
-  #   };
-  # };
+  gtk = with pkgs.rice; {
+    enable = true;
+    theme = with gtk-theme; {
+      inherit package name;
+    };
+    iconTheme = with icons; {
+      inherit package name;
+    };
+    font = with fonts.sans; {
+      inherit name size package;
+    };
+  };
 
   programs.direnv = {
     enable = true;
diff --git a/system/quiver.nix b/system/quiver.nix
index 859ecd7..ccda714 100644
--- a/system/quiver.nix
+++ b/system/quiver.nix
@@ -31,7 +31,7 @@
 
   boot.loader.systemd-boot.configurationLimit = 5;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.plymouth.enable = true;
+  # boot.plymouth.enable = true;
 
   boot.supportedFilesystems = ["ntfs"];