Compare commits

..

No commits in common. "24b5af3a280ebb4ecfd8ac5032939763941ed6ce" and "afe2e74990c840b4805b7f0144cf1e081e4fe207" have entirely different histories.

4 changed files with 30 additions and 37 deletions

View file

@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697931116, "lastModified": 1696940889,
"narHash": "sha256-KdjQQBavncOSLgv/AM/hwWH8GAYeP3O2XXLfXSuJzQ0=", "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "81ab14626273ca38cba947d9a989c9d72b5e7593", "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1697534720, "lastModified": 1696666273,
"narHash": "sha256-hh5a82fbujCOitFjbzClCMZ/XZQeFsdOHxZWCXXv1i4=", "narHash": "sha256-hpqcq42oFtQvDst5Rup9U/ejZgTnAJum0+nSgsBQ8Gs=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "a1aea16c7a3239c0a3d7522b09edb1d6988bae02", "rev": "8440eafdb516a379b4350f3c29a0e919f88cee24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1697929210, "lastModified": 1697299585,
"narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", "narHash": "sha256-bbK/8I18J+kO5fekH9dINSbgcDzaaklSwkqyi/gZ2k4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", "rev": "b85a19a7d547d39e74de6499cd3a38b7e89a3ee9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +256,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1697059129,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +272,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1696019113,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1697928654, "lastModified": 1697233664,
"narHash": "sha256-dyMe4/EhJhqZICJ06HkhA6DIBK5z8vRtwreGgfhLMFU=", "narHash": "sha256-cDVP6YJGaWOKdBCzx42MiY2PUKXkjb2b4c/q+lK0yFY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "56f46166f998d4adddb1c43dbf54d4c0604eef29", "rev": "bab56daddbe70141fb5fec85adb4cc0d61180b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +346,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1697746376, "lastModified": 1696158581,
"narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", "rev": "033453f85064ccac434dfd957f95d8457901ecd6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -18,22 +18,7 @@ in {
base_domain = baseDomain; base_domain = baseDomain;
extra_records = tailscale_dns_entries; extra_records = tailscale_dns_entries;
}; };
derp = {
auto_update_enable = true;
update_frequency = "24h";
};
}; };
}; };
environment.systemPackages = [ config.services.headscale.package ]; environment.systemPackages = [ config.services.headscale.package ];
services.nginx.virtualHosts = {
"headscale.nickiel.net" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${ toString config.services.headscale.port }";
proxyWebsockets = true;
};
};
};
} }

View file

@ -50,6 +50,15 @@
locations."/".proxyPass = "http://127.0.0.1:3001"; locations."/".proxyPass = "http://127.0.0.1:3001";
}; };
"headscale.nickiel.net" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${ toString config.services.headscale.port }";
proxyWebsockets = true;
};
};
}; };
}; };
} }

View file

@ -83,7 +83,6 @@ in
pkgs-stable.flameshot # screenshot utility pkgs-stable.flameshot # screenshot utility
pkgs-stable.fontpreview # utility to preview fonts pkgs-stable.fontpreview # utility to preview fonts
gitui # command line git tui gitui # command line git tui
pkgs-stable.godot_4
pkgs-stable.helvum # audio sink gui control pkgs-stable.helvum # audio sink gui control
pkgs-stable.pandoc # utility for converting between document types pkgs-stable.pandoc # utility for converting between document types
pkgs-stable.qmk # QMK utility for compiling qmk firmware pkgs-stable.qmk # QMK utility for compiling qmk firmware