From 3617ad4e4d641195a0a2aeb1140b62c78127c26c Mon Sep 17 00:00:00 2001
From: tootbrute <tootbrute@tutanota.com>
Date: Sat, 25 Jan 2025 14:57:19 +0800
Subject: [PATCH] put all basic apps to install in base.nix

---
 nixosModules/base.nix | 59 +++++++++++++++++++++++++++++-------
 nixosModules/home.nix | 69 ++-----------------------------------------
 2 files changed, 51 insertions(+), 77 deletions(-)

diff --git a/nixosModules/base.nix b/nixosModules/base.nix
index 1a20524..312579a 100644
--- a/nixosModules/base.nix
+++ b/nixosModules/base.nix
@@ -129,35 +129,74 @@
     git
     btop
     htop
-    ptyxis
+    ptyxis # terminal app
+    tree
+    restic # backup program
 
     # core apps
-    iotas
+    iotas # nextcloud compatible notes app
     curl
-    keepassxc
+    keepassxc # password client
     nextcloud-client
-    libreoffice-fresh
-    hunspell #dictionaries for libreoffice
+    libreoffice-fresh # word docs
+    hunspell # dictionaries for libreoffice
     hunspellDicts.en_CA
     hunspellDicts.en_US
+    xreader # pdf viewer
 
-    restic
+    # creative apps
     kdePackages.kdenlive
     audacity
     gimp
     krita
     element-desktop
 
-    ibus
-    ibus-with-plugins
-    libchewing
-
     #gaming
     dosbox
 
     #gpu tools
     intel-gpu-tools
     #nvtopPackages.full not working right now
+
+    # archive programs
+    zip
+    xz
+    unzip
+    p7zip
+
+    # utils
+    ripgrep # recursively searches directories for a regex >
+    #jq # A lightweight and flexible command-line JSON proc>
+    #yq-go # yaml processor https://github.com/mikefarah/yq
+    eza # A modern replacement for ‘ls’
+    #fzf # A command-line fuzzy finder
+    nnn # terminal file manager
+
+    # networking tools
+    mtr # A network diagnostic tool
+    iperf3
+    dnsutils  # `dig` + `nslookup`
+    #ldns # replacement of `dig`, it provide the command `drill`
+    #aria2 # A lightweight multi-protocol & multi-source command-line download utility
+    #socat # replacement of openbsd-netcat
+    nmap # A utility for network discovery and security auditing
+    #ipcalc  # it is a calculator for the IPv4/v6 addresses
+
+    # system tools
+    sysstat
+    lm_sensors # for `sensors` command
+    ethtool
+    pciutils # lspci
+    usbutils # lsusb
+
+   # system call monitoring
+    strace # system call monitoring
+    ltrace # library call monitoring
+    lsof # list open files
+
+    iotop # io monitoring
+    iftop # network monitoring
+
   ];
 
   # Services
diff --git a/nixosModules/home.nix b/nixosModules/home.nix
index 2812a2e..27bee7c 100644
--- a/nixosModules/home.nix
+++ b/nixosModules/home.nix
@@ -21,71 +21,6 @@
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
-    # here is some command line tools I use frequently
-    # feel free to add your own or remove some of them
-    
-    xreader #pdf viewer
-
-    nnn # terminal file manager
-
-    # archives
-    zip
-    xz
-    unzip
-    p7zip
-
-    # utils
-    ripgrep # recursively searches directories for a regex pattern
-    #jq # A lightweight and flexible command-line JSON processor
-    #yq-go # yaml processor https://github.com/mikefarah/yq
-    eza # A modern replacement for ‘ls’
-    #fzf # A command-line fuzzy finder
-
-    # networking tools
-    mtr # A network diagnostic tool
-    iperf3
-    dnsutils  # `dig` + `nslookup`
-    #ldns # replacement of `dig`, it provide the command `drill`
-    #aria2 # A lightweight multi-protocol & multi-source command-line download utility
-    #socat # replacement of openbsd-netcat
-    nmap # A utility for network discovery and security auditing
-    #ipcalc  # it is a calculator for the IPv4/v6 addresses
-
-    # misc
-    #cowsay
-    #file
-    #which
-    tree
-    #gnused
-    #gnutar
-    #gawk
-    #zstd
-    #gnupg
-
-    # nix related
-    #
-    # it provides the command `nom` works just like `nix`
-    # with more details log output
-    nix-output-monitor
-
-    # productivity
-    hugo # static site generator
-    glow # markdown previewer in terminal
-
-    iotop # io monitoring
-    iftop # network monitoring
-
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
-    # system tools
-    sysstat
-    lm_sensors # for `sensors` command
-    ethtool
-    pciutils # lspci
-    usbutils # lsusb
 
   ];
   
@@ -96,7 +31,7 @@
     TERMINAL = "alacritty";
   };
 
-  # basic configuration of git, please change to your own
+  # Basic configuration of git, please change to your own
   programs.git = {
     enable = true;
     userName = "Tootbrute";
@@ -106,7 +41,7 @@
     };
   };
 
-  # starship - an customizable prompt for any shell
+  # Starship - an customizable prompt for any shell
   programs.starship = {
     enable = true;
     # custom settings