ma 2 laptop-utils: init

2 files changed, 10 insertions, 7 deletions

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index b2cf0be79..9415f2345 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -8,6 +8,7 @@
     [ # Include the results of the hardware scan.
       ../.
       ../2configs/main-laptop.nix #< base-gui + zsh
+      ../2configs/laptop-utils.nix
 
       # Krebs
       ../2configs/tinc-basic-retiolum.nix
@@ -39,6 +40,9 @@
   nixpkgs.config.packageOverrides = pkgs: {
     tinc = pkgs.tinc_pre;
   };
+  # steam
+  hardware.opengl.driSupport32Bit = true;
+  hardware.pulseaudio.support32Bit = true;
 
   # configure pulseAudio to provide a HDMI sink as well
   networking.firewall.enable = true;
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
index b5ba2ec3b..8a1c0e184 100644
--- a/makefu/2configs/laptop-utils.nix
+++ b/makefu/2configs/laptop-utils.nix
@@ -6,7 +6,7 @@
 # essentially `nix-env -q` of the main user
 # TODO: split gui and non-gui
 {
-  environment.systemPackages = with pkgs; [
+  krebs.per-user.makefu.packages = with pkgs; [
     # core
     at_spi2_core
     acpi
@@ -27,11 +27,14 @@
 
 
     # gui
+    chromium
     clipit
     feh
+    firefox
     keepassx
     pcmanfm
     skype
+    mirage
     tightvnc
     gnome3.dconf
     vlc
@@ -39,10 +42,6 @@
     wireshark
     xdotool
 
-    # browser
-    firefox
-    chromium
-
     # sectools
     aria2
     binwalk
@@ -53,10 +52,10 @@
 
 
     # stuff
-    cac-cli
+    cac-api
     cac-panel
     krebspaste
     ledger
-    password-store
+    pass
   ];
 }