Merge remote-tracking branch 'gum/master'

4 files changed, 22 insertions, 3 deletions

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 6844fdfe4..37673768a 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -2,18 +2,19 @@
   imports = [
     ./android-pentest.nix
     ./consoles.nix
-    ./core.nix
     ./core-gui.nix
-    ./dev.nix
+    ./core.nix
     ./desktop.nix
+    ./dev.nix
     ./extra-gui.nix
     ./games.nix
+    ./maker.nix
     ./media.nix
     ./mobility.nix
     ./pcmanfm-extra.nix
     ./scanner-tools.nix
-    ./sec.nix
     ./sec-gui.nix
+    ./sec.nix
     ./studio.nix
   ];
 }
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 66bc9a0e6..2b9baa9c5 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -22,6 +22,7 @@
     brain
     whatsupnix
     nixpkgs-pytools
+    nixpkgs-fmt
     hydra-check
     # git-related
     git-preview
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 0f1e61791..507887cff 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -8,5 +8,6 @@
     games-user-env
     wine
     pkg2zip
+    steam
   ];
 }
diff --git a/makefu/2configs/tools/maker.nix b/makefu/2configs/tools/maker.nix
new file mode 100644
index 000000000..8388db583
--- /dev/null
+++ b/makefu/2configs/tools/maker.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  users.users.makefu.packages = with pkgs; [
+    # media
+    picard
+    asunder
+    #darkice
+    lame
+    # creation
+    blender
+    openscad
+    # slicing
+    cura
+    chitubox
+  ];
+}