machine/catacomb/default.nix

@@ -18,20 +18,31 @@
     };
     supportedFilesystems = ["zfs"];
     zfs.enableUnstable = true;
-    kernelParams = [ "zfs.zfs_dmu_offset_next_sync=0" ];
   };
 
   system.stateVersion = "22.11"; # Read the usual warning
 
   swapDevices = [ { device = "/swap"; size = 1024; } ];
 
-  environment.systemPackages = with pkgs; [
+  beatific.defaults.programs = false; # Disabled until I know the flask-python env isn't necessary for something
-    tmux man-pages pv lsof
+  environment.systemPackages = with pkgs;
+  let
+    py3-packages = python-packages: with python-packages; [
+      flask
+    ];
+    py3-with-packages = python3.withPackages py3-packages;
+  in [
+    wget vim curl git htop bash tmux psmisc man-pages pv lsof
+    zip unzip
+    py3-with-packages
     usbutils
     hdparm sdparm smartmontools gptfdisk gnufdisk
     dosfstools
     mkpasswd samba
+    #file-rename
+    rsync
     rclone gnupg
+    tree
     exiftool
   ];
 

modules/beatific.nix

@@ -83,16 +83,13 @@ in {
         bc  # Terminal calculator
         curl
         duf
-        file  # File type inspector
+        file
+        killall
         nebula
-        psmisc  # provides killall
         python3
-        rsync
+        tree
-        tree  # Directory tree view
-        unzip
         vim
         wget
-        zip
       ];
       programs = {
         git = {