summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
committerlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
commit059a5b48af9f6c21c3c442bb0fc35d2105d3b682 (patch)
tree15de5c35d213d677bc2b294fc411d0f43dc536b2 /makefu/2configs/tools
parent4d7aacdd1c2a8cc9f6d826cb7e3bb2bc10e36a5e (diff)
parent5b9d7e47c3f1877bcffdf2aafac712451db43d61 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/all.nix7
-rw-r--r--makefu/2configs/tools/dev.nix1
-rw-r--r--makefu/2configs/tools/games.nix1
-rw-r--r--makefu/2configs/tools/maker.nix16
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
+ ];
+}