diff --git a/common/gui/common.nix b/common/gui/common.nix
index e1ff1ce..b7b296f 100644
--- a/common/gui/common.nix
+++ b/common/gui/common.nix
@@ -6,7 +6,6 @@
     adwaita-icon-theme
     gnome-themes-extra
     librewolf
-    discord
     qt5.qtwayland
     qt6.qmake
     qt6.qtwayland
diff --git a/flake.nix b/flake.nix
index 97574da..323ba8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -167,6 +167,7 @@
           modules = [
             # > Our main home-manager configuration file <
             ./home-manager/machines/candlekeep.nix
+            inputs.nixcord.homeManagerModules.nixcord
             inputs.stylix.homeManagerModules.stylix
           ];
         };
@@ -181,6 +182,7 @@
           modules = [
             # > Our main home-manager configuration file <
             ./home-manager/machines/grymforge.nix
+            inputs.nixcord.homeManagerModules.nixcord
             inputs.stylix.homeManagerModules.stylix
           ];
         };
diff --git a/home-manager/modules/common-gui.nix b/home-manager/modules/common-gui.nix
index 4056623..6d82b58 100644
--- a/home-manager/modules/common-gui.nix
+++ b/home-manager/modules/common-gui.nix
@@ -10,6 +10,7 @@
     ./zen.nix
     ./xdg.nix
     ./mime.nix
+    ./nixcord.nix
   ];
 
   fonts.fontconfig.enable = true;
diff --git a/home-manager/modules/linux-gui.nix b/home-manager/modules/linux-gui.nix
index 8385fa4..f3160ec 100644
--- a/home-manager/modules/linux-gui.nix
+++ b/home-manager/modules/linux-gui.nix
@@ -1,17 +1,15 @@
 { pkgs, ... }:
 {
   imports = [
-    ./discord
     ./zathura.nix
   ];
 
-  programs.discord = {
-    enable = true;
-    wrapDiscord = true;
-  };
+  # programs.discord = {
+  #   enable = true;
+  #   wrapDiscord = true;
+  # };
 
   home.packages = with pkgs; [
-    betterdiscordctl # A utility for managing BetterDiscord, enhancing features and customization in the Discord desktop client.
     element-desktop # A feature-rich client for Matrix.org
     gimp # GNU Image Manipulation Program, a powerful and open-source raster graphics editor for tasks like photo editing and graphic design.
     gparted # Gnome Partition Editor, a graphical partition manager for creating, resizing, and managing disk partitions.
@@ -29,5 +27,6 @@
     vlc
     zotero
     feishin
+    picard
   ];
 }
diff --git a/home-manager/modules/nixcord.nix b/home-manager/modules/nixcord.nix
new file mode 100644
index 0000000..533f0cf
--- /dev/null
+++ b/home-manager/modules/nixcord.nix
@@ -0,0 +1,26 @@
+{
+  # ...
+  programs.nixcord = {
+    enable = true;
+    # quickCss = "some CSS";
+    config = {
+      # useQuickCss = true;
+      themeLinks = [
+        "https://clearvision.github.io/ClearVision-v6/main.css"
+      ];
+      frameless = true; # set some Vencord options
+      plugins = {
+        hideAttachments.enable = true;
+        ignoreActivities = {
+          enable = true;
+          ignorePlaying = true;
+          ignoreWatching = true;
+          # ignoredActivities = [ "someActivity" ];
+        };
+      };
+    };
+    extraConfig = {
+    };
+  };
+  # ...
+}
diff --git a/home-manager/modules/ssh.nix b/home-manager/modules/ssh.nix
index baf1b18..aa3053c 100644
--- a/home-manager/modules/ssh.nix
+++ b/home-manager/modules/ssh.nix
@@ -51,13 +51,13 @@
       };
       "onedev.local" = {
         hostname = "git.local.gwg313.xyz";
-        user = "gwg313";
+        user = "git";
         identityFile = "/home/gwg313/.ssh/onedev/id_ed25519";
         port = 2222;
       };
       "onedev" = {
         hostname = "git.gwg313.xyz";
-        user = "gwg313";
+        user = "git";
         identityFile = "/home/gwg313/.ssh/onedev/id_ed25519";
         port = 2222;
       };
diff --git a/home-manager/modules/yazi.nix b/home-manager/modules/yazi.nix
index f1918bc..206aa13 100644
--- a/home-manager/modules/yazi.nix
+++ b/home-manager/modules/yazi.nix
@@ -3,9 +3,10 @@ let
   plugins-repo = pkgs.fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "02d18be03812415097e83c6a912924560e4cec6d";
-    hash = "sha256-1FZ8wcf2VVp6ZWY27vm1dUU1KAL32WwoYbNA/8RUAog=";
+    rev = "273019910c1111a388dd20e057606016f4bd0d17";
+    hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I=";
   };
+
 in
 {
   programs.yazi = {
@@ -30,8 +31,8 @@ in
       starship = pkgs.fetchFromGitHub {
         owner = "Rolv-Apneseth";
         repo = "starship.yazi";
-        rev = "af8bf6f82165b83272b6501ce7445cf2c61fbf51";
-        sha256 = "sha256-L7MkZZqJ+t+A61ceC4Q1joLF6ytoWdgx9BwZWAGAoCA=";
+        rev = "6c639b474aabb17f5fecce18a4c97bf90b016512";
+        sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A=";
       };
     };
 
@@ -44,7 +45,7 @@ in
       manager.prepend_keymap = [
         {
           on = "T";
-          run = "plugin --sync max-preview";
+          run = "plugin sync max-preview";
           desc = "Maximize or restore the preview pane";
         }
         {