From 22b94883629dd81d87c61695a3d54edd62458af2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Aug 2017 23:34:53 +0200 Subject: l mors.r: remove thunderbird --- lass/1systems/mors/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 2cb6a7519..5bc52d633 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -139,7 +139,6 @@ with import ; urban mk_sql_pair remmina - thunderbird iodine -- cgit v1.2.3 From c4940d5926bcd2e938b914568161f63125926369 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:36:34 +0200 Subject: l prism.r: add container for kaepsele --- lass/1systems/prism/config.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 5d05ae399..744bae551 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -298,6 +298,22 @@ in { localAddress = "10.233.2.2"; }; } + { + #kaepsele + containers.kaepsele = { + config = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + tv.pubkey + ]; + }; + enableTun = true; + privateNetwork = true; + hostAddress = "10.233.2.3"; + localAddress = "10.233.2.4"; + }; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From 619af589d108040a78e753040a857bc58b51e78e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:37:58 +0200 Subject: l iso: set networkingHostname --- lass/1systems/iso.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 0b048a2b1..be064bed2 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -37,6 +37,7 @@ with import ; }; }; boot.kernelParams = [ "copytoram" ]; + networking.hostName = "lass-iso"; } { krebs.enable = true; -- cgit v1.2.3 From 445d4f74c225dcc44846488e4d30c0b8e4e52bd9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 13:35:30 +0200 Subject: l skynet.r: don't suspend on lid close --- lass/1systems/skynet/config.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index b707f4388..0b9499982 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -44,6 +44,10 @@ with import ; krebs.build.host = config.krebs.hosts.skynet; + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; + #fileSystems = { # "/bku" = { # device = "/dev/mapper/pool-bku"; -- cgit v1.2.3 From a70fc9b95abf47aca54d39076529b3718adeb7cc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:36:04 +0200 Subject: l: mors <-> daedalus --- lass/1systems/daedalus/config.nix | 6 +++--- lass/1systems/mors/config.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 290d8a780..72a45a3d9 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -4,7 +4,7 @@ imports = [ - + @@ -29,7 +29,7 @@ }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0" ''; } diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 5bc52d633..bb6f84c7b 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -5,7 +5,7 @@ with import ; imports = [ - + @@ -104,8 +104,8 @@ with import ; }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0" ''; #TODO activationScripts seem broken, fix them! -- cgit v1.2.3 From 51cb5bb1f10aaf68499f6fbe53923959d35f039b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:37:57 +0200 Subject: l daedalus.r: add kde desktop --- lass/1systems/daedalus/config.nix | 68 ++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 8 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 72a45a3d9..36daea1d5 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -1,3 +1,4 @@ +with import ; { config, pkgs, ... }: { @@ -6,18 +7,69 @@ - - - - - - - - + { + # bubsy config + users.users.bubsy = { + uid = genid "bubsy"; + home = "/home/bubsy"; + 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.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + } + { + krebs.per-user.bitcoin.packages = [ + pkgs.electrum + ]; + users.extraUsers = { + bitcoin = { + name = "bitcoin"; + description = "user for bitcoin stuff"; + home = "/home/bitcoin"; + useDefaultShell = true; + createHome = true; + }; + }; + security.sudo.extraConfig = '' + bubsy ALL=(bitcoin) NOPASSWD: ALL + ''; + } ]; + time.timeZone = "Europe/Berlin"; + + hardware.trackpoint = { + enable = true; + sensitivity = 220; + speed = 0; + emulateWheel = true; + }; + + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; + krebs.build.host = config.krebs.hosts.daedalus; fileSystems = { -- cgit v1.2.3