From 136eb76297b21d21cca9bb0c04fb8bee719f0103 Mon Sep 17 00:00:00 2001
From: Alexander Wainwright <code@figtree.dev>
Date: Sat, 21 Jun 2025 13:13:15 +1000
Subject: [PATCH] Reorganise some stuff

And add dig.
---
 alex/home.nix     | 13 ++++++++-----
 configuration.nix | 14 ++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/alex/home.nix b/alex/home.nix
index 03b9d9a..f4b847c 100644
--- a/alex/home.nix
+++ b/alex/home.nix
@@ -31,14 +31,21 @@
     tm    = "tmux attach || tmux";
   };
 
+  home.file.".wezterm.lua".source = ./wezterm.lua;
+  home.file.".config/tmux/tmux.conf".source = ./tmux/tmux.conf;
+  home.file.".config/tmux/tmux.conf.local".source = ./tmux/tmux.conf.local;
 
   # 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
 
+    atuin
     tmux
     wezterm
+    chromium
+    darktable
+    nextcloud-client
 
     fastfetch
     nnn # terminal file manager
@@ -63,6 +70,7 @@
     xclip
 
     # networking tools
+    dig
     mtr # A network diagnostic tool
     # iperf3
     # dnsutils  # `dig` + `nslookup`
@@ -111,8 +119,6 @@
     zoxide
   ];
 
-  home.file.".wezterm.lua".source = ./wezterm.lua;
-
   # basic configuration of git, please change to your own
   programs.git = {
     enable = true;
@@ -197,9 +203,6 @@
     defaultEditor = true;
   };
 
-  home.file.".config/tmux/tmux.conf".source = ./tmux/tmux.conf;
-  home.file.".config/tmux/tmux.conf.local".source = ./tmux/tmux.conf.local;
-
   # This value determines the home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new home Manager release introduces backwards
diff --git a/configuration.nix b/configuration.nix
index 6335d42..e93cc7e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -124,20 +124,15 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    atuin
     avahi
     bat
-    chromium
-    darktable
+
     duf
     dust
     entr
-    # fastfetch
     fd
-    gcc
     git
     neovim
-    nextcloud-client
     python314
     ripgrep
     rsync
@@ -148,6 +143,13 @@
     wget
     zip
     mullvad-vpn
+
+    binutils
+    cmake
+    gcc
+    clang
+    gnumake
+    libtool
   ];
 
   environment.variables.EDITOR = "nvim";