mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-22 12:49:32 -08:00
switched to headscale flake
This commit is contained in:
parent
ca7ccf8dc8
commit
b8ada4438f
4 changed files with 17 additions and 20 deletions
12
flake.lock
12
flake.lock
|
@ -162,17 +162,17 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701336075,
|
||||
"narHash": "sha256-1AN5KGL42BwBNkJMjS2ZDcd/CT/AtH1BkT+azHMI5NY=",
|
||||
"owner": "kradalby",
|
||||
"lastModified": 1683878976,
|
||||
"narHash": "sha256-nqmTqe3F3Oh8rnJH0clwACD/0RpqmfOMXNubr3C8rEc=",
|
||||
"owner": "juanfont",
|
||||
"repo": "headscale",
|
||||
"rev": "bbb4c357268998fd02780b7f8f2013f76e3ab80a",
|
||||
"rev": "b01f1f1867136d9b2d7b1392776eb363b482c525",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kradalby",
|
||||
"owner": "juanfont",
|
||||
"repo": "headscale",
|
||||
"rev": "bbb4c357268998fd02780b7f8f2013f76e3ab80a",
|
||||
"rev": "b01f1f1867136d9b2d7b1392776eb363b482c525",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
19
flake.nix
19
flake.nix
|
@ -5,11 +5,14 @@
|
|||
utils.url = "github:numtide/flake-utils";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-23.05";
|
||||
nixpkgs-stable = {
|
||||
url = "github:NixOS/nixpkgs/release-23.05";
|
||||
};
|
||||
kmonad.url = "github:kmonad/kmonad?dir=nix";
|
||||
|
||||
headscale = {
|
||||
url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a";
|
||||
# url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a";
|
||||
url = "github:juanfont/headscale/b01f1f1867136d9b2d7b1392776eb363b482c525";
|
||||
# url = "github:juanfont/headscale"; # Real repo
|
||||
inputs."flake-utils".follows = "utils";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -40,14 +43,6 @@
|
|||
user = "nixolas";
|
||||
system = "x86_64-linux";
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
headscale.overlay
|
||||
];
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
pkgs-stable = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
|
@ -63,7 +58,7 @@
|
|||
Alaska = lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit user pkgs pkgs-stable;
|
||||
inherit user headscale pkgs-stable;
|
||||
};
|
||||
|
||||
modules = [
|
||||
|
@ -95,7 +90,7 @@
|
|||
NicksNixLaptop = lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit user pkgs;
|
||||
inherit user;
|
||||
};
|
||||
|
||||
modules = [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, headscale, ... }:
|
||||
|
||||
|
||||
{
|
||||
|
@ -33,6 +33,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
# headscale dns is handled by dnsmasq
|
||||
networking.hosts = {
|
||||
"100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ config, headscale, ... }:
|
||||
|
||||
let
|
||||
tailscale_dns_entries = import ./dns.nix;
|
||||
|
@ -13,6 +13,7 @@ in {
|
|||
|
||||
# https://carjorvaz.com/posts/setting-up-headscale-on-nixos/
|
||||
services.headscale = {
|
||||
package = headscale.packages."x86_64-linux".headscale;
|
||||
enable = true;
|
||||
address = "0.0.0.0";
|
||||
port = 8082;
|
||||
|
|
Loading…
Reference in a new issue