summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/all.nix1
-rw-r--r--makefu/2configs/tools/core-gui.nix1
-rw-r--r--makefu/2configs/tools/extra-gui.nix2
-rw-r--r--makefu/2configs/tools/games.nix6
-rw-r--r--makefu/2configs/tools/scanner-tools.nix7
-rw-r--r--makefu/2configs/tools/steam.nix10
6 files changed, 23 insertions, 4 deletions
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index c7a116918..7755e2872 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -7,6 +7,7 @@
./extra-gui.nix
./games.nix
./media.nix
+ ./scanner-tools.nix
./sec.nix
./sec-gui.nix
./studio.nix
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 0538647ae..2f80b08c9 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -13,7 +13,6 @@
keepassx
pcmanfm
evince
- skype
mirage
tightvnc
gnome3.dconf
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index b2d616764..bcc068d82 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -6,7 +6,7 @@
gimp
inkscape
libreoffice
- skype
+ # skype
synergy
tdesktop
virtmanager
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 47f06287b..8e815da5e 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -1,8 +1,10 @@
{ pkgs, ... }:
{
- krebs.per-user.makefu.packages = with pkgs; [
- steam
+ imports = [
+ ./steam.nix
+ ];
+ users.users.makefu.packages = with pkgs; [
games-user-env
];
}
diff --git a/makefu/2configs/tools/scanner-tools.nix b/makefu/2configs/tools/scanner-tools.nix
new file mode 100644
index 000000000..ef2e913e4
--- /dev/null
+++ b/makefu/2configs/tools/scanner-tools.nix
@@ -0,0 +1,7 @@
+{
+ # ln -s /run/current-system/sw/bin/xsane ~/.gimp-2.8/plug-ins/xsane
+ nixpkgs.config.packageOverrides = pkgs: {
+ xsaneGimp = pkgs.xsane.override { gimpSupport = true; };
+ };
+}
+
diff --git a/makefu/2configs/tools/steam.nix b/makefu/2configs/tools/steam.nix
new file mode 100644
index 000000000..200ea4719
--- /dev/null
+++ b/makefu/2configs/tools/steam.nix
@@ -0,0 +1,10 @@
+{pkgs, ...}:
+{
+ users.users.makefu.packages = [
+ (pkgs.steam.override {
+ newStdcpp = true;
+ })
+ ];
+ hardware.opengl.driSupport32Bit = true;
+ hardware.pulseaudio.support32Bit = true;
+}