From dc80560082eaed5125d2049a1017be8ff46814c0 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Sat, 29 Apr 2023 23:50:32 +0200
Subject: [PATCH] move common software into separate file

---
 modules/desktop-software.nix | 21 +++++++++++----------
 modules/gnome.nix            | 12 +++---------
 modules/sway.nix             | 24 +++---------------------
 3 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 4ebab68..659dd0e 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -1,17 +1,18 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    tdesktop
-    fluffychat
-    dino
-    signal-desktop
-    inkscape
-    gimp
     blender
-    kicad
-    wl-clipboard
-    firefox-wayland
-    tor-browser-bundle-bin
+    dino
     ffmpeg-full
+    firefox-wayland
+    fluffychat
+    gimp
+    inkscape
+    kicad
+    signal-desktop
+    tdesktop
+    tor-browser-bundle-bin
+    wl-clipboard
+    yt-dlp
   ];
 }
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 8f7f592..c918eb9 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -1,22 +1,16 @@
 { config, pkgs, ... }: {
 
+  imports = [
+    ./desktop-software.nix
+  ];
   environment.systemPackages = with pkgs; [
     amberol
     celluloid
-    dino
-    firefox-wayland
-    fluffychat
     gnome-console
     gnome.gnome-boxes
-    gnome.gnome-terminal
     gnome.gnome-tweaks
     nextcloud-client
-    pulseaudioFull
     qbittorrent
-    screen-message
-    signal-desktop
-    tdesktop
-    wl-clipboard
   ];
 
   environment.gnome.excludePackages = with pkgs; [
diff --git a/modules/sway.nix b/modules/sway.nix
index fecf66f..d90e1d1 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,24 +1,12 @@
 # General Desktop-related config
 { pkgs, ... }:
 {
+  imports = [
+    ./desktop-software.nix
+  ];
   environment.systemPackages = with pkgs; [
-    firefox-wayland
-    wl-clipboard
     screen-message
     qbittorrent
-    dino
-    fluffychat
-    tdesktop
-    # (tdesktop.overrideAttrs (old: rec {
-    #   version = "4.6.7";
-    #   src = fetchFromGitHub {
-    #     owner = "forkgram";
-    #     repo = "tdesktop";
-    #     rev = "v${version}";
-    #     sha256 = "sha256-KMV/t3AC/kZQVz31UPYEKU/An6ycdsabZazUVCA9yIU=";
-    #   };
-    # }))
-    signal-desktop
     gajim
     imv
     swayimg
@@ -36,12 +24,6 @@
     bashmount
     (xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ]; })
     audacity
-    yt-dlp
-    tor-browser-bundle-bin
-    ffmpeg-full
-    gimp
-    inkscape
-    blender
   ];
 
   #on the desktop, we need nice fonts ^^