diff --git a/flakes/common/readme.md b/flakes/common/readme.md index 38def10..0c0c2d8 100644 --- a/flakes/common/readme.md +++ b/flakes/common/readme.md @@ -1,42 +1,3 @@ -required settings? - -- nixpkgs and home manager flake inputs - -```nix -# Required system information -system.stateVersion = "ORIGINAL VALUE" -networking.hostName = "system_name"; - -# Where this config lives for this machine -programs.nh.flake = "/home/josh/.config/nixos-config/hosts/${config.networking.hostName}"; - -# Optionally allow unfree software -nixpkgs.config.allowUnfree = true; - -users.users = { - josh = { - isNormalUser = true; - initialPassword = "password1"; - extraGroups = [ "wheel" "networkmanager" "video" "input" ]; - openssh.authorizedKeys.keys = [ "replace" ]; - }; -}; - -# Home manager only below this line (optional) -security.polkit.enable = true; -home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - backupFileExtension = "bak"; - sharedModules = [ - ({}: { - home.stateVersion = "MATCH_HM_VERSION_AS_INPUT"; - programs.home-manager.enable = true; - }) - ]; -}; -``` - # TODO add somewhere ```nix @@ -51,17 +12,7 @@ home-manager = { DefaultTimeoutStopSec=8s ''; - nix.settings = { - substituters = [ - "https://hyprland.cachix.org" - "https://cosmic.cachix.org/" - ]; - trusted-substituters = config.nix.settings.substituters; - trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" - ]; - }; + services.tailscale.extraUpFlags = ++ (lib.optionals cfg.enableExitNode [ "--advertise-exit-node" ]); diff --git a/flakes/hyprland/flake.nix b/flakes/hyprland/flake.nix index 9fc6a6f..1706957 100644 --- a/flakes/hyprland/flake.nix +++ b/flakes/hyprland/flake.nix @@ -23,6 +23,17 @@ ./hyprland.nix ]; config = { + nix.settings = { + substituters = [ + "https://hyprland.cachix.org" + ]; + trusted-substituters = [ + "https://hyprland.cachix.org" + ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; + }; _module.args = { inherit hyprland; hyprlandPkgs = import hyprland.inputs.nixpkgs {