summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/omo.nix21
-rw-r--r--makefu/1systems/pornocauster.nix4
-rw-r--r--makefu/1systems/wry.nix4
-rw-r--r--makefu/2configs/default.nix9
-rw-r--r--makefu/2configs/deployment/mycube.connector.one.nix2
-rw-r--r--makefu/2configs/git/brain-retiolum.nix1
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix2
-rw-r--r--makefu/2configs/iodined.nix4
-rw-r--r--makefu/2configs/laptop-utils.nix65
-rw-r--r--makefu/2configs/mail-client.nix8
-rw-r--r--makefu/2configs/main-laptop.nix12
-rw-r--r--makefu/3modules/snapraid.nix2
-rw-r--r--makefu/5pkgs/default.nix3
-rw-r--r--makefu/5pkgs/mycube-flask/default.nix2
-rw-r--r--makefu/5pkgs/nodemcu-uploader/default.nix22
15 files changed, 126 insertions, 35 deletions
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 6cff35e9d..e6a1434ab 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -12,11 +12,25 @@ let
# cryptsetup luksAddKey $dev tmpkey
# cryptsetup luksOpen $dev crypt0
# mkfs.xfs /dev/mapper/crypt0 -L crypt0
+
+ # omo Chassis:
+ # __FRONT_
+ # |* d2 |
+ # | |
+ # |* d3 |
+ # | |
+ # |* d0 |
+ # | |
+ # |* d1 |
+ # |* |
+ # | * r0 |
+ # |_______|
cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6";
cryptDisk1 = byid "ata-TP02000GB_TPW151006050068";
- cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487";
+ # cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487";
+ cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
# all physical disks
- allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ];
+ allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ];
in {
imports =
[
@@ -40,7 +54,6 @@ in {
networking.firewall.allowedTCPPorts = [ 80 655 8080 ];
# services.openssh.allowSFTP = false;
- krebs.build.source.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
# copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
services.sabnzbd.enable = true;
@@ -86,7 +99,7 @@ in {
(usbkey "home" homePartition)
(usbkey "crypt0" cryptDisk0)
(usbkey "crypt1" cryptDisk1)
- (usbkey "crypt2" cryptDisk2)
+ (usbkey "crypt2" cryptDisk3)
];
};
loader.grub.device = rootDisk;
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/1systems/wry.nix b/makefu/1systems/wry.nix
index 747321968..462ec4faf 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -11,7 +11,6 @@ in {
# TODO: copy this config or move to krebs
../../tv/2configs/hw/CAC.nix
../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
- ../2configs/unstable-sources.nix
../2configs/headless.nix
../2configs/tinc-basic-retiolum.nix
@@ -28,7 +27,8 @@ in {
# collectd
../2configs/collectd/collectd-base.nix
];
-
+ services.nixosManual.enable = false;
+ programs.man.enable = false;
krebs.build.host = config.krebs.hosts.wry;
krebs.Reaktor = {
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 3043a1af3..313ccbec7 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -4,13 +4,6 @@ with config.krebs.lib;
{
system.stateVersion = "15.09";
- system.replaceRuntimeDependencies = with pkgs.lib;
- [{original = pkgs.glibc; replacement = pkgs.stdenv.lib.overrideDerivation pkgs.glibc (oldAttr: { patches = oldAttr.patches ++
- [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/glibc/cve-2015-7547.patch";
- sha256 = "0awpc4rp2x27rjpj83ps0rclmn73hsgfv2xxk18k82w4hdxqpp5r";})];
- });}
- ];
-
imports = [
{
users.extraUsers =
@@ -29,7 +22,7 @@ with config.krebs.lib;
source = mapAttrs (_: mkDefault) {
nixpkgs = {
url = https://github.com/nixos/nixpkgs;
- rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # unstable @ 2015-01-27, tested on wry
+ rev = "40c586b7ce2c559374df435f46d673baf711c543"; # unstable @ 2016-02-27, tested on wry
};
secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
stockholm = "/home/makefu/stockholm";
diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix
index 38fc4a243..125b3dfff 100644
--- a/makefu/2configs/deployment/mycube.connector.one.nix
+++ b/makefu/2configs/deployment/mycube.connector.one.nix
@@ -16,7 +16,7 @@ in {
vassals = {
mycube-flask = {
type = "normal";
- python2Packages = self: with self; [ pkgs.mycube-flask flask redis werkzeug jinja2 markupsafe itsdangerous ];
+ pythonPackages = self: with self; [ pkgs.mycube-flask ];
socket = wsgi-sock;
};
};
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/iodined.nix b/makefu/2configs/iodined.nix
index db8a1bfed..2e69d167c 100644
--- a/makefu/2configs/iodined.nix
+++ b/makefu/2configs/iodined.nix
@@ -1,4 +1,4 @@
-{ services,builtins,environment,pkgs, ... }:
+{ pkgs, config, ... }:
let
# TODO: make this a parameter
@@ -10,7 +10,7 @@ in {
enable = true;
domain = domain;
ip = "172.16.10.1/24";
- extraConfig = "-P ${pw}";
+ extraConfig = "-P ${pw} -l ${pkgs.lib.head config.krebs.build.host.nets.internet.addrs4}";
};
}
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
new file mode 100644
index 000000000..815ff7489
--- /dev/null
+++ b/makefu/2configs/laptop-utils.nix
@@ -0,0 +1,65 @@
+{ 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
+{
+ nixpkgs.config.firefox = {
+ enableAdobeFlash = true;
+ };
+
+ krebs.per-user.makefu.packages = with pkgs; [
+ # core
+ at_spi2_core
+ acpi
+ bc
+ exif
+ file
+ ntfs3g
+ pv
+ proot
+ sshpass
+ unzip
+ unrar
+ usbutils
+ zip
+
+ # dev
+ python35Packages.virtualenv
+
+
+ # gui
+ chromium
+ clipit
+ feh
+ firefox
+ keepassx
+ pcmanfm
+ skype
+ mirage
+ tightvnc
+ gnome3.dconf
+ vlc
+ virtmanager
+ wireshark
+ xdotool
+
+ # sectools
+ aria2
+ binwalk
+ dnsmasq
+ iodine
+ mtr
+ nmap
+
+
+ # stuff
+ cac-api
+ cac-panel
+ krebspaste
+ ledger
+ pass
+ ];
+}
diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix
index 913cbf25b..793daa6f8 100644
--- a/makefu/2configs/mail-client.nix
+++ b/makefu/2configs/mail-client.nix
@@ -3,12 +3,14 @@
with config.krebs.lib;
{
environment.systemPackages = with pkgs; [
+ abook
+ gnupg
+ imapfilter
msmtp
mutt-kz
notmuch
offlineimap
- imapfilter
- gnupg
+ openssl
+ w3m
];
-
}
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;
diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix
index 3d458bbbf..acdeb46d8 100644
--- a/makefu/3modules/snapraid.nix
+++ b/makefu/3modules/snapraid.nix
@@ -35,7 +35,7 @@ let
enable = mkEnableOption "snapraid";
timerConfig = mkOption {
- type = types.unspecified;
+ type = with types;attrsOf str;
description = ''
Start snapraid service
'';
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 33e280f0e..8caab433e 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -9,7 +9,8 @@ in
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
awesomecfg = callPackage ./awesomecfg {};
- tw-upload-plugin = callPackage ./tw-upload-plugin {};
+ nodemcu-uploader = callPackage ./nodemcu-uploader {};
mycube-flask = callPackage ./mycube-flask {};
+ tw-upload-plugin = callPackage ./tw-upload-plugin {};
};
}
diff --git a/makefu/5pkgs/mycube-flask/default.nix b/makefu/5pkgs/mycube-flask/default.nix
index d01abbbd4..5bf85a66a 100644
--- a/makefu/5pkgs/mycube-flask/default.nix
+++ b/makefu/5pkgs/mycube-flask/default.nix
@@ -2,7 +2,7 @@
with pkgs.pythonPackages;buildPythonPackage rec {
name = "mycube-flask-${version}";
- version = "0.2.3";
+ version = "0.2.3.4";
propagatedBuildInputs = [
flask
redis
diff --git a/makefu/5pkgs/nodemcu-uploader/default.nix b/makefu/5pkgs/nodemcu-uploader/default.nix
new file mode 100644
index 000000000..64476be6e
--- /dev/null
+++ b/makefu/5pkgs/nodemcu-uploader/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, pythonPackages, fetchurl, ... }:
+
+with pythonPackages; buildPythonPackage rec {
+ name = "nodemcu-uploader-${version}";
+ version = "0.2.2";
+ disabled = isPy3k || isPyPy;
+ propagatedBuildInputs = [
+ pyserial
+ ];
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/n/nodemcu-uploader/nodemcu-uploader-${version}.tar.gz";
+ sha256 = "090giz84y9y3idgifp0yh80qqyv2czv6h3y55wyrlgf7qfbwbrvn";
+ };
+ # ImportError: No module named tests
+ # not sure what to do here
+ doCheck = false;
+ meta = {
+ homepage = https://github.com/kmpm/nodemcu-uploader;
+ description = "tool for uploading files to NodeMCU filesystem";
+ license = lib.licenses.mit;
+ };
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:33:55 +0000