From 0c15f3b6a7a216eec1fb1ba368da5c3ea4b43c5e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 23 Oct 2021 16:12:58 +0200 Subject: l: disable tmpfs on /tmp --- lass/2configs/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index eb38d0e9..1bcfb162 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -89,8 +89,6 @@ with import ; services.timesyncd.enable = mkForce true; - boot.tmpOnTmpfs = true; - # multiple-definition-problem when defining environment.variables.EDITOR environment.extraInit = '' EDITOR=vim -- cgit v1.2.3 From 0442dacdb75099c639191521f926d349aea16a45 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Oct 2021 16:23:03 +0200 Subject: l: deprecate mors key --- lass/2configs/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 1bcfb162..5a942832 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -19,10 +19,9 @@ with import ; users.extraUsers = { root = { openssh.authorizedKeys.keys = [ - config.krebs.users.lass-mors.pubkey + config.krebs.users.lass.pubkey config.krebs.users.lass-blue.pubkey config.krebs.users.lass-green.pubkey - config.krebs.users.lass-yubikey.pubkey ]; }; mainUser = { @@ -35,25 +34,17 @@ with import ; isNormalUser = true; extraGroups = [ "audio" + "video" "fuse" "wheel" ]; openssh.authorizedKeys.keys = [ - config.krebs.users.lass-mors.pubkey + config.krebs.users.lass.pubkey config.krebs.users.lass-blue.pubkey config.krebs.users.lass-green.pubkey - config.krebs.users.lass-yubikey.pubkey - ]; - }; - nix = { - isNormalUser = true; - uid = genid_uint31 "nix"; - openssh.authorizedKeys.keys = [ - config.krebs.hosts.mors.ssh.pubkey ]; }; }; - nix.trustedUsers = ["nix"]; } { environment.variables = { -- cgit v1.2.3 From e99594d695e905eddc658fdd1b36c5e9efd578c8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Oct 2021 16:25:40 +0200 Subject: l: use python3 for sshuttle --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 5a942832..bfade92c 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -61,7 +61,7 @@ with import ; { #for sshuttle environment.systemPackages = [ - pkgs.pythonPackages.python + pkgs.python3Packages.python ]; } ]; -- cgit v1.2.3 From 693af05562003ba154accba30b989615fe13e68d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Oct 2021 16:26:05 +0200 Subject: l: add some pkgs --- lass/2configs/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index bfade92c..c4cedc08 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -91,6 +91,7 @@ with import ; #stockholm deploy git + git-preview gnumake jq @@ -115,6 +116,7 @@ with import ; file hashPassword kpaste + cyberlocker-tools pciutils pop q -- cgit v1.2.3 From e3740cb6b4ae61c7bbbc151fedb9e5aa8edd1acd Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Oct 2021 16:26:22 +0200 Subject: l: make journald storage persistent --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index c4cedc08..f3eb774c 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -178,6 +178,7 @@ with import ; services.journald.extraConfig = '' SystemMaxUse=1G RuntimeMaxUse=128M + Storage=persistent ''; krebs.iptables = { -- cgit v1.2.3 From 12046d150162bf1c111a0ea858cd67a5017221e6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Oct 2021 16:26:30 +0200 Subject: l: set default timezone --- lass/2configs/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index f3eb774c..91922e5c 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -217,5 +217,7 @@ with import ; # use 24:00 time format, the default got sneakily changed around 20.03 i18n.defaultLocale = mkDefault "C.UTF-8"; + time.timeZone = mkDefault"Europe/Berlin"; + system.stateVersion = mkDefault "20.03"; } -- cgit v1.2.3 From 0c32c00f0be6d95e191e80dc078f7aaa98e38419 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 14 Nov 2021 09:35:47 +0100 Subject: l: enable documentation for all modules --- lass/2configs/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 91922e5c..c3fbc209 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -215,6 +215,8 @@ with import ; noipv4ll ''; + documentation.nixos.includeAllModules = true; + # use 24:00 time format, the default got sneakily changed around 20.03 i18n.defaultLocale = mkDefault "C.UTF-8"; time.timeZone = mkDefault"Europe/Berlin"; -- cgit v1.2.3