From c575f32d56b53ecbc1bcf28342f4eff683b7818c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 00:32:28 +0200 Subject: l exim: add paypal@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index fe3aa20b..e4a8fd86 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -36,6 +36,7 @@ with import ; { 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"; } -- cgit v1.2.3 From 4b21495fc773f7d7fd4c30e917cd805bdd46751e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 01:04:29 +0200 Subject: l: add host skynet --- lass/1systems/skynet/config.nix | 58 +++++++++++++++++++++++++++++++++++++++++ lass/1systems/skynet/source.nix | 4 +++ 2 files changed, 62 insertions(+) create mode 100644 lass/1systems/skynet/config.nix create mode 100644 lass/1systems/skynet/source.nix (limited to 'lass') diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix new file mode 100644 index 00000000..6fa03c4a --- /dev/null +++ b/lass/1systems/skynet/config.nix @@ -0,0 +1,58 @@ +{ config, pkgs, ... }: +with import ; +{ + imports = [ + + + + + + # + + + { + # locke 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; + 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 00000000..2aa627f5 --- /dev/null +++ b/lass/1systems/skynet/source.nix @@ -0,0 +1,4 @@ +import { + name = "skynet"; + secure = true; +} -- cgit v1.2.3 From 45b28e97b46e228abbca7bbbb9f5f4d4e52a906e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 01:05:08 +0200 Subject: l iso: add hashPassword to pkgs --- lass/1systems/iso.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 4431a702..0b048a2b 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -88,6 +88,7 @@ with import ; aria2 #neat utils + hashPassword krebspaste pciutils pop -- cgit v1.2.3 From 98ab822ac42bb87cb7df59e0ce1a30635e2f5d49 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 29 Jul 2017 02:20:37 +0200 Subject: l skynet: force networking.wireless off --- lass/1systems/skynet/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index 6fa03c4a..a48df02b 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -11,7 +11,7 @@ with import ; { - # locke config + # discordius config services.xserver.enable = true; users.users.discordius = { uid = genid "discordius"; @@ -25,6 +25,7 @@ with import ; useDefaultShell = true; }; networking.networkmanager.enable = true; + networking.wireless.enable = mkForce false; hardware.pulseaudio = { enable = true; systemWide = true; -- cgit v1.2.3 From ecff8bc0d3b82b3fc9f74c9193637da0c2743a9b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Jul 2017 17:09:48 +0200 Subject: l nixpkgs: d486531 -> a732dcf --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/source.nix b/lass/source.nix index 63adbd95..1d64e305 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"; }; } -- cgit v1.2.3 From cb817eadd591eb5b777df1b879fd0bf34a4c36cc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 31 Jul 2017 13:47:39 +0200 Subject: l: add some new mail addresses --- lass/2configs/exim-smarthost.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index e4a8fd86..a43dfa21 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -37,6 +37,8 @@ with import ; { from = "nix@lassul.us"; to = lass.mail; } { from = "c-base@lassul.us"; to = lass.mail; } { from = "paypal@lassul.us"; to = lass.mail; } + { from = "patreon@lassul.us"; to = lass.mail; } + { from = "steam@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 189ad95fe2e61ca3216eb292a50d939ebdb60cd9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 31 Jul 2017 13:48:26 +0200 Subject: l mail: move MLs to extra folder --- lass/2configs/mail.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 9f5e3d52..fe82fea5 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -65,8 +65,15 @@ let ''} %r |" virtual-mailboxes \ - "INBOX" "notmuch://?query=tag:inbox and NOT tag:killed"\ + "INBOX" "notmuch://?query=tag:inbox \ + and NOT tag:killed \ + and NOT to:shackspace \ + and NOT to:c-base \ + and NOT to:nix-devel"\ "Unread" "notmuch://?query=tag:unread"\ + "shack" "notmuch://?query=to:shackspace"\ + "c-base" "notmuch://?query=to:c-base"\ + "nix" "notmuch://?query=to:nix-devel"\ "TODO" "notmuch://?query=tag:TODO"\ "Starred" "notmuch://?query=tag:*"\ "Archive" "notmuch://?query=tag:archive"\ -- cgit v1.2.3 From 47abe1c1a28eda6d8bb90d49356ded7e0341f1ea Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 31 Jul 2017 13:49:43 +0200 Subject: l domsen: add bruno --- lass/2configs/websites/domsen.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lass') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 3e1ad663..b0e5375c 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -125,6 +125,7 @@ in { { from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; } { from = "dma@ubikmedia.de"; to = "domsen"; } { from = "dma@ubikmedia.eu"; to = "domsen"; } + { from = "bruno@apanowicz.de"; to = "bruno"; } { from = "mail@jla-trading.com"; to = "jla-trading"; } { from = "jms@ubikmedia.eu"; to = "jms"; } { from = "ms@ubikmedia.eu"; to = "ms"; } @@ -151,6 +152,13 @@ in { createHome = true; }; + users.users.bruno = { + uid = genid_signed "bruno"; + home = "/home/bruno"; + useDefaultShell = true; + createHome = true; + }; + users.users.jla-trading = { uid = genid_signed "jla-trading"; home = "/home/jla-trading"; -- cgit v1.2.3