Compare commits

..

No commits in common. "1ae80a316d997cdfea41c172360c6a9785566fb1" and "f61021d9fab8ff683257e67237db6af92dae9414" have entirely different histories.

4 changed files with 61 additions and 63 deletions

View file

@ -10,11 +10,11 @@
]
},
"locked": {
"lastModified": 1728316447,
"narHash": "sha256-CozghDtgXuRpDqqwYCt1Az1vbm1Pzr0BIONQO/9hFCI=",
"lastModified": 1725910950,
"narHash": "sha256-pF7jB+Ucg2Zjdg0PJar7Qkw/kiDbej3vX2wyCZFLyGM=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "4c2d8201dccdf8571a71a6e969ca9557b1c5fdf2",
"rev": "6e15286f0c94b89d4c5f9b8fa1e9a72cd209017c",
"type": "github"
},
"original": {
@ -31,11 +31,11 @@
]
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1727678104,
"narHash": "sha256-jZr+8ZwMLlNab3qwfhsuAZyT9DfQ3d+18Sg9wXWXPIU=",
"lastModified": 1725085655,
"narHash": "sha256-0BQ6BZPaDq8rtEIdTduF2OPlQUKEkImKI8oysym9EVM=",
"owner": "nix-community",
"repo": "fenix",
"rev": "db7af3238117cb215b7096bd4cf1e9970e9a405b",
"rev": "0df8ceddac0e11b695fd622e18908724cc478552",
"type": "github"
},
"original": {
@ -139,11 +139,11 @@
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@ -157,11 +157,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -241,11 +241,11 @@
]
},
"locked": {
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"lastModified": 1727514110,
"narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
"type": "github"
},
"original": {
@ -286,17 +286,17 @@
]
},
"locked": {
"lastModified": 1726648988,
"narHash": "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=",
"lastModified": 1714649959,
"narHash": "sha256-gd/AJAdOCLyZRPymORMz3EGwL6rt9C9bxFRVSpriR3Y=",
"owner": "juanfont",
"repo": "headscale",
"rev": "10a72e8d542af68c0c280f2a6ccc84849719b24c",
"rev": "a9c568c801a514855396c7dcec031b3598457f20",
"type": "github"
},
"original": {
"owner": "juanfont",
"repo": "headscale",
"rev": "10a72e8d542af68c0c280f2a6ccc84849719b24c",
"rev": "a9c568c801a514855396c7dcec031b3598457f20",
"type": "github"
}
},
@ -307,11 +307,11 @@
]
},
"locked": {
"lastModified": 1728337164,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github"
},
"original": {
@ -328,11 +328,11 @@
]
},
"locked": {
"lastModified": 1728337164,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github"
},
"original": {
@ -490,11 +490,11 @@
]
},
"locked": {
"lastModified": 1728385805,
"narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
"lastModified": 1727507295,
"narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
"rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
"type": "github"
},
"original": {
@ -510,11 +510,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1728399236,
"narHash": "sha256-X1a4t/OkB9fH6Ao+Pqkto8mJrzlG6t8Dimn8jkbPuZc=",
"lastModified": 1727693804,
"narHash": "sha256-Qwd+BzauhSXdtiL172wkp8JYJhe2BXyXkyWqPexytME=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "9f4fbf5f9e381826e6d66a6f699ad30ff3122075",
"rev": "acb21a72156c5b6e1aa607b9adcbac592bd60862",
"type": "github"
},
"original": {
@ -622,11 +622,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1728193676,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
"lastModified": 1727540905,
"narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
"rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
"type": "github"
},
"original": {
@ -638,11 +638,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1728241625,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github"
},
"original": {
@ -654,11 +654,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1728241625,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github"
},
"original": {
@ -681,11 +681,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1728485062,
"narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=",
"lastModified": 1727645871,
"narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135",
"rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200",
"type": "github"
},
"original": {
@ -703,11 +703,11 @@
]
},
"locked": {
"lastModified": 1728423244,
"narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=",
"lastModified": 1727452028,
"narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=",
"owner": "NuschtOS",
"repo": "search",
"rev": "f276cc3b391493ba3a8b30170776860f9520b7fa",
"rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3",
"type": "github"
},
"original": {
@ -735,11 +735,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1727641226,
"narHash": "sha256-iJTCG7vtECll27sxDElL4SuIY/kRhamJf0DDYCW6fb4=",
"lastModified": 1725039453,
"narHash": "sha256-h8Pn1th2bss7yXvxs1uR1kXYMTNej1L6Qy/GgsR4t3A=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "822644d97d7f64e1bdff25b1d636e366a29facc4",
"rev": "9fd70519507b673fae250f84b0990e7e8155ca98",
"type": "github"
},
"original": {
@ -899,11 +899,11 @@
]
},
"locked": {
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"lastModified": 1727431250,
"narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
"type": "github"
},
"original": {

View file

@ -26,8 +26,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
headscale = {
url = "github:juanfont/headscale/10a72e8d542af68c0c280f2a6ccc84849719b24c";
# url = "github:juanfont/headscale/a9c568c801a514855396c7dcec031b3598457f20";
# url = "github:juanfont/headscale/c42f25bd72e8b8d740af6c7cc4410507fc686b7e";
url = "github:juanfont/headscale/a9c568c801a514855396c7dcec031b3598457f20";
inputs."flake-utils".follows = "utils";
inputs.nixpkgs.follows = "nixpkgs";
};

View file

@ -2,8 +2,8 @@
let
tailscale_dns_entries = import ./dns.nix;
baseDomain = "tailscale.nickiel.net";
domain = "headscale.nickiel.net";
baseDomain = "nickiel.net";
domain = "headscale.${baseDomain}";
in {
# headscale routes list
# headscale routes enable -r NUMBER
@ -30,10 +30,8 @@ in {
type = "sqlite3";
sqlite.path = "/var/lib/headscale/db.sqlite";
};
dns_config = {};
dns = {
dns_config = {
base_domain = baseDomain;
magic_dns = true;
extra_records = tailscale_dns_entries;
};
derp = {

View file

@ -3,7 +3,7 @@
{
services.nextcloud = {
enable = true;
package = pkgs.nextcloud30;
package = pkgs.nextcloud29;
enableImagemagick = true;
nginx.recommendedHttpHeaders = true;
https = true;