add/rearrange packages

colmena/local.nix

@@ -7,10 +7,4 @@ in {
     targetHost = null;
     tags = [ "local" ];
   };
-
-  environment.systemPackages = with pkgs; [
-    agenix
-    colmena
-    npins
-  ];
 }

common/environment.nix

@@ -1,13 +1,22 @@
 { config, lib, pkgs, ... }:
 
 {
-  # CLI utilities I get frustrated if I'm missing
   environment.systemPackages = with pkgs; [
     git
-    inetutils
     lshw
     parted
     wget
+
+    # network troubleshooting
+    inetutils
+    lsof
+    tcpdump
+    netcat # <3
+
+    # used for nix config
+    npins
+    colmena
+    agenix
   ];
 
   environment.wordlist.enable = true;

home/libreoffice.nix

@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    libreoffice
-    hunspell
-    hunspellDicts.en_GB-ise
-  ];
-}

hosts/tohru/home.nix

@@ -7,7 +7,6 @@
       ../../home/firefox.nix
       ../../home/git.nix
       ../../home/gnome
-      ../../home/libreoffice.nix
       ../../home/vscode.nix
     ];
 
@@ -17,12 +16,18 @@
       foliate
       gimp-with-plugins
       keepassxc
-      openttd
       thunderbird
       tor-browser-bundle-bin
-    ]) ++ (with pkgs.nur.repos.qenya; [
-      digital-a-love-story
-      dont-take-it-personally-babe
+
+      # libreoffice
+      libreoffice
+      hunspell
+      hunspellDicts.en_GB-ise
+
+      # games
+      openttd
+      nur.repos.qenya.digital-a-love-story
+      nur.repos.qenya.dont-take-it-personally-babe
     ]);
     programs.chromium.enable = true;