From bc2a197e4ef1b5bd91724f3b846a99064717339b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
Date: Fri, 28 Feb 2020 14:31:24 +0100
Subject: [PATCH] merge

---
 config/xsession/xsession.nix |  2 +-
 home.nix                     |  3 +--
 overlays/steam.nix           | 20 --------------------
 scripts/dmenuunicode         |  2 +-
 scripts/emojis.txt           |  0
 5 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 overlays/steam.nix
 mode change 100644 => 100755 scripts/emojis.txt

diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix
index 0f212a8..474e70f 100644
--- a/config/xsession/xsession.nix
+++ b/config/xsession/xsession.nix
@@ -44,7 +44,7 @@ export QT_STYLE_OVERRIDE="breeze"
 
           "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
           "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
-          "${modifier}+Shift+U" = "exec /home/daniel/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
+          "${modifier}+Shift+U" = "exec /home/dan/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
 
 
           "${modifier}+n" = "exec dolphin";
diff --git a/home.nix b/home.nix
index a353cbf..5ac2ba8 100644
--- a/home.nix
+++ b/home.nix
@@ -19,7 +19,7 @@
     nixops
     ldns
 
-    steam
+    unstable.steam
     dolphinEmuMaster
     dwarf-fortress-packages.dwarf-fortress-full
     multimc
@@ -94,7 +94,6 @@
 
   programs.obs-studio = {
     enable = true;
-    # plugins = [pkgs.obs-linuxbrowser];
   };
 
 
diff --git a/overlays/steam.nix b/overlays/steam.nix
deleted file mode 100644
index 1eb5450..0000000
--- a/overlays/steam.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Needed for screeps
-# https://github.com/NixOS/nixpkgs/issues/32881
-self: super:
-{
-  steam = super.steam.override {
-    extraPkgs = super: with super; [
-      gnome3.gtk
-      zlib
-      dbus
-      freetype
-      glib
-      atk
-      cairo
-      gdk_pixbuf
-      pango
-      fontconfig
-      xorg.libxcb
-    ];
-  };
-}
diff --git a/scripts/dmenuunicode b/scripts/dmenuunicode
index 34728ee..f85fbf5 100755
--- a/scripts/dmenuunicode
+++ b/scripts/dmenuunicode
@@ -5,7 +5,7 @@
 # Must have xclip installed to even show menu.
 xclip -h >/dev/null || exit
 
-chosen=$(grep -v "#" /home/daniel/.config/nixpkgs/nix-dotfiles/scripts/emojis.txt | dmenu -i -l 20 -fn Monospace-14)
+chosen=$(grep -v "#" /home/dan/.config/nixpkgs/nix-dotfiles/scripts/emojis.txt | dmenu -i -l 20 -fn Monospace-14)
 
 [ "$chosen" != "" ] || exit
 
diff --git a/scripts/emojis.txt b/scripts/emojis.txt
old mode 100644
new mode 100755