From e03866490e69df3040ca3143e55ca3538aa06db1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 9 Sep 2017 20:58:36 +0200
Subject: ma steam: fix startup

reference: https://github.com/NixOS/nixpkgs/issues/25957
---
 makefu/2configs/tools/games.nix |  6 ++++--
 makefu/2configs/tools/steam.nix | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 makefu/2configs/tools/steam.nix

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 47f06287b..0257e1870 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/steam.nix b/makefu/2configs/tools/steam.nix
new file mode 100644
index 000000000..dbe51270d
--- /dev/null
+++ b/makefu/2configs/tools/steam.nix
@@ -0,0 +1,10 @@
+{pkgs, ...}:
+{
+  environment.systemPackages = [ 
+    (pkgs.steam.override {
+      newStdcpp = true;
+    })
+  ];
+  hardware.opengl.driSupport32Bit = true;
+  hardware.pulseaudio.support32Bit = true;
+}
-- 
cgit v1.2.3


From 8a50e700166835c86d4339647c378c465a2970a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 10 Sep 2017 13:40:59 +0200
Subject: ma tools/games: fix path to steam

---
 makefu/2configs/tools/games.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 0257e1870..8e815da5e 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../steam.nix
+    ./steam.nix
   ];
   users.users.makefu.packages = with pkgs; [
     games-user-env
-- 
cgit v1.2.3


From 4ea52583d189d2c72b0a64cf605216f8b5bbcf56 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 11 Sep 2017 23:09:47 +0200
Subject: ma tools: add scanner-tools

---
 makefu/2configs/tools/all.nix           | 1 +
 makefu/2configs/tools/scanner-tools.nix | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 makefu/2configs/tools/scanner-tools.nix

(limited to 'makefu/2configs/tools')

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/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; };
+  };
+}
+
-- 
cgit v1.2.3


From 8962c8f1fc8c37d5f5f55bb2394f8f6e673a87f8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 29 Sep 2017 21:34:12 +0200
Subject: ma tools/steam: install steam for makefu, not all users

---
 makefu/2configs/tools/steam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/steam.nix b/makefu/2configs/tools/steam.nix
index dbe51270d..200ea4719 100644
--- a/makefu/2configs/tools/steam.nix
+++ b/makefu/2configs/tools/steam.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}:
 {
-  environment.systemPackages = [ 
+  users.users.makefu.packages = [
     (pkgs.steam.override {
       newStdcpp = true;
     })
-- 
cgit v1.2.3


From e62f376e6177f3efb0e0bcd3aad97a991c3b6d60 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 14:42:20 +0200
Subject: ma tools: disable skype

---
 makefu/2configs/tools/core-gui.nix  | 1 -
 makefu/2configs/tools/extra-gui.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'makefu/2configs/tools')

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
-- 
cgit v1.2.3