From 2e1655a89050a503ba84455b5f9580791c446afa Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 6 Feb 2024 10:47:23 -0500 Subject: [PATCH] hosts: update xkb & fmt --- hosts/ame/default.nix | 6 ++++-- hosts/arashi/default.nix | 17 +++++++---------- hosts/haru/default.nix | 17 +++++++---------- hosts/kariru/default.nix | 17 +++++++---------- hosts/kaze/default.nix | 17 +++++++---------- hosts/sakura/default.nix | 17 +++++++---------- hosts/sora/default.nix | 15 ++++++++------- hosts/sora/hardware.nix | 2 ++ hosts/tsuki/default.nix | 18 ++++-------------- hosts/tsuru/default.nix | 17 +++++++---------- hosts/yuki/default.nix | 17 +++++++---------- 11 files changed, 67 insertions(+), 93 deletions(-) diff --git a/hosts/ame/default.nix b/hosts/ame/default.nix index acd7918..a77443a 100644 --- a/hosts/ame/default.nix +++ b/hosts/ame/default.nix @@ -19,8 +19,10 @@ xserver = { enable = true; displayManager.sddm.enable = true; - layout = "us"; - xkbVariant = ""; + xkb = { + layout = "us"; + variant = ""; + }; }; }; diff --git a/hosts/arashi/default.nix b/hosts/arashi/default.nix index de37b1a..0ceef1f 100644 --- a/hosts/arashi/default.nix +++ b/hosts/arashi/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWRbIwwHuyEOLhA9dKTf4TgFqtPR5MNcJorKm731S7G arashi" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWRbIwwHuyEOLhA9dKTf4TgFqtPR5MNcJorKm731S7G arashi" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/haru/default.nix b/hosts/haru/default.nix index 19d4041..c7f3ef6 100644 --- a/hosts/haru/default.nix +++ b/hosts/haru/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdSO5g6IZQUzeH0Xf7hEVjKZ4cAWn/DjN+GQ2Ujd+qD haru" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdSO5g6IZQUzeH0Xf7hEVjKZ4cAWn/DjN+GQ2Ujd+qD haru" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix index 0249bce..2afeffc 100644 --- a/hosts/kariru/default.nix +++ b/hosts/kariru/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmWafzbhah18nm2z1epc6139XVlcKT0ndAI0wbLj+/6 kariru" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmWafzbhah18nm2z1epc6139XVlcKT0ndAI0wbLj+/6 kariru" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/kaze/default.nix b/hosts/kaze/default.nix index 27287e2..17ec406 100644 --- a/hosts/kaze/default.nix +++ b/hosts/kaze/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4qfqJNxwNg9ryeT/XbjfQyuDKbBAwRn2Lzq3Iq5kA7 kaze" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4qfqJNxwNg9ryeT/XbjfQyuDKbBAwRn2Lzq3Iq5kA7 kaze" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index ec403c0..e0b2937 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -8,15 +8,12 @@ _: { services.snowflake-proxy.enable = true; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqAjaV2D2J8ln4n39ZvszCF5Jql+0IaSpFCJlzDSLv6 sakura" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqAjaV2D2J8ln4n39ZvszCF5Jql+0IaSpFCJlzDSLv6 sakura" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/sora/default.nix b/hosts/sora/default.nix index 8d390b3..1fe3b24 100644 --- a/hosts/sora/default.nix +++ b/hosts/sora/default.nix @@ -8,11 +8,12 @@ _: { services.snowflake-proxy.enable = true; - zramSwap.enable = true; - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmI3hRDFjxLjrM3pE471e4jxSlcqeizh3iNVVdaMHeN sora" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmI3hRDFjxLjrM3pE471e4jxSlcqeizh3iNVVdaMHeN sora" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; + }; } diff --git a/hosts/sora/hardware.nix b/hosts/sora/hardware.nix index 6b35803..018c1f0 100644 --- a/hosts/sora/hardware.nix +++ b/hosts/sora/hardware.nix @@ -1,6 +1,8 @@ {modulesPath, ...}: { imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + zramSwap.enable = true; + boot = { tmp.cleanOnBoot = true; loader.grub = { diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 9807be9..a8578da 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -35,20 +35,10 @@ xserver = { enable = true; videoDrivers = ["nvidia"]; - layout = "us"; - xkbVariant = ""; - }; - udev = { - extraRules = '' - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" - ''; + xkb = { + layout = "us"; + variant = ""; + }; }; }; diff --git a/hosts/tsuru/default.nix b/hosts/tsuru/default.nix index c737bfa..72b2b65 100644 --- a/hosts/tsuru/default.nix +++ b/hosts/tsuru/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKwby2FLCKFZZlOLDRhsm9GckyYAuyk0mq28jRD02tdv tsuru" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKwby2FLCKFZZlOLDRhsm9GckyYAuyk0mq28jRD02tdv tsuru" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; } diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix index 2f50a71..a1505c7 100644 --- a/hosts/yuki/default.nix +++ b/hosts/yuki/default.nix @@ -6,15 +6,12 @@ ../../modules ]; - services.xserver = { - layout = "us"; - xkbVariant = ""; + users = { + users.notoh.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINoLDqOjZIQQ+YYir9MQnlh8wgqI1dz5nYL054OnIgDa yuki" + ]; + users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" + ]; }; - - users.users.notoh.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINoLDqOjZIQQ+YYir9MQnlh8wgqI1dz5nYL054OnIgDa yuki" - ]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo" - ]; }