summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-26 23:38:50 +0100
committermakefu <github@syntax-fehler.de>2016-02-26 23:38:50 +0100
commitce0b1e987a4bd99ed204e9ce06a7c882060dcbcf (patch)
tree7355e13d8dae28b68ec19867b22628a1fea0c2ef /makefu
parent340ea29373bd689e8b49d6657de3f0d0833df2ce (diff)
ma 2 laptop-utils: init
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/pornocauster.nix4
-rw-r--r--makefu/2configs/laptop-utils.nix13
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
];
}