Compare commits
2 commits
fa220411bc
...
617f0f8f8b
Author | SHA1 | Date | |
---|---|---|---|
617f0f8f8b | |||
0dc2d46449 |
7 changed files with 130 additions and 69 deletions
26
flake.lock
26
flake.lock
|
@ -236,11 +236,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705879479,
|
||||
"narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
|
||||
"lastModified": 1706001011,
|
||||
"narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
|
||||
"rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -279,11 +279,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1705963870,
|
||||
"narHash": "sha256-JYBsfBcRtd+8EHxKZ24stJbhox9VogikXSR/2Y9sYXQ=",
|
||||
"lastModified": 1706046678,
|
||||
"narHash": "sha256-RSUCVXcOyVtEecKeBphPoljv6RmfScuSbxszBi2OOKc=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "dc466f9a63ede5e2bbddc33688c0c972abfe9a52",
|
||||
"rev": "fcd9905291c02917410ff7c55542fd73e4b25e2d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -304,11 +304,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705975320,
|
||||
"narHash": "sha256-heIdhXwvOyTBtu7gSsnTHx69r4Dpju1xj4SAa+zZT1w=",
|
||||
"lastModified": 1706046947,
|
||||
"narHash": "sha256-YWulmLXhGCOEM0yMO71jHTCuaNkrkw6aLA5dwktbANI=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "38e0e2b99fb13b39b1d506991b414a5ff6791a6f",
|
||||
"revCount": 680,
|
||||
"rev": "e6b1de062ef6b35837aec79fe5abbf8560792f47",
|
||||
"revCount": 681,
|
||||
"type": "git",
|
||||
"url": "https://git.kempkens.io/daniel/nix-overlay"
|
||||
},
|
||||
|
@ -355,11 +355,11 @@
|
|||
},
|
||||
"nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1705891108,
|
||||
"narHash": "sha256-PQ0Df5BzByg+0gPE1goa9WYVXSoEP6gtjblrbYC8WOI=",
|
||||
"lastModified": 1706022028,
|
||||
"narHash": "sha256-F8Gv4R4K/AvS3+6pWd8wlnw4Vhgf7bcszy7i8XPbzA0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8cccce637e19577815de54c5ecc3132dff965aee",
|
||||
"rev": "15ff1758e7816331033baa14eebbea68626128f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -95,49 +95,6 @@
|
|||
(highlight :NeogitDiffDelete {:fg mod.colors.comment :bg mod.colors.red})
|
||||
(highlight :NeogitDiffDeleteHighlight
|
||||
{:fg mod.colors.black :bg mod.colors.bright_red})
|
||||
(highlight :NeogitCursorLine {:fg mod.colors.fg :bg mod.colors.visual})
|
||||
;; nvim-treesitter
|
||||
(highlight-link "@variable.parameter" "@parameter")
|
||||
(highlight-link "@variable.member" "@field")
|
||||
(highlight-link "@module" "@namespace")
|
||||
(highlight-link "@number.float" "@float")
|
||||
(highlight-link "@string.special.symbol" "@symbol")
|
||||
(highlight-link "@string.regexp" "@string.regex")
|
||||
(highlight-link "@markup.strong" "@text.strong")
|
||||
(highlight-link "@markup.italic" "@text.emphasis")
|
||||
(highlight-link "@markup.underline" "@text.underline")
|
||||
(highlight-link "@markup.strikethrough" "@text.strike")
|
||||
(highlight-link "@markup.heading" "@text.title")
|
||||
(highlight-link "@markup.quote" "@text.quote")
|
||||
(highlight-link "@markup.link.url" "@text.uri")
|
||||
(highlight-link "@markup.math" "@text.math")
|
||||
(highlight-link "@markup.environment" "@text.environment")
|
||||
(highlight-link "@markup.environment.name" "@text.environment.name")
|
||||
(highlight-link "@markup.link" "@text.reference")
|
||||
(highlight-link "@markup.raw" "@text.literal")
|
||||
(highlight-link "@markup.raw.block" "@text.literal.block")
|
||||
(highlight-link "@markup.link.label" "@string.special")
|
||||
(highlight-link "@markup.list" "@punctuation.special")
|
||||
(highlight-link "@function.method" "@method")
|
||||
(highlight-link "@function.method.call" "@method.call")
|
||||
(highlight-link "@comment.todo" "@text.todo")
|
||||
(highlight-link "@comment.error" "@text.danger")
|
||||
(highlight-link "@comment.warning" "@text.warning")
|
||||
(highlight-link "@comment.hint" "@text.note")
|
||||
(highlight-link "@comment.info" "@text.note")
|
||||
(highlight-link "@comment.note" "@text.note")
|
||||
(highlight-link "@comment.ok" "@text.note")
|
||||
(highlight-link "@diff.plus" "@text.diff.add")
|
||||
(highlight-link "@diff.minus" "@text.diff.delete")
|
||||
(highlight-link "@diff.delta" "@text.diff.change")
|
||||
(highlight-link "@string.special.url" "@text.uri")
|
||||
(highlight-link "@keyword.directive" "@preproc")
|
||||
(highlight-link "@keyword.storage" "@storageclass")
|
||||
(highlight-link "@keyword.directive" "@define")
|
||||
(highlight-link "@keyword.conditional" "@conditional")
|
||||
(highlight-link "@keyword.debug" "@debug")
|
||||
(highlight-link "@keyword.exception" "@exception")
|
||||
(highlight-link "@keyword.import" "@include")
|
||||
(highlight-link "@keyword.repeat" "@repeat"))
|
||||
(highlight :NeogitCursorLine {:fg mod.colors.fg :bg mod.colors.visual}))
|
||||
|
||||
mod)
|
||||
|
|
|
@ -40,12 +40,12 @@ in
|
|||
};
|
||||
wezterm-nvim = buildVimPlugin {
|
||||
pname = "wezterm.nvim";
|
||||
version = "2023-11-02";
|
||||
version = "2024-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "willothy";
|
||||
repo = "wezterm.nvim";
|
||||
rev = "2aacd6405c52ef4b865a7baf2598fa3d7b0bc25c";
|
||||
sha256 = "1g43hyf7cmgr6vk59s7v4g5g4r0k8cm7bcki1klx40vqmlpq6rk5";
|
||||
rev = "3455f419f9fd20c01bb5cda8c0dc726b18e083cf";
|
||||
sha256 = "0zwgc22bgan66zkr5q7h053p8bacv3afka4sjwnhnjh8rvlww86p";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
@ -106,23 +106,23 @@ in
|
|||
};
|
||||
dracula-nvim = buildVimPlugin {
|
||||
pname = "dracula.nvim";
|
||||
version = "2024-01-10";
|
||||
version = "2024-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mofiqul";
|
||||
repo = "dracula.nvim";
|
||||
rev = "8fc749e2479d62829c9c627867770035b74529a4";
|
||||
sha256 = "14j3lz53vfz9w6iiw0zywqwknh0blsma9vzi10qqchq8cf1b6w1d";
|
||||
rev = "a6cb758d4b182d9f2b7e742910078d94877c1059";
|
||||
sha256 = "1v6hwh225lh7jayq7y18d8lp8n8dk7scy21f0s5jyppy1rn7yrf8";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
nvim-treesitter = buildVimPlugin {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2024-01-22";
|
||||
version = "2024-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "cd4e0909948eb33d3959e133c16f837e4db122c6";
|
||||
sha256 = "096rvmvr7bwl7g9cvzm92w6akpj3ycpy7dznh7pjgwb8mwf97r5j";
|
||||
rev = "177a775fd8b2a9de97011a43f13c74ad8d3739c8";
|
||||
sha256 = "1dbyk1c4qjvdpx5sc4kjw5ygzkmxs0z34r4xcwsmfjlmd50v82zr";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
@ -502,12 +502,12 @@ in
|
|||
};
|
||||
gitsigns-nvim = buildVimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2024-01-20";
|
||||
version = "2024-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "c5ff7628e19a47ec14d3657294cc074ecae27b99";
|
||||
sha256 = "1gwpiq3fdjg3b6hg82lq7i0cxfyyb89cr079jc9ja36ypwbkclkl";
|
||||
rev = "300a306da9973e81c2c06460f71fd7a079df1f36";
|
||||
sha256 = "1vy1p2cgcmfwzgfd011pnvib2vp1zgwv2kp59xlb0v3jxl8rnsvj";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -25,6 +25,10 @@ in
|
|||
|
||||
(import ../nixos/forgejo-runner.nix (args // { name = "argon"; tag = "ubuntu-latest-arm64"; nixTag = "arm64"; }))
|
||||
|
||||
../nixos/grafana.nix
|
||||
../nixos/loki.nix
|
||||
../nixos/telegraf.nix
|
||||
|
||||
../nixos/tailscale.nix
|
||||
|
||||
../nixos/unbound.nix
|
||||
|
|
36
system/nixos/grafana.nix
Normal file
36
system/nixos/grafana.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
let
|
||||
fqdn = "grafana.internal.kempkens.network";
|
||||
in
|
||||
{
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
analytics.reporting_enabled = false;
|
||||
|
||||
|
||||
server = {
|
||||
root_url = "https://${fqdn}";
|
||||
domain = fqdn;
|
||||
enforce_domain = true;
|
||||
enable_gzip = true;
|
||||
http_addr = "127.0.0.1";
|
||||
http_port = 3099;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."${fqdn}" = {
|
||||
quic = true;
|
||||
http3 = true;
|
||||
|
||||
onlySSL = true;
|
||||
useACMEHost = "internal.kempkens.network";
|
||||
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://127.0.0.1:3099";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
}
|
39
system/nixos/loki.nix
Normal file
39
system/nixos/loki.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
services.loki = {
|
||||
enable = true;
|
||||
|
||||
configuration = {
|
||||
auth_enabled = false;
|
||||
analytics.reporting_enabled = false;
|
||||
|
||||
server = {
|
||||
http_listen_port = 3100;
|
||||
};
|
||||
|
||||
common = {
|
||||
ring = {
|
||||
instance_addr = "127.0.0.1";
|
||||
kvstore.store = "inmemory";
|
||||
};
|
||||
|
||||
replication_factor = 1;
|
||||
path_prefix = "/var/lib/loki/common";
|
||||
};
|
||||
|
||||
schema_config = {
|
||||
configs = [
|
||||
{
|
||||
from = "2024-01-23";
|
||||
store = "tsdb";
|
||||
object_store = "filesystem";
|
||||
schema = "v12";
|
||||
index = {
|
||||
prefix = "index_";
|
||||
period = "24h";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
25
system/nixos/telegraf.nix
Normal file
25
system/nixos/telegraf.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{
|
||||
services.telegraf = {
|
||||
enable = true;
|
||||
|
||||
extraConfig = {
|
||||
inputs = {
|
||||
syslog = {
|
||||
server = "udp://:6514";
|
||||
syslog_standard = "RFC3164";
|
||||
best_effort = true;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
loki = {
|
||||
domain = "http://127.0.0.1:3100";
|
||||
endpoint = "/loki/api/v1/push";
|
||||
timeout = "15s";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.interfaces."vlan777".allowedUDPPorts = [ 6514 ];
|
||||
}
|
Loading…
Reference in a new issue