From f3d9d61e8012be39e340ada05d6d12068c018c65 Mon Sep 17 00:00:00 2001 From: kat witch Date: Thu, 2 Sep 2021 06:16:26 +0100 Subject: [PATCH] hosts/daiyousei: actually init --- README.md | 40 ++++++++++++++++++-------------- config/hosts/daiyousei/nixos.nix | 8 +++---- nix/sources.json | 6 ++--- overlays/exprs | 2 +- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 330da5a9..f92cbbb2 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,15 @@ These are the NixOS configurations for my systems. I run nothing other than NixO ## Nodes -| Node | Purpose | -|---------------|------------------------------------------------------| -| [athame][] | Currently the main server. Ad-hoc hetzner cloud box. | -| [rinnosuke][] | My primary nameserver. Provisioned OCI EPYC box. | -| [beltane][] | Home server. NAS + HTPC, does DVB stuff. | -| [samhain][] | Beloved workstation. Does VFIO. | -| [yule][] | Main laptop. | -| [ostara][] | CCTV netbook. | +| Node | Purpose | +|---------------|----------------------------------------------------------| +| [athame][] | Currently the main server. Ad-hoc hetzner cloud box. | +| [daiyousei][] | Intended athame replacement. Provisioned OCI Ampere box. | +| [rinnosuke][] | My primary nameserver. Provisioned OCI EPYC box. | +| [beltane][] | Home server. NAS + HTPC, does DVB stuff. | +| [samhain][] | Beloved workstation. Does VFIO. | +| [yule][] | Main laptop. | +| [ostara][] | CCTV netbook. | ## Profiles @@ -74,19 +75,20 @@ These are the NixOS configurations for my systems. I run nothing other than NixO | [base][] | Base profile, always used. Root access, base16, home-manager, locale, network module, nix, packages, profiles, secrets, shell and sysctl configuration. | | [gui][] | GUI profile. Provides window managers, includes [DNSCrypt/dnscrypt-proxy][] service, filesystem packages, font, NixOS-side GPG, mingetty, NFS, QT, sound (pipewire) and XDG portal configuration. | | [vfio][] | Provides host-unspecific VFIO. Fancy patched QEMU from [arcnmx/nixexprs][], [arcnmx/screenstub][] (however, patched in-repo for Q35), AMDGPU vendor-reset and ACS override. | -| [hardware][] | Sub-profiles for my hardware are provided here. Some are reusable. | +| [hardware][] | Sub-profiles for my hardware are provided here. Some are reusable. Of note is the Oracle sub-profiles. | +| [cross][] | Sub-profiles are provided for emulated compiling and build caching. | ## User Profiles -| Profile | Purpose | -|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------| -| [base][3] | base16, git, inputrc, packages, rink, secrets, kitty terminfo, SSH, tmux, weechat, vim, xdg and zsh configuration. | -| [dev][] | cookiecutters, doom-emacs (although unused, forced to use PgtkGcc all fancily :3c), packages, rustfmt and (heavier on the node) vim configuration. | -| [gui][4] | firefox+userChrome+tst, font, kitty terminal, [dnkl/foot][] terminal, GTK, packages, QT, ranger and xdg configuration. | -| [media][] | mpv, obs, packages and syncplay configuration. | -| [personal][] | [arcnmx/rbw][] (fancier rbw), email via [arcnmx/notmuch-vim][], home-manager-side GPG, pass, weechat and zsh configuration. | -| [services][5] | User services. weechat and mpd are provided. | -| [sway][] | sway, i3gopher, swayidle, swaylock-effects, screenshot tool, [kittywitch/konawall-rs][], mako, wofi, waybar and xkb (custom layout o:) configuration. | +| Profile | Purpose | +|---------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| +| [base][3] | base16, git, inputrc, packages, secrets, kitty terminfo, SSH, tmux, weechat, vim, xdg and zsh configuration. | +| [dev][] | cookiecutters, rink, doom-emacs (although unused, forced to use PgtkGcc all fancily :3c), packages, rustfmt and (heavier on the node) vim configuration. | +| [gui][4] | firefox+userChrome+tst, font, kitty terminal, [dnkl/foot][] terminal, GTK, packages, QT, ranger and xdg configuration. | +| [media][] | mpv, obs, packages and syncplay configuration. | +| [personal][] | [arcnmx/rbw][] (fancier rbw), email via [arcnmx/notmuch-vim][], home-manager-side GPG, pass, weechat and zsh configuration. | +| [services][5] | User services. weechat and mpd are provided. | +| [sway][] | sway, i3gopher, swayidle, swaylock-effects, screenshot tool, [kittywitch/konawall-rs][], mako, wofi, waybar and xkb (custom layout o:) configuration. | ## Services @@ -207,6 +209,7 @@ Please use `nix-shell` or [direnv/direnv][]. The shell is not compatible with [n [kittywitch/anicca]: https://github.com/kittywitch/anicca [arcnmx/screenstub]: https://github.com/arcnmx/screenstub [athame]: config/hosts/athame + [daiyousei]: config/hosts/daiyousei [rinnosuke]: config/hosts/rinnosuke [beltane]: config/hosts/beltane [samhain]: config/hosts/samhain @@ -218,6 +221,7 @@ Please use `nix-shell` or [direnv/direnv][]. The shell is not compatible with [n [vfio]: config/profiles/vfio [arcnmx/nixexprs]: https://github.com/arcnmx/nixexprs [hardware]: config/profiles/hardware + [cross]: config/profiles/cross [3]: config/users/kat/base [dev]: config/users/kat/dev [4]: config/users/kat/gui diff --git a/config/hosts/daiyousei/nixos.nix b/config/hosts/daiyousei/nixos.nix index c05235bc..b2d85965 100644 --- a/config/hosts/daiyousei/nixos.nix +++ b/config/hosts/daiyousei/nixos.nix @@ -45,11 +45,11 @@ in networking = { useDHCP = false; - interfaces.ens3 = { + interfaces.enp0s3 = { useDHCP = true; ipv6 = { - addresses = mkIf (config.network.addresses.public.nixos.ipv6.enable) [{ - address = config.network.addresses.public.nixos.ipv6.address; + addresses = [{ + address = addr_ipv6_nix; prefixLength = 64; }]; routes = [{ @@ -69,7 +69,7 @@ in tf.ipv6.address = tf.resources."${config.networking.hostName}_ipv6".refAttr "ip_address"; }; }; - firewall.public.interfaces = singleton "ens3"; + firewall.public.interfaces = singleton "enp0s3"; tf = { enable = true; ipv4_attr = "public_ip"; diff --git a/nix/sources.json b/nix/sources.json index de77738a..b75275ed 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -89,10 +89,10 @@ "homepage": null, "owner": "kittywitch", "repo": "nixexprs", - "rev": "fb4a435201384c6a45b593d47bc72b4998ffe78d", - "sha256": "07r2n6xx6l4pbrqdda42amxdq9d9nqg8pnkqbimfhssakpnkv2ml", + "rev": "68a371ce344cd66e646d58dd3658fc7c0615f768", + "sha256": "12afawrnfkj8i33h3rvqfx3mla8sjvmjmk9f786xi60ckbnqi089", "type": "tarball", - "url": "https://github.com/kittywitch/nixexprs/archive/fb4a435201384c6a45b593d47bc72b4998ffe78d.tar.gz", + "url": "https://github.com/kittywitch/nixexprs/archive/68a371ce344cd66e646d58dd3658fc7c0615f768.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { diff --git a/overlays/exprs b/overlays/exprs index fb4a4352..68a371ce 160000 --- a/overlays/exprs +++ b/overlays/exprs @@ -1 +1 @@ -Subproject commit fb4a435201384c6a45b593d47bc72b4998ffe78d +Subproject commit 68a371ce344cd66e646d58dd3658fc7c0615f768