Updates
This commit is contained in:
parent
83fe4d7f99
commit
d5364960b8
6 changed files with 61 additions and 38 deletions
24
flake.lock
24
flake.lock
|
@ -256,11 +256,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686837967,
|
"lastModified": 1686922395,
|
||||||
"narHash": "sha256-wjoR9xKW9L8HNr0cDYFvQN/CemsMo76KRRnJnXmsZ1Y=",
|
"narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d214b93ee3c82b2746b85e8cb96bc150c6a74e50",
|
"rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -279,11 +279,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "contrib",
|
"dir": "contrib",
|
||||||
"lastModified": 1686803781,
|
"lastModified": 1686981691,
|
||||||
"narHash": "sha256-Wcm4+wVjzyVQbwPGtDXIXF2vrjO1v7Rhhlu896vDvwg=",
|
"narHash": "sha256-0ruufYV+/3E8kSneuBEIrX8032hTkcSi4PErPU5rl5c=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "1f8fb7c00048bc217bb9a2bf29c58630d1810d6e",
|
"rev": "c07dceba335c56c9a356395ad0d1e5a14d416752",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -304,11 +304,11 @@
|
||||||
"weewx-proxy-flake": "weewx-proxy-flake"
|
"weewx-proxy-flake": "weewx-proxy-flake"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686817169,
|
"lastModified": 1686989911,
|
||||||
"narHash": "sha256-z3+/WHxBEqgoqc6WZZmSLHUs6ZIaJkbOc7Q7Fy/5QW8=",
|
"narHash": "sha256-R9D6w+XyHk74iTVFNEcni9yW06TfPVH1w2+y0HnbN7o=",
|
||||||
"owner": "nifoc",
|
"owner": "nifoc",
|
||||||
"repo": "nix-overlay",
|
"repo": "nix-overlay",
|
||||||
"rev": "0f16ff6e160de6350dc475e576397f8294692569",
|
"rev": "582b7424ce2e4438728722f04c06969efa3008bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -335,11 +335,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686737040,
|
"lastModified": 1686979235,
|
||||||
"narHash": "sha256-R+JicNaI9mcxodtHkci894txjt4IMsfOnlAarA/r0xQ=",
|
"narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6d1d80a232a355a65dc4d3bfea1f108e8dac1340",
|
"rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -31,7 +31,7 @@ in
|
||||||
nodePackages.dockerfile-language-server-nodejs
|
nodePackages.dockerfile-language-server-nodejs
|
||||||
nodePackages.svelte-language-server
|
nodePackages.svelte-language-server
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
nodePackages.vscode-langservers-extracted
|
# nodePackages.vscode-langservers-extracted
|
||||||
nodePackages.yaml-language-server
|
nodePackages.yaml-language-server
|
||||||
lua-language-server
|
lua-language-server
|
||||||
taplo-lsp
|
taplo-lsp
|
||||||
|
|
|
@ -107,12 +107,12 @@ in
|
||||||
};
|
};
|
||||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "2023-06-15";
|
version = "2023-06-17";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "10b0da9f931c734b531eb095ea01cce53984205c";
|
rev = "840e5d71787b02789f909315f646a6dd66a0de2c";
|
||||||
sha256 = "0qp2026zs9npaz00w7bgpaf1mga7x4zvgina1wdlvb4yhmr4n3n5";
|
sha256 = "0zqp1bckgijic464868dqs4gxfmvjkmkrj9hkrjwm4vp5qfcqwk6";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -220,12 +220,12 @@ in
|
||||||
};
|
};
|
||||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-lspconfig";
|
pname = "nvim-lspconfig";
|
||||||
version = "2023-06-14";
|
version = "2023-06-17";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "nvim-lspconfig";
|
repo = "nvim-lspconfig";
|
||||||
rev = "295c646488d5baa63c6c4da68fe61171b9257375";
|
rev = "80861dc087982a6ed8ba91ec4836adce619f5a8a";
|
||||||
sha256 = "1j1g8ws9maxwp5dklflmz3j202shy7fpzqd3rm09ngs90n31xfva";
|
sha256 = "03n3zh5gizia6ryafj88c0n6rpwzqhfa7b3gwrr66z25c0sqqxv3";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -297,23 +297,23 @@ in
|
||||||
};
|
};
|
||||||
LuaSnip = buildVimPluginFrom2Nix {
|
LuaSnip = buildVimPluginFrom2Nix {
|
||||||
pname = "LuaSnip";
|
pname = "LuaSnip";
|
||||||
version = "2023-06-14";
|
version = "2023-06-16";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "L3MON4D3";
|
owner = "L3MON4D3";
|
||||||
repo = "LuaSnip";
|
repo = "LuaSnip";
|
||||||
rev = "bfbd03952f428db6e28bb199c713b1b25576cec9";
|
rev = "4964cd11e19de4671189b97de37f3c4930d43191";
|
||||||
sha256 = "0rnlwcxr0ggmyi0qxffd1q0p7vr1pigi3sjpl9ppmm92p7x2jfzq";
|
sha256 = "15qfwwc5fsc6yhr0qsrfw4s8xvknrf1m25443lgz95v3d37hxkn5";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
friendly-snippets = buildVimPluginFrom2Nix {
|
friendly-snippets = buildVimPluginFrom2Nix {
|
||||||
pname = "friendly-snippets";
|
pname = "friendly-snippets";
|
||||||
version = "2023-06-15";
|
version = "2023-06-17";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rafamadriz";
|
owner = "rafamadriz";
|
||||||
repo = "friendly-snippets";
|
repo = "friendly-snippets";
|
||||||
rev = "b3cd8d77feb7871d8b04bb45bcd8154120a796a1";
|
rev = "70b727d3454cceb3a818b1746be09786568b7e33";
|
||||||
sha256 = "1vsjccdjp4pn5b801pydm4v3cg1b8pv1z4x8bk16l4z2l3mrs66a";
|
sha256 = "13winfmabdpxwgig519qr11znjngdlmbgbmksyrilxangaw3zgjf";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -440,23 +440,23 @@ in
|
||||||
};
|
};
|
||||||
nvim-ts-autotag = buildVimPluginFrom2Nix {
|
nvim-ts-autotag = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-ts-autotag";
|
pname = "nvim-ts-autotag";
|
||||||
version = "2023-06-14";
|
version = "2023-06-16";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "windwp";
|
owner = "windwp";
|
||||||
repo = "nvim-ts-autotag";
|
repo = "nvim-ts-autotag";
|
||||||
rev = "e254b306fb81ed69049cce526e7906150d73e0d1";
|
rev = "6be1192965df35f94b8ea6d323354f7dc7a557e4";
|
||||||
sha256 = "0wipms6i7d42kg7x5d82rwixx0fsgrkgvxnb90karp8sskdlmxvc";
|
sha256 = "1j47gcybag2qk87qc4karwdvzhvi485x7m80n2sj27rrh1fyv972";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
vim-matchup = buildVimPluginFrom2Nix {
|
vim-matchup = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-matchup";
|
pname = "vim-matchup";
|
||||||
version = "2023-06-02";
|
version = "2023-06-17";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "andymass";
|
owner = "andymass";
|
||||||
repo = "vim-matchup";
|
repo = "vim-matchup";
|
||||||
rev = "3625e099b09bff2db5f04082cb09ba679525980c";
|
rev = "3a17944bfa3942da805a381750a1be4b314c64d2";
|
||||||
sha256 = "0nb7xnypv046lh73wfqhch54jx5h3xaxjin0qv9b3g0k5zd0mdi6";
|
sha256 = "00kc4zkr1hd8qcls3midmdb2lr205lw0r6r6gb7xc8yqvv1bcv9h";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -539,23 +539,23 @@ in
|
||||||
};
|
};
|
||||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "gitsigns.nvim";
|
pname = "gitsigns.nvim";
|
||||||
version = "2023-06-14";
|
version = "2023-06-16";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lewis6991";
|
owner = "lewis6991";
|
||||||
repo = "gitsigns.nvim";
|
repo = "gitsigns.nvim";
|
||||||
rev = "4f8f66da9816ec4c4847653c9ab9bcb9c609508c";
|
rev = "256569c2fe697a3003dbd49ff474e5935af9066c";
|
||||||
sha256 = "1s87s5llm6r9kb3jli9v5rh1bvgmyn0ig3rrxn02myi79a6npw1n";
|
sha256 = "1xxpqjmxqf7bkia4jrf78grjg9myq7lnhygmi0gm90nwlm9wi8vl";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nui-nvim = buildVimPluginFrom2Nix {
|
nui-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "nui.nvim";
|
pname = "nui.nvim";
|
||||||
version = "2023-06-14";
|
version = "2023-06-16";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MunifTanjim";
|
owner = "MunifTanjim";
|
||||||
repo = "nui.nvim";
|
repo = "nui.nvim";
|
||||||
rev = "e916f67b6bae1d290efa7c824ae4e04023cdfb20";
|
rev = "e319f2554d14a521f4271576ebff2685105d7628";
|
||||||
sha256 = "1fgxdmc3i4ib2ay15kvary4zjdw0nwrmbf1pfradvfm4xwbdfz37";
|
sha256 = "1lm7fm2pdclsrimiw73m5pbg6h0g1yj9bd7kin55xapzvn4j3131";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,6 +23,8 @@ in
|
||||||
|
|
||||||
../nixos/tailscale.nix
|
../nixos/tailscale.nix
|
||||||
|
|
||||||
|
../nixos/uptime-kuma.nix
|
||||||
|
|
||||||
../nixos/weewx-proxy.nix
|
../nixos/weewx-proxy.nix
|
||||||
|
|
||||||
../nixos/container.nix
|
../nixos/container.nix
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen ${builtins.toString secret.nginx.upstream.video.externalPort};
|
listen *:${builtins.toString secret.nginx.upstream.video.externalPort};
|
||||||
|
listen [::]:${builtins.toString secret.nginx.upstream.video.externalPort};
|
||||||
|
|
||||||
proxy_protocol on;
|
proxy_protocol on;
|
||||||
proxy_pass video;
|
proxy_pass video;
|
||||||
}
|
}
|
||||||
|
|
19
system/nixos/uptime-kuma.nix
Normal file
19
system/nixos/uptime-kuma.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
services.uptime-kuma = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."kuma.internal.kempkens.network" = {
|
||||||
|
quic = true;
|
||||||
|
http3 = true;
|
||||||
|
|
||||||
|
onlySSL = true;
|
||||||
|
useACMEHost = "internal.kempkens.network";
|
||||||
|
|
||||||
|
locations."/" = {
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
proxyPass = "http://127.0.0.1:3001";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue