From 0e8343eb80dc56c2aee3f9545b328a1ec8947168 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Thu, 8 May 2025 21:43:22 +0800
Subject: [PATCH] chore: move gui softwares to  home configuration

---
 home/xin/calcite.nix               | 34 ++++++++++++++++++++++
 machines/calcite/configuration.nix | 46 ------------------------------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/home/xin/calcite.nix b/home/xin/calcite.nix
index 1e0a68c..3814cf6 100644
--- a/home/xin/calcite.nix
+++ b/home/xin/calcite.nix
@@ -44,6 +44,40 @@ in
     wechat-uos
     wpsoffice
     ttf-wps-fonts
+
+    eudic
+
+    exiftool
+    darktable
+    kdePackages.kdenlive
+    inkscape
+    gimp3
+    gthumb
+    oculante
+
+    # Multimedia
+    vlc
+    obs-studio
+    spotify
+    spot
+    # IM
+    element-desktop
+    tdesktop
+
+    # Password manager
+    bitwarden
+
+    # Browser
+    chromium
+
+    # Writting
+    zotero
+
+    # wemeet
+    wemeet
+
+    imhex
+    oidc-agent
   ];
 
   # Theme
diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix
index f71d213..85591a5 100644
--- a/machines/calcite/configuration.nix
+++ b/machines/calcite/configuration.nix
@@ -238,27 +238,6 @@ in
     "openssl-1.1.1w"
   ];
   environment.systemPackages = with pkgs; [
-    imhex
-    oidc-agent
-    # Filesystem
-    (owncloud-client.overrideAttrs (
-      finalAttrs: previousAttrs: {
-        src = pkgs.fetchFromGitHub {
-          owner = "xinyangli";
-          repo = "client";
-          rev = "780d1c4c8bf02be42e118c792ff833ab10c2fdcc";
-          hash = "sha256-pEwcGJI9sN9nooW/RQHmi52Du6yzofgZeB8PcjwPtZ8=";
-        };
-      }
-    ))
-    nfs-utils
-
-    # tesseract5 # ocr
-    ocrmypdf # pdfocr
-
-    gtkwave
-    bubblewrap
-
     # ==== Development ==== #
     (
       let
@@ -277,11 +256,7 @@ in
 
     # ==== GUI Softwares ==== #
 
-    eudic
-
     bibata-cursors
-    gthumb
-    oculante
 
     (epsonscan2.overrideAttrs (
       finalAttrs: prevAttrs: {
@@ -289,27 +264,6 @@ in
       }
     ))
 
-    # Multimedia
-    vlc
-    obs-studio
-    spotify
-    spot
-    # IM
-    element-desktop
-    tdesktop
-
-    # Password manager
-    bitwarden
-
-    # Browser
-    chromium
-
-    # Writting
-    zotero
-
-    # wemeet
-    wemeet
-
     virt-manager
     wineWowPackages.waylandFull
     winetricks