merge

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";

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];
   };
 
 

overlays/steam.nix

@@ -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
-    ];
-  };
-}

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