From 1c4239269d2d105dbf97ef276e25d568dfbecb76 Mon Sep 17 00:00:00 2001 From: notohh Date: Sat, 27 Jan 2024 13:48:13 -0500 Subject: [PATCH] hosts: add hostnames to networking.nix --- hosts/ame/default.nix | 3 +-- hosts/ame/networking.nix | 1 + hosts/arashi/default.nix | 4 ---- hosts/arashi/networking.nix | 1 + hosts/haru/default.nix | 6 +----- hosts/haru/networking.nix | 1 + hosts/kariru/default.nix | 4 ---- hosts/kariru/networking.nix | 1 + hosts/kaze/default.nix | 4 ---- hosts/kaze/networking.nix | 1 + hosts/sakura/default.nix | 4 ---- hosts/sakura/networking.nix | 1 + hosts/sora/default.nix | 1 - hosts/sora/networking.nix | 1 + hosts/tsuki/default.nix | 11 ++--------- hosts/tsuki/networking.nix | 2 ++ hosts/tsuru/default.nix | 4 ---- hosts/tsuru/networking.nix | 1 + hosts/yuki/default.nix | 4 ---- hosts/yuki/networking.nix | 1 + 20 files changed, 15 insertions(+), 41 deletions(-) diff --git a/hosts/ame/default.nix b/hosts/ame/default.nix index bfa97eb..191f6c7 100644 --- a/hosts/ame/default.nix +++ b/hosts/ame/default.nix @@ -19,8 +19,7 @@ }; programs.hyprland.enable = true; - - networking.hostName = "ame"; + services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; diff --git a/hosts/ame/networking.nix b/hosts/ame/networking.nix index 9edddb2..9e842ea 100644 --- a/hosts/ame/networking.nix +++ b/hosts/ame/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "ame"; firewall = { enable = true; }; diff --git a/hosts/arashi/default.nix b/hosts/arashi/default.nix index b09307b..60e5ca0 100644 --- a/hosts/arashi/default.nix +++ b/hosts/arashi/default.nix @@ -19,10 +19,6 @@ "kernel.shmmax" = 100663296; }; - networking = { - hostName = "arashi"; - }; - services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/arashi/networking.nix b/hosts/arashi/networking.nix index 9edddb2..8f44c5e 100644 --- a/hosts/arashi/networking.nix +++ b/hosts/arashi/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "arashi"; firewall = { enable = true; }; diff --git a/hosts/haru/default.nix b/hosts/haru/default.nix index efedcb2..32d8208 100644 --- a/hosts/haru/default.nix +++ b/hosts/haru/default.nix @@ -14,11 +14,7 @@ useOSProber = false; }; }; - - networking = { - hostName = "haru"; - }; - + services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/haru/networking.nix b/hosts/haru/networking.nix index 9edddb2..0e762d9 100644 --- a/hosts/haru/networking.nix +++ b/hosts/haru/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "haru"; firewall = { enable = true; }; diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix index 7a4f99a..b4f397d 100644 --- a/hosts/kariru/default.nix +++ b/hosts/kariru/default.nix @@ -15,10 +15,6 @@ }; }; - networking = { - hostName = "kariru"; - }; - services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/kariru/networking.nix b/hosts/kariru/networking.nix index 9edddb2..22bd65e 100644 --- a/hosts/kariru/networking.nix +++ b/hosts/kariru/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "kariru"; firewall = { enable = true; }; diff --git a/hosts/kaze/default.nix b/hosts/kaze/default.nix index 0fa1c43..2d53712 100644 --- a/hosts/kaze/default.nix +++ b/hosts/kaze/default.nix @@ -15,10 +15,6 @@ }; }; - networking = { - hostName = "kaze"; - }; - services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/kaze/networking.nix b/hosts/kaze/networking.nix index d960506..d31330c 100644 --- a/hosts/kaze/networking.nix +++ b/hosts/kaze/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "kaze"; firewall = { enable = true; }; diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 2e1fc84..20d7c6e 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -15,10 +15,6 @@ _: { }; }; - networking = { - hostName = "sakura"; - }; - services.snowflake-proxy.enable = true; services.xserver = { diff --git a/hosts/sakura/networking.nix b/hosts/sakura/networking.nix index 9edddb2..8c3488b 100644 --- a/hosts/sakura/networking.nix +++ b/hosts/sakura/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "sakura"; firewall = { enable = true; }; diff --git a/hosts/sora/default.nix b/hosts/sora/default.nix index 7eb7bea..ce12b01 100644 --- a/hosts/sora/default.nix +++ b/hosts/sora/default.nix @@ -8,7 +8,6 @@ _: { boot.tmp.cleanOnBoot = true; zramSwap.enable = true; - networking.hostName = "sora"; users.users.notoh.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmI3hRDFjxLjrM3pE471e4jxSlcqeizh3iNVVdaMHeN sora" ]; diff --git a/hosts/sora/networking.nix b/hosts/sora/networking.nix index 8bf14b4..69b7015 100644 --- a/hosts/sora/networking.nix +++ b/hosts/sora/networking.nix @@ -1,5 +1,6 @@ {lib, ...}: { networking = { + hostName = "sora"; nameservers = [ "9.9.9.9" "149.112.112.112" diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 0ef82d2..659fc56 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -32,10 +32,6 @@ virtualisation.libvirtd.enable = true; - networking = { - hostName = "tsuki"; - }; - services = { xserver = { enable = true; @@ -75,6 +71,8 @@ }; }; + programs.gamemode.enable = true; + programs.steam = { enable = true; extraCompatPackages = [ @@ -99,10 +97,6 @@ enable = true; extraPackages = [pkgs.nvidia-vaapi-driver]; }; - opentabletdriver = { - enable = true; - daemon.enable = true; - }; }; environment.systemPackages = with pkgs; [ @@ -111,6 +105,5 @@ libvirt qemu_kvm jdk17 - comma ]; } diff --git a/hosts/tsuki/networking.nix b/hosts/tsuki/networking.nix index 9edddb2..7d09e02 100644 --- a/hosts/tsuki/networking.nix +++ b/hosts/tsuki/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "tsuki"; firewall = { enable = true; }; @@ -9,6 +10,7 @@ _: { "resolv.conf".text = '' nameserver 192.168.1.103 nameserver 9.9.9.9 + options edns0 ''; }; } diff --git a/hosts/tsuru/default.nix b/hosts/tsuru/default.nix index 3c782b6..3690a55 100644 --- a/hosts/tsuru/default.nix +++ b/hosts/tsuru/default.nix @@ -15,10 +15,6 @@ }; }; - networking = { - hostName = "tsuru"; - }; - services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/tsuru/networking.nix b/hosts/tsuru/networking.nix index 9edddb2..b2ddf7d 100644 --- a/hosts/tsuru/networking.nix +++ b/hosts/tsuru/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "tsuru"; firewall = { enable = true; }; diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix index 0ff26f2..1569364 100644 --- a/hosts/yuki/default.nix +++ b/hosts/yuki/default.nix @@ -15,10 +15,6 @@ }; }; - networking = { - hostName = "yuki"; - }; - services.xserver = { layout = "us"; xkbVariant = ""; diff --git a/hosts/yuki/networking.nix b/hosts/yuki/networking.nix index 9edddb2..b26bddb 100644 --- a/hosts/yuki/networking.nix +++ b/hosts/yuki/networking.nix @@ -1,6 +1,7 @@ _: { networking = { networkmanager.enable = true; + hostName = "yuki"; firewall = { enable = true; };