From 9843ea9db566199cfeef095ce4f316909b774a54 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Mon, 22 Jan 2024 15:34:51 +0800
Subject: [PATCH] feat: morden cli tools

---
 home/base/desktop/dev-tools.nix        |  2 --
 home/base/desktop/editors/packages.nix |  1 +
 home/base/server/core.nix              | 19 +++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/home/base/desktop/dev-tools.nix b/home/base/desktop/dev-tools.nix
index f6bea882..837bcad6 100644
--- a/home/base/desktop/dev-tools.nix
+++ b/home/base/desktop/dev-tools.nix
@@ -31,8 +31,6 @@
 
       # misc
       pkgs-unstable.devbox
-      glow # markdown previewer
-      gdu # disk usage analyzer, required by AstroNvim
       bfg-repo-cleaner # remove large files from git history
       k6 # load testing tool
       protobuf # protocol buffer compiler
diff --git a/home/base/desktop/editors/packages.nix b/home/base/desktop/editors/packages.nix
index 048c28bc..ceb85214 100644
--- a/home/base/desktop/editors/packages.nix
+++ b/home/base/desktop/editors/packages.nix
@@ -122,6 +122,7 @@
       glow # markdown previewer
       fzf
       pandoc # document converter
+      hugo # static site generator
 
       #-- Optional Requirements:
       gdu # disk usage analyzer, required by AstroNvim
diff --git a/home/base/server/core.nix b/home/base/server/core.nix
index e9fbaa47..8211e50d 100644
--- a/home/base/server/core.nix
+++ b/home/base/server/core.nix
@@ -67,6 +67,7 @@
     duf # Disk Usage/Free Utility - a better 'df' alternative
     du-dust # A more intuitive version of `du` in rust
     ncdu # analyzer your disk usage Interactively, via TUI(replacement of `du`)
+    gdu # disk usage analyzer(replacement of `du`)
 
     # nix related
     #
@@ -76,8 +77,6 @@
 
     # productivity
     caddy
-    hugo # static site generator
-    glow # markdown previewer in terminal
   ];
 
   programs = {
@@ -128,8 +127,8 @@
     };
 
     # zoxide is a smarter cd command, inspired by z and autojump.
-    # It remembers which directories you use most frequently, 
-    # so you can "jump" to them in just a few keystrokes. 
+    # It remembers which directories you use most frequently,
+    # so you can "jump" to them in just a few keystrokes.
     # zoxide works on all major shells.
     #
     #   z foo              # cd into highest ranked directory matching foo
@@ -140,10 +139,10 @@
     #   z foo/             # cd into relative path
     #   z ..               # cd one level up
     #   z -                # cd into previous directory
-    #   
+    #
     #   zi foo             # cd with interactive selection (using fzf)
-    #   
-    #   z foo<SPACE><TAB>  # show interactive completions (zoxide v0.8.0+, bash 4.4+/fish/zsh only) 
+    #
+    #   z foo<SPACE><TAB>  # show interactive completions (zoxide v0.8.0+, bash 4.4+/fish/zsh only)
     zoxide = {
       enable = true;
       enableBashIntegration = true;
@@ -151,9 +150,9 @@
       enableNushellIntegration = true;
     };
 
-    # Atuin replaces your existing shell history with a SQLite database, 
-    # and records additional context for your commands. 
-    # Additionally, it provides optional and fully encrypted 
+    # Atuin replaces your existing shell history with a SQLite database,
+    # and records additional context for your commands.
+    # Additionally, it provides optional and fully encrypted
     # synchronisation of your history between machines, via an Atuin server.
     atuin = {
       enable = true;