From f011065b76e37a76222919c333005559eda8dbde Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Fri, 30 Aug 2024 17:18:42 -0700
Subject: swag

---
 home/ebisu/fortune/development/nix/default.nix     |  9 +++++++++
 home/ebisu/fortune/network/tools/default.nix       | 14 ++++++++++++--
 home/ebisu/fortune/network/tools/shark.nix         |  8 ++++++++
 home/ebisu/fortune/network/tools/shark/default.nix |  8 --------
 home/ebisu/fortune/network/tools/tcp/default.nix   | 12 ------------
 home/ebisu/fortune/system/default.nix              |  8 +-------
 home/ebisu/fortune/system/shell/fish/default.nix   |  5 ++---
 home/ebisu/fortune/system/tracing.nix              |  8 ++++++++
 8 files changed, 40 insertions(+), 32 deletions(-)
 create mode 100644 home/ebisu/fortune/network/tools/shark.nix
 delete mode 100644 home/ebisu/fortune/network/tools/shark/default.nix
 delete mode 100644 home/ebisu/fortune/network/tools/tcp/default.nix
 create mode 100644 home/ebisu/fortune/system/tracing.nix

(limited to 'home')

diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix
index 17b1186..63c21e5 100644
--- a/home/ebisu/fortune/development/nix/default.nix
+++ b/home/ebisu/fortune/development/nix/default.nix
@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  programs.direnv.enable = true;
+
   home.packages = with pkgs; [
     nil
     statix
@@ -11,5 +13,12 @@
     nixfmt-rfc-style
     nix-tree
     nix-visualize
+    statix
+    deadnix
+    update-nix-fetchgit
+    nix-prefetch-scripts
+    nix-output-monitor
+    cachix
+    devenv
   ];
 }
diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/network/tools/default.nix
index 3b6d59f..b581d1f 100644
--- a/home/ebisu/fortune/network/tools/default.nix
+++ b/home/ebisu/fortune/network/tools/default.nix
@@ -1,11 +1,21 @@
 { pkgs, ... }: {
   imports = [
     ./http
-    ./shark
-    ./tcp
+    ./shark.nix
   ];
 
   home.packages = with pkgs; [
     lftp
+    dnsutils
+    pwru
+    bmon
+    netcat-openbsd
+    nethogs
+    inetutils
+    whois
+    speedtest-cli
+    traceroute
+    iptraf-ng
+    tcpdump
   ];
 }
diff --git a/home/ebisu/fortune/network/tools/shark.nix b/home/ebisu/fortune/network/tools/shark.nix
new file mode 100644
index 0000000..5305bdf
--- /dev/null
+++ b/home/ebisu/fortune/network/tools/shark.nix
@@ -0,0 +1,8 @@
+{ pkgs
+, ...
+}: {
+  home.packages = with pkgs; [
+    termshark
+    wireshark
+  ];
+}
diff --git a/home/ebisu/fortune/network/tools/shark/default.nix b/home/ebisu/fortune/network/tools/shark/default.nix
deleted file mode 100644
index 5305bdf..0000000
--- a/home/ebisu/fortune/network/tools/shark/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs
-, ...
-}: {
-  home.packages = with pkgs; [
-    termshark
-    wireshark
-  ];
-}
diff --git a/home/ebisu/fortune/network/tools/tcp/default.nix b/home/ebisu/fortune/network/tools/tcp/default.nix
deleted file mode 100644
index 6af1824..0000000
--- a/home/ebisu/fortune/network/tools/tcp/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    bmon
-    netcat-openbsd
-    nethogs
-    inetutils
-    whois
-    speedtest-cli
-    traceroute
-    iptraf-ng
-  ];
-}
diff --git a/home/ebisu/fortune/system/default.nix b/home/ebisu/fortune/system/default.nix
index c8ae875..fd68070 100644
--- a/home/ebisu/fortune/system/default.nix
+++ b/home/ebisu/fortune/system/default.nix
@@ -8,18 +8,12 @@
     ./shell
     ./terminal
     ./virtualisation
+    ./tracing.nix
     ./variables.nix
     ./xdg.nix
   ];
 
   home.packages = with pkgs; [
-    # bpftrace
     libsForQt5.ksshaskpass
   ];
-
-  # services.ananicy = {
-  #   enable = true;
-  #   package = pkgs.ananicy-cpp;
-  #   rulesProvider = pkgs.ananicy-rules-cachyos;
-  # };
 }
diff --git a/home/ebisu/fortune/system/shell/fish/default.nix b/home/ebisu/fortune/system/shell/fish/default.nix
index bcc0def..d58b065 100644
--- a/home/ebisu/fortune/system/shell/fish/default.nix
+++ b/home/ebisu/fortune/system/shell/fish/default.nix
@@ -33,17 +33,16 @@
       end
 
       set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config)
-
       set HISTSIZE -1
       set HISTFILESIZE -1
       set SAVEHIST -1
 
       bind \ce edit_command_buffer
 
-      zoxide init fish | source
-
       cat ~/.cache/wal/sequences
 
+      zoxide init fish | source
+      direnv hook fish | source
       starship init fish | source
     '';
 
diff --git a/home/ebisu/fortune/system/tracing.nix b/home/ebisu/fortune/system/tracing.nix
new file mode 100644
index 0000000..9a96847
--- /dev/null
+++ b/home/ebisu/fortune/system/tracing.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    strace
+    bpftrace
+    lsof
+  ];
+}
-- 
cgit v1.2.3