Compare commits

...

4 commits

Author SHA1 Message Date
24b5af3a28 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19)
  → 'github:nix-community/home-manager/81ab14626273ca38cba947d9a989c9d72b5e7593' (2023-10-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16)
  → 'github:nixos/nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0' (2023-10-19)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/5e477adbda521e6502d147da67064dc44db9aac0' (2023-10-20)
  → 'github:NixOS/nixpkgs/fb000224952bf7749a9e8b3779104ef7ea4465c8' (2023-10-21)
• Updated input 'nixvim':
    'github:nix-community/nixvim/9832bc3f545fc1364a8bcb630cef808dc8a85797' (2023-10-20)
  → 'github:nix-community/nixvim/56f46166f998d4adddb1c43dbf54d4c0604eef29' (2023-10-21)
• Updated input 'nixvim/nixpkgs':
    'github:NixOS/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a' (2023-09-29)
  → 'github:NixOS/nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0' (2023-10-19)
• Updated input 'nixvim/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/033453f85064ccac434dfd957f95d8457901ecd6' (2023-10-01)
  → 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
2023-10-21 18:15:14 -07:00
6ac464fcd2 added godot to programs 2023-10-21 16:56:06 -07:00
ad47d8d2bd moved nginx to headscale file; added derp autoupdate 2023-10-21 16:55:52 -07:00
41b969d123 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10)
  → 'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19)
• Updated input 'kmonad':
    'github:kmonad/kmonad/8440eafdb516a379b4350f3c29a0e919f88cee24?dir=nix' (2023-10-07)
  → 'github:kmonad/kmonad/a1aea16c7a3239c0a3d7522b09edb1d6988bae02?dir=nix' (2023-10-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11)
  → 'github:nixos/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/b85a19a7d547d39e74de6499cd3a38b7e89a3ee9' (2023-10-14)
  → 'github:NixOS/nixpkgs/5e477adbda521e6502d147da67064dc44db9aac0' (2023-10-20)
• Updated input 'nixvim':
    'github:nix-community/nixvim/bab56daddbe70141fb5fec85adb4cc0d61180b8d' (2023-10-13)
  → 'github:nix-community/nixvim/9832bc3f545fc1364a8bcb630cef808dc8a85797' (2023-10-20)
2023-10-20 09:53:53 -07:00
4 changed files with 37 additions and 30 deletions

View file

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

View file

@ -18,7 +18,22 @@ 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,15 +50,6 @@
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,6 +83,7 @@ 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