From 34bd7970b2dccc0bd9752aeca0dc8b97d7355e0a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 30 Aug 2023 23:00:30 -0500 Subject: [PATCH] Beefnix --- os/linux/nix/flake.nix | 42 +++++++++++++++++++++--------- os/linux/nix/machines/beefcake.nix | 3 +++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/os/linux/nix/flake.nix b/os/linux/nix/flake.nix index df7d145..c46b244 100644 --- a/os/linux/nix/flake.nix +++ b/os/linux/nix/flake.nix @@ -37,22 +37,40 @@ }; outputs = inputs: { + homeConfigurations = + let + system = "x86_64-linux"; + pkgs = inputs.nixpkgs.legacyPackages.${system}; + in + { + daniel = inputs.home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + (import + ./daniel.nix + + pkgs) + ]; + }; + }; nixosConfigurations = { beefcake = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - modules = let - ald = inputs.api-lyte-dev; - nomod = builtins.trace "hey" ald.nixosModules; - in [ - ./machines/beefcake.nix - inputs.home-manager.nixosModules.home-manager - inputs.sops-nix.nixosModules.sops - nomod.x86_64-linux.api-lyte-dev - { - home-manager.useGlobalPkgs = true; - } - ]; + modules = + let + ald = inputs.api-lyte-dev; + nomod = builtins.trace "hey" ald.nixosModules; + in + [ + ./machines/beefcake.nix + inputs.home-manager.nixosModules.home-manager + inputs.sops-nix.nixosModules.sops + nomod.x86_64-linux.api-lyte-dev + { + home-manager.useGlobalPkgs = true; + } + ]; }; thinker = inputs.nixpkgs.lib.nixosSystem { diff --git a/os/linux/nix/machines/beefcake.nix b/os/linux/nix/machines/beefcake.nix index f467888..20510c7 100644 --- a/os/linux/nix/machines/beefcake.nix +++ b/os/linux/nix/machines/beefcake.nix @@ -589,6 +589,9 @@ checkReversePath = "loose"; # needed for tailscale? }; + boot.kernel.sysctl."net.ipv4.ip_forward" = 1; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; + # TODO: should I upgrade this? # This value determines the NixOS release from which the default