Move gui packages to gui and enable flatpak only if xdg portals is en…

…abled
arunoruto · Oct 1, 2024 · 59da1af · 59da1af
1 parent 721a507
commit 59da1af
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 24 deletions.
diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix
@@ -23,6 +23,12 @@
         (with pkgs; [
           gnome-photos
           gnome-tour
+          nautilus-open-any-terminal
+          gnome.nautilus-python
+          gnome.gnome-software
+          gnome.pomodoro
+          gnome.gnome-remote-desktop
+          gnome3.gnome-tweaks
         ])
         ++ (with pkgs.gnome; [
           #cheese # webcam tool

diff --git a/modules/nixos/environment/gui/default.nix b/modules/nixos/environment/gui/default.nix
@@ -4,16 +4,18 @@
   ...
 }: {
   imports = [
+    ./chrome.nix
     ./firefox.nix
     ./steam.nix
-    ./chrome.nix
+    ./packages.nix
 
     ./wayland.nix
   ];
 
   options.gui.enable = lib.mkEnableOption "Setup GUI Modules";
 
   config = lib.mkIf config.gui.enable {
+    gui.packages.enable = lib.mkDefault true;
     wayland.enable = lib.mkDefault true;
 
     chrome.enable = lib.mkDefault true;

diff --git a/modules/nixos/environment/gui/packages.nix b/modules/nixos/environment/gui/packages.nix
@@ -0,0 +1,29 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options.gui.packages.enable = lib.mkEnableOption "Setup amd tools";
+
+  config = lib.mkIf config.gui.packages.enable {
+    environment.systemPackages = with pkgs; [
+      vlc
+      unstable.vscode
+      # wezterm
+
+      discord
+      gthumb
+      # jabref
+      libsForQt5.kdenlive
+      libsForQt5.okular
+      #mailspring
+      # masterpdfeditor
+      # mprime
+      unstable.plex-desktop
+      remmina
+      zoom-us
+      zotero
+    ];
+  };
+}
diff --git a/modules/nixos/environment/gui/wayland.nix b/modules/nixos/environment/gui/wayland.nix
@@ -18,5 +18,9 @@
         xdgOpenUsePortal = true;
       };
     };
+
+    environment.systemPackages = with pkgs; [
+      wl-clipboard
+    ];
   };
 }
diff --git a/modules/nixos/environment/packages.nix b/modules/nixos/environment/packages.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
-  imports = [
-    ./chrome.nix
-  ];
+  # imports = [
+  #   ./chrome.nix
+  # ];
 
   environment = {
     # Enable shells
@@ -39,38 +39,38 @@
       tmux
       unstable.ventoy
       vim
-      vlc
-      unstable.vscode
+      # vlc
+      # unstable.vscode
       #vscode
-      wezterm
+      # wezterm
       wget
-      wl-clipboard
+      # wl-clipboard
 
-      discord
-      gthumb
+      # discord
+      # gthumb
       # jabref
-      libsForQt5.kdenlive
-      libsForQt5.okular
+      # libsForQt5.kdenlive
+      # libsForQt5.okular
       #mailspring
       # masterpdfeditor
       # mprime
-      unstable.plex-desktop
-      remmina
-      zoom-us
-      zotero
+      # unstable.plex-desktop
+      # remmina
+      # zoom-us
+      # zotero
 
       texlive.combined.scheme-full
 
       #ultrastardx
       #ultrastar-manager
 
       # Gnome specific applications
-      nautilus-open-any-terminal
-      gnome.nautilus-python
-      gnome.gnome-software
-      gnome.pomodoro
-      gnome.gnome-remote-desktop
-      gnome3.gnome-tweaks
+      # nautilus-open-any-terminal
+      # gnome.nautilus-python
+      # gnome.gnome-software
+      # gnome.pomodoro
+      # gnome.gnome-remote-desktop
+      # gnome3.gnome-tweaks
     ];
   };
 }
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs,
+  config,
   lib,
   ...
 }: {
@@ -19,7 +19,7 @@
   ];
 
   davmail.enable = lib.mkDefault false;
-  flatpak.enable = lib.mkDefault true;
+  flatpak.enable = lib.mkDefault config.xdg.portal.enable;
   secrets.enable = lib.mkDefault true;
   oneapi.enable = lib.mkDefault false;
   # oneapi.enable = lib.mkDefault true;