summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/iso.nix1
-rw-r--r--lass/1systems/skynet/config.nix59
-rw-r--r--lass/1systems/skynet/source.nix4
-rw-r--r--lass/2configs/exim-smarthost.nix1
-rw-r--r--lass/source.nix2
5 files changed, 66 insertions, 1 deletions
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 4431a702c..0b048a2b1 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -88,6 +88,7 @@ with import <stockholm/lib>;
aria2
#neat utils
+ hashPassword
krebspaste
pciutils
pop
diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
new file mode 100644
index 000000000..a48df02b9
--- /dev/null
+++ b/lass/1systems/skynet/config.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+{
+ imports = [
+ <stockholm/lass>
+ <stockholm/lass/2configs/hw/x220.nix>
+ <stockholm/lass/2configs/boot/stock-x220.nix>
+
+ <stockholm/lass/2configs/retiolum.nix>
+ #<stockholm/lass/2configs/exim-retiolum.nix>
+ <stockholm/lass/2configs/fetchWallpaper.nix>
+ <stockholm/lass/2configs/backups.nix>
+ {
+ # discordius config
+ services.xserver.enable = true;
+ users.users.discordius = {
+ uid = genid "discordius";
+ home = "/home/discordius";
+ group = "users";
+ createHome = true;
+ extraGroups = [
+ "audio"
+ "networkmanager"
+ ];
+ useDefaultShell = true;
+ };
+ networking.networkmanager.enable = true;
+ networking.wireless.enable = mkForce false;
+ hardware.pulseaudio = {
+ enable = true;
+ systemWide = true;
+ };
+ environment.systemPackages = with pkgs; [
+ pavucontrol
+ firefox
+ hexchat
+ networkmanagerapplet
+ ];
+ services.xserver.desktopManager.gnome3 = {
+ enable = true;
+ };
+ }
+ ];
+
+ krebs.build.host = config.krebs.hosts.daedalus;
+
+ #fileSystems = {
+ # "/bku" = {
+ # device = "/dev/mapper/pool-bku";
+ # fsType = "btrfs";
+ # options = ["defaults" "noatime" "ssd" "compress=lzo"];
+ # };
+ #};
+
+ services.udev.extraRules = ''
+ SUBSYSTEM=="net", ATTR{address}=="10:0b:a9:a6:44:04", NAME="wl0"
+ SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:d1:90:fc", NAME="et0"
+ '';
+}
diff --git a/lass/1systems/skynet/source.nix b/lass/1systems/skynet/source.nix
new file mode 100644
index 000000000..2aa627f5c
--- /dev/null
+++ b/lass/1systems/skynet/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/lass/source.nix> {
+ name = "skynet";
+ secure = true;
+}
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index fe3aa20bf..e4a8fd861 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -36,6 +36,7 @@ with import <stockholm/lib>;
{ from = "shack@lassul.us"; to = lass.mail; }
{ from = "nix@lassul.us"; to = lass.mail; }
{ from = "c-base@lassul.us"; to = lass.mail; }
+ { from = "paypal@lassul.us"; to = lass.mail; }
];
system-aliases = [
{ from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/source.nix b/lass/source.nix
index 63adbd95c..1d64e3059 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -19,6 +19,6 @@ in
# 87a4615 & 334ac4f
# + acme permissions for groups
# fd7a8f1
- ref = "d486531";
+ ref = "a732dcf";
};
}