summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-26 16:47:20 +0100
committerlassulus <lass@aidsballs.de>2016-02-26 16:47:20 +0100
commit83decf4907a4c492e1def891bd13ea93ce082ec9 (patch)
tree68471df9f64616fd253ac24bab12cd472b28627f /makefu/2configs
parent8e43f278d0156e75eab245bb62bca89ca5de794f (diff)
parent340ea29373bd689e8b49d6657de3f0d0833df2ce (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/git/brain-retiolum.nix1
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix2
-rw-r--r--makefu/2configs/laptop-utils.nix62
-rw-r--r--makefu/2configs/mail-client.nix2
-rw-r--r--makefu/2configs/main-laptop.nix12
5 files changed, 66 insertions, 13 deletions
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index 58fd250e5..80e4c87cf 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -14,6 +14,7 @@ let
priv-repos = mapAttrs make-priv-repo {
autosync = { };
+ pass = { };
};
# TODO move users to separate module
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 15700e10d..0b69dbcaf 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -15,7 +15,7 @@ let
tinc_graphs = {
desc = "Tinc Advanced Graph Generation";
};
- cac = { };
+ cac-api = { };
init-stockholm = {
desc = "Init stuff for stockholm";
};
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
new file mode 100644
index 000000000..b5ba2ec3b
--- /dev/null
+++ b/makefu/2configs/laptop-utils.nix
@@ -0,0 +1,62 @@
+{ pkgs, ... }:
+
+# tools i use when actually working with the host.
+# package version will now be maintained by nix-rebuild
+#
+# essentially `nix-env -q` of the main user
+# TODO: split gui and non-gui
+{
+ environment.systemPackages = with pkgs; [
+ # core
+ at_spi2_core
+ acpi
+ bc
+ exif
+ file
+ ntfs3g
+ pv
+ proot
+ sshpass
+ unzip
+ unrar
+ usbutils
+ zip
+
+ # dev
+ python35Packages.virtualenv
+
+
+ # gui
+ clipit
+ feh
+ keepassx
+ pcmanfm
+ skype
+ tightvnc
+ gnome3.dconf
+ vlc
+ virtmanager
+ wireshark
+ xdotool
+
+ # browser
+ firefox
+ chromium
+
+ # sectools
+ aria2
+ binwalk
+ dnsmasq
+ iodine
+ mtr
+ nmap
+
+
+ # stuff
+ cac-cli
+ cac-panel
+ krebspaste
+ ledger
+ password-store
+ ];
+}
diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix
index 913cbf25b..036924071 100644
--- a/makefu/2configs/mail-client.nix
+++ b/makefu/2configs/mail-client.nix
@@ -3,6 +3,7 @@
with config.krebs.lib;
{
environment.systemPackages = with pkgs; [
+ abook
msmtp
mutt-kz
notmuch
@@ -10,5 +11,4 @@ with config.krebs.lib;
imapfilter
gnupg
];
-
}
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index 452cdfb23..3cc91b630 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -11,21 +11,11 @@ with config.krebs.lib;
./base-gui.nix
./fetchWallpaper.nix
./zsh-user.nix
+ ./laptop-utils.nix
];
users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
- environment.systemPackages = with pkgs;[
- vlc
- firefox
- chromium
- keepassx
- ntfs3g
- at_spi2_core
- gnome3.dconf
- virtmanager
- krebspaste
- ];
services.redshift = {
enable = true;