Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-24 13:45:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:cceb3632fde32db40d0df2737aee8992a44fae4d
Branches Tags
Nickiel:main
Nickiel:awesome-dev
...
compare: Nickiel:fa36ab81097b78415c1b84d2148acca56b1bae62
Branches Tags
Nickiel:main
Nickiel:awesome-dev

3 commits
cceb3632fd ... fa36ab8109

Author SHA1 Message Date
Nickiel12
fa36ab8109 removed old comment lines 2024-04-21 14:45:42 -07:00
Nickiel12
844259c6ce flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/c41998e98a073f4cce26134c0642c403d71b74a2' (2024-04-12)
  → 'github:atuinsh/atuin/98350f52df1d783886313682a5eada8a729cbaed' (2024-04-19)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8fdf329526f06886b53b94ddf433848a0d142984' (2024-04-13)
  → 'github:nix-community/home-manager/057117a401a34259c9615ce62218aea7afdee4d3' (2024-04-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10)
  → 'github:nixos/nixpkgs/66adc1e47f8784803f2deb6cacd5e07264ec2d5c' (2024-04-16)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/c27f3b6d8e29346af16eecc0e9d54b1071eae27e' (2024-04-13)
  → 'github:NixOS/nixpkgs/bc194f70731cc5d2b046a6c1b3b15f170f05999c' (2024-04-19)
• Updated input 'nixvim':
    'github:nix-community/nixvim/1da2087d9b8a89c310d093207afd41114d6727e1' (2024-04-13)
  → 'github:nix-community/nixvim/83a7ce9846b1b01a34b3e6b25077c1a5044ad7b3' (2024-04-19)
 2024-04-19 18:46:46 -07:00
Nickiel12
397997ae48 rolled back to alpha4 headscale 2024-04-19 18:46:00 -07:00
4 changed files with 34 additions and 28 deletions
Show stats Expand all files Collapse all files

38
flake.lock
View file

@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712914814, "lastModified": 1713517105,
"narHash": "sha256-2JimoqHnPCoRlvE1kY0zwTEDmNO3g+8Lz+nJrbaHMHo=", "narHash": "sha256-DA7jYt28ProoSTiSMXgNYCR/Lz1I+EtWVEslfpHVqKs=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "c41998e98a073f4cce26134c0642c403d71b74a2", "rev": "98350f52df1d783886313682a5eada8a729cbaed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,17 +252,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705595425, "lastModified": 1707988981,
"narHash": "sha256-oNlCsosFl+ZsStSrEXk5SmirJCjc3H+Jr7Ro0C8EQ5U=", "narHash": "sha256-8qsm0OGAwKtGwMm3g4jUxhOLH9v9YS7iTi+JoMtvMc0=",
"owner": "juanfont", "owner": "juanfont",
"repo": "headscale", "repo": "headscale",
"rev": "1e22f17f36f8c13185dff269e6a00424b49b9568", "rev": "c42f25bd72e8b8d740af6c7cc4410507fc686b7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "juanfont", "owner": "juanfont",
"repo": "headscale", "repo": "headscale",
"rev": "1e22f17f36f8c13185dff269e6a00424b49b9568", "rev": "c42f25bd72e8b8d740af6c7cc4410507fc686b7e",
"type": "github" "type": "github"
} }
}, },
@ -273,11 +273,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713019815, "lastModified": 1713566308,
"narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=", "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8fdf329526f06886b53b94ddf433848a0d142984", "rev": "057117a401a34259c9615ce62218aea7afdee4d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1713042715, "lastModified": 1713564160,
"narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,11 +465,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1713297878,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713038713, "lastModified": 1713530381,
"narHash": "sha256-xijgNVqLYXUbpSsGXh7bzx6zCRVf+WGlTcGMG04mQjA=", "narHash": "sha256-54sXzrwhKkI9uzeHRPNtpB4pCQqIkzzr1FFUiG4znQU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "1da2087d9b8a89c310d093207afd41114d6727e1", "rev": "83a7ce9846b1b01a34b3e6b25077c1a5044ad7b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -19,9 +19,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
headscale = { headscale = {
# url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a"; url = "github:juanfont/headscale/c42f25bd72e8b8d740af6c7cc4410507fc686b7e";
url = "github:juanfont/headscale/1e22f17f36f8c13185dff269e6a00424b49b9568"; # url = "github:juanfont/headscale/bd047928f73687c5d75b804b996951c6fd37b2e6"; # Real repo
# url = "github:juanfont/headscale"; # Real repo
inputs."flake-utils".follows = "utils"; inputs."flake-utils".follows = "utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

10
hosts/Alaska/modules/dns.nix
View file

@ -2,26 +2,26 @@
{ {
name = "vaultwarden.nickiel.net"; name = "vaultwarden.nickiel.net";
type = "A"; type = "A";
value = "100.64.0.1/31"; value = "100.64.0.1";
} }
{ {
name = "git.nickiel.net"; name = "git.nickiel.net";
type = "A"; type = "A";
value = "100.64.0.1/31"; value = "100.64.0.1";
} }
{ {
name = "files.nickiel.net"; name = "files.nickiel.net";
type = "A"; type = "A";
value = "100.64.0.1/31"; value = "100.64.0.1";
} }
{ {
name = "iot.nickiel.net"; name = "iot.nickiel.net";
type = "A"; type = "A";
value = "100.64.0.1/31"; value = "100.64.0.1";
} }
{ {
name = "atuin.nickiel.net"; name = "atuin.nickiel.net";
type = "A"; type = "A";
value = "100.64.0.1/31"; value = "100.64.0.1";
} }
] ]

9
hosts/Alaska/modules/headscale.nix
View file

@ -21,8 +21,15 @@ in {
address = "0.0.0.0"; address = "0.0.0.0";
port = 8082; port = 8082;
settings = { settings = {
prefixes = {
v6 = "fd7a:115c:a1e0::/48";
v4 = "100.64.0.0/10";
};
server_url = "https://${domain}"; server_url = "https://${domain}";
# database.type = "sqlite"; database = {
type = "sqlite3";
sqlite.path = "/var/lib/headscale/db.sqlite";
};
dns_config = { dns_config = {
base_domain = baseDomain; base_domain = baseDomain;
extra_records = tailscale_dns_entries; extra_records = tailscale_dns_entries;