From bd80ed88655fef78072acc17db52806338c455c8 Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Sat, 24 Jun 2023 01:08:36 +0100
Subject: [PATCH] actual organization

---
 homes/floppydisk/default.nix   | 81 +++++++++++++++++++++-------------
 hosts/nixbox/configuration.nix | 25 ++++++-----
 hosts/nixpad/configuration.nix |  9 ++--
 3 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index 7f5aedc..a2b3710 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -22,60 +22,79 @@
     username = "floppydisk";
     homeDirectory = "/home/floppydisk";
     packages = with pkgs; [
+      # Utils
       handbrake
-      nodejs_18
-      nodePackages.yarn
-      nodePackages.ts-node
-      php82
-      php82Packages.composer
       thunderbird
-      deno
       picard
-      codeql
-      discord
-      libsForQt5.vvave
       realvnc-vnc-viewer
-      rpcs3
-      pcsxr
-      pcsx2
       rpi-imager
-      steam
-      gzdoom
       obs-studio
       yt-dlp
-      vlc
-      vscode
       _1password-gui
       _1password
       git-credential-1password
       neofetch
       microsoft-edge
-      jetbrains.ruby-mine
-      jetbrains.rider
-      jetbrains.phpstorm
-      jetbrains.idea-ultimate
-      jetbrains.webstorm
       inputs.arrpc.packages.${pkgs.system}.arrpc
-      lazygit
-      dotnet-sdk
-      minecraft
-      mongodb-compass
-      tidal-hifi
-      teamspeak5_client
       rdesktop
       pfetch
-      caprine-bin
-      lightworks
-      httpie
       partition-manager
       _3llo
       gimp
       qemu
       virt-manager
+
+      # DevTools
+      github-desktop
+      gh
+      codeql
+      vscode
+      jetbrains.ruby-mine
+      jetbrains.rider
+      jetbrains.phpstorm
+      jetbrains.idea-ultimate
+      jetbrains.webstorm
+      lazygit
+      wakatime
+      mongodb-compass
+      httpie
+
+      # Langs
+      openscad
+      nodejs_18
+      nodePackages.yarn
+      nodePackages.ts-node
+      php82
+      php82Packages.composer
+      deno
       python310
       python310Packages.pip
       python310Packages.discordpy
-      wakatime
+      dotnet-sdk
+      jdk17
+      maven
+
+      # Comms
+      nheko
+      element-desktop
+      discord
+      caprine-bin
+      teamspeak5_client
+
+      # Gaming
+      rpcs3
+      pcsxr
+      pcsx2
+      steam
+      gzdoom
+      minecraft
+      dolphin-emu
+      prismlauncher
+
+      # Media
+      vlc
+      libsForQt5.vvave
+      tidal-hifi
     ];
   };
 
diff --git a/hosts/nixbox/configuration.nix b/hosts/nixbox/configuration.nix
index febaeb7..e66b634 100644
--- a/hosts/nixbox/configuration.nix
+++ b/hosts/nixbox/configuration.nix
@@ -108,32 +108,35 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
+  # security is for wusses
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.1.1u"
+  ];
+
   # List packages installed in system profile. To search, run:
   # $ 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.
+    # Tools
+    vim
     wget
     git
     gnupg
     pinentry
-    nerdfonts
-    jetbrains-mono
     kitty
     ntfs3g
-    dolphin-emu
-    htop
+    pulseaudioFull
+    linuxKernel.packages.linux_zen.v4l2loopback
     pciutils
     usbutils
     isoimagewriter
-    jdk17
-    prismlauncher
-    maven
     nvtop
+    screen
     pavucontrol
     paprefs
-    pulseaudioFull
-    screen
-    linuxKernel.packages.linux_zen.v4l2loopback
+
+    # Fonts
+    nerdfonts
+    jetbrains-mono
   ];
 
   programs.fish.enable = true;
diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix
index fbf49f2..d24216b 100644
--- a/hosts/nixpad/configuration.nix
+++ b/hosts/nixpad/configuration.nix
@@ -108,15 +108,18 @@
   # List packages installed in system profile. To search, run:
   # $ 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.
+    # Tools
+    vim
     wget
     git
     gnupg
     pinentry
-    nerdfonts
-    jetbrains-mono
     kitty
     ntfs3g
+
+    # Fonts
+    nerdfonts
+    jetbrains-mono
   ];
 
   programs.fish.enable = true;