diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix
index 90e2156..bac01d1 100644
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -44,6 +44,57 @@ let
     cmake-language-server # cmake lsp
   ];
 
+  java_tools = with pkgs; [
+    # java development
+    google-java-format # formatter
+    jdk # java
+
+    # java assembler
+    jasmin
+  ];
+
+  common_tools = with pkgs; [
+    # hex viewer
+    hexyl
+
+    # find typos in code
+    typos
+
+    # replacements for common posix tools
+    eza # ls replacement
+    bat # pretty `cat` clone
+    delta # viewer for `git` and `diff` output
+    dust # pretty `du` version
+    duf # better `df` clone
+    gping # `ping`... but with a graph!!
+    tldr # `man` but more straight-forward and simpler
+    ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
+    fd # alternative to `find`
+
+    # status tools
+    htop
+    bottom
+
+    # other tools
+    unzip
+    wget
+    killall
+    file
+    b3sum
+
+    # "A hexadecimal, binary, and ASCII dump utility with color support"
+    tinyxxd
+
+    # networking tool
+    lsof
+
+    # view SMART status of drives
+    smartmontools
+
+    # adds `sensors` command
+    lm_sensors
+  ];
+
 in
 {
   imports = [
@@ -66,12 +117,6 @@ in
   home.packages =
     with pkgs;
     [
-      # hex viewer
-      hexyl
-
-      # find typos in code
-      typos
-
       # python formatter
       ruff
 
@@ -79,40 +124,13 @@ in
       hugo
       go
 
-      # java development
-      google-java-format # formatter
-      jdk # java
-
       # for benchmaking stuff
       hyperfine
 
-      # replacements for common posix tools
-      eza # ls replacement
-      bat # pretty `cat` clone
-      delta # viewer for `git` and `diff` output
-      dust # pretty `du` version
-      duf # better `df` clone
-      gping # `ping`... but with a graph!!
-      tldr # `man` but more straight-forward and simpler
-      ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
-      lurk # better strace
-
-      # alternative to `find`
-      fd
-
-      # adds `sensors` command
-      lm_sensors
-
       just
 
       pfetch-rs
       waypipe
-      htop
-      bottom
-      wget
-      unzip
-      compsize
-      killall
 
       sshfs
 
@@ -125,10 +143,6 @@ in
       # "~~matt's~~ my trace route"
       mtr
 
-      file
-
-      b3sum
-
       ffmpeg-full
 
       # microcontroller tooling
@@ -152,15 +166,11 @@ in
 
       binwalk
 
-      smartmontools
-
       # clang-format and clang-tidy
       clang-tools
       clang
       gdb
 
-      fio
-
       age
       git-crypt
 
@@ -178,13 +188,6 @@ in
 
       borgbackup
 
-      tinyxxd
-
-      bfc
-
-      # java assembler
-      jasmin
-
       # used to deploy nix system to server
       # (and in the future, desktop)
       deploy-rs
@@ -193,7 +196,9 @@ in
       powerstat
     ]
     ++ rust_pkgs
-    ++ lsps;
+    ++ lsps
+    ++ java_tools
+    ++ common_tools;
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''
@@ -202,11 +207,6 @@ in
     rustflags = ["-Clink-arg=-Wl,--no-rosegment"]
   '';
 
-  # default applications
-  home.sessionVariables = {
-    EDITOR = "hx";
-  };
-
   # git (self explanatory)
   programs.git = {
     enable = true;
diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix
index 74202c7..ccf53e2 100644
--- a/home-manager/progs/helix.nix
+++ b/home-manager/progs/helix.nix
@@ -1,5 +1,8 @@
 { pkgs, ... }:
 {
+  # set helix as default editor
+  home.sessionVariables.EDITOR = "hx";
+
   programs.helix = {
     enable = true;
     package = pkgs.helix;