summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/laptop-utils.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-02 20:51:37 +0100
committerlassulus <lass@aidsballs.de>2016-03-02 20:51:37 +0100
commitef8ed48b1c576238e8fd6cbaef0d0208d8cc1b68 (patch)
tree15d9dc2aadbba7d0c7c6338d6441af7849cc248b /makefu/2configs/laptop-utils.nix
parent024de57e7b1918a617685b65a0c5c45ee4592e47 (diff)
parentdb72d5911f1556d3b1cfbe8f1a2d8f6765728952 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/laptop-utils.nix')
-rw-r--r--makefu/2configs/laptop-utils.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
index b5ba2ec3b..815ff7489 100644
--- a/makefu/2configs/laptop-utils.nix
+++ b/makefu/2configs/laptop-utils.nix
@@ -6,7 +6,11 @@
# essentially `nix-env -q` of the main user
# TODO: split gui and non-gui
{
- environment.systemPackages = with pkgs; [
+ nixpkgs.config.firefox = {
+ enableAdobeFlash = true;
+ };
+
+ krebs.per-user.makefu.packages = with pkgs; [
# core
at_spi2_core
acpi
@@ -27,11 +31,14 @@
# gui
+ chromium
clipit
feh
+ firefox
keepassx
pcmanfm
skype
+ mirage
tightvnc
gnome3.dconf
vlc
@@ -39,10 +46,6 @@
wireshark
xdotool
- # browser
- firefox
- chromium
-
# sectools
aria2
binwalk
@@ -53,10 +56,10 @@
# stuff
- cac-cli
+ cac-api
cac-panel
krebspaste
ledger
- password-store
+ pass
];
}