noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-07-08 11:50:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: noah:eblume-mole
Branches Tags
noah:master noah:platform noah:home-manager-fix noah:immich-proxy noah:microcode noah:nixd noah:eblume-mole noah:language-checks noah:keyd-2.4.3 noah:sway noah:nixosmodules noah:unfree-predicate-by-pkgs noah:darwin-ssl
noah:pre-platform noah:begin-nixos noah:begin-nix noah:neovim-lua noah:pre-nix noah:legacy
...
compare: noah:b4470727e5578002d50cdd700909c3d73107ad28
Branches Tags
noah:master noah:platform noah:home-manager-fix noah:immich-proxy noah:microcode noah:nixd noah:eblume-mole noah:language-checks noah:keyd-2.4.3 noah:sway noah:nixosmodules noah:unfree-predicate-by-pkgs noah:darwin-ssl
noah:pre-platform noah:begin-nixos noah:begin-nix noah:neovim-lua noah:pre-nix noah:legacy

11 Commits
eblume-mol ... b4470727e5

Author SHA1 Message Date
Noah Masur
b4470727e5 back to hosting snappymail myself 
i'm still not sure if this will work
 2024-06-30 21:57:48 -04:00
Noah Masur
126baae735 add more services to grafana caddy list 2024-06-29 18:37:03 -04:00
Noah Masur
892dfbbee4 fix: grafana alert label template 2024-06-29 13:51:54 +00:00
Noah Masur
0198469b83 oops forgot to get rid of experimental line 2024-06-29 13:43:08 +00:00
Noah Masur
c89ca7ea94 upgrade to nextcloud 29 successfully 2024-06-29 13:41:30 +00:00
Noah Masur
0a98b72784 only set kitty aliases in kitty terminal 2024-06-29 08:01:23 -04:00
Noah Masur
c7de16b14c add prom scraping to victoriametrics 
allows us to not run vmagent when running victoriametrics
 2024-06-29 01:22:59 +00:00
Noah Masur
1d405e1828 format comments on lua file 2024-06-28 20:36:31 -04:00
Noah Masur
97f99a149e revert toggleterm float opts 
they stuck to the height of the terminal window at initial open, which
looked bad whenever it changed, especially if it increased.
 2024-06-28 20:36:08 -04:00
Noah Masur
bc794f89bc play with markview-nvim 
neovim markdown plugin
 2024-06-28 20:34:35 -04:00
Noah Masur
63b90102f2 remove tempest from cloudflare tunnel alerts 2024-06-27 11:36:05 -04:00
10 changed files with 110 additions and 38 deletions
Expand all files Collapse all files

52
flake.lock generated
View File

@ -304,55 +304,72 @@
"type": "github"
}
},
"markview-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1719592662,
"narHash": "sha256-E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ=",
"owner": "OXY2DEV",
"repo": "markview.nvim",
"rev": "f60219dce7283192d549f21847fcf8537bf6d260",
"type": "github"
},
"original": {
"owner": "OXY2DEV",
"repo": "markview.nvim",
"type": "github"
}
},
"nextcloud-cookbook": {
"flake": false,
"locked": {
"lastModified": 1702545935,
"narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
"lastModified": 1719431638,
"narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
"type": "tarball",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
}
},
"nextcloud-external": {
"flake": false,
"locked": {
"lastModified": 1699624334,
"narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
"lastModified": 1710338675,
"narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
"type": "tarball",
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
}
},
"nextcloud-news": {
"flake": false,
"locked": {
"lastModified": 1703426420,
"narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
"lastModified": 1718102703,
"narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
"type": "tarball",
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
}
},
"nextcloud-snappymail": {
"flake": false,
"locked": {
"narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
"type": "file",
"url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
"lastModified": 1719799046,
"narHash": "sha256-1bPStkTKgVCc/puq0G7EiEZy/xrNlNXaO/tiOaZ/Ovw=",
"type": "tarball",
"url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz"
},
"original": {
"type": "file",
"url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
"type": "tarball",
"url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz"
}
},
"nix2vim": {
@ -570,6 +587,7 @@
"hmts-nvim-src": "hmts-nvim-src",
"home-manager": "home-manager",
"mac-app-util": "mac-app-util",
"markview-nvim-src": "markview-nvim-src",
"nextcloud-cookbook": "nextcloud-cookbook",
"nextcloud-external": "nextcloud-external",
"nextcloud-news": "nextcloud-news",

13
flake.nix
View File

@ -127,6 +127,10 @@
url = "github:mfussenegger/nvim-lint";
flake = false;
};
markview-nvim-src = {
url = "github:OXY2DEV/markview.nvim";
flake = false;
};
# Tree-Sitter Grammars
tree-sitter-bash = {
@ -177,23 +181,24 @@
# Nextcloud Apps
nextcloud-news = {
# https://github.com/nextcloud/news/releases
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
flake = false;
};
nextcloud-external = {
# https://github.com/nextcloud-releases/external/releases
url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
flake = false;
};
nextcloud-cookbook = {
# https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
flake = false;
};
nextcloud-snappymail = {
# https://github.com/the-djmaze/snappymail/releases
# https://snappymail.eu/repository/nextcloud
url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
# url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.3-nextcloud.tar.gz";
url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
flake = false;
};
};

11
modules/common/applications/kitty.nix
View File

@ -34,10 +34,13 @@
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
# Display images in the terminal
programs.fish.shellAliases = {
icat = "kitty +kitten icat";
ssh = "kitty +kitten ssh";
};
programs.fish.interactiveShellInit = # fish
''
if test "$TERM" = "xterm-kitty"
alias icat="kitty +kitten icat"
alias ssh="kitty +kitten ssh"
end
'';
programs.kitty = {
enable = true;

4
modules/common/neovim/config/misc.nix
View File

@ -10,7 +10,7 @@
pkgs.vimPlugins.vim-eunuch # File manipulation commands
pkgs.vimPlugins.vim-fugitive # Git commands
pkgs.vimPlugins.vim-repeat # Better repeat using .
pkgs.vimPlugins.glow-nvim # Markdown preview popup
pkgs.vimPlugins.markview-nvim # Markdown preview
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
pkgs.vimPlugins.which-key-nvim # Keybind helper
];
@ -21,7 +21,7 @@
names = false;
};
};
setup.glow = { };
setup.markview = { };
setup.which-key = { };
vim.o = {

5
modules/common/neovim/config/toggleterm.nix
View File

@ -14,11 +14,6 @@
open_mapping = dsl.rawLua "[[<c-\\>]]";
hide_numbers = true;
direction = "float";
float_opts = {
width = dsl.rawLua "vim.o.columns - 4";
height = dsl.rawLua "vim.o.lines - 4";
row = 0;
};
};
lua = ''

48
modules/nixos/services/grafana.nix
View File

@ -885,6 +885,28 @@ in
}
];
}
{
matcher = {
id = "byName";
options = "localhost:8086";
};
properties = [
{
id = "displayName";
value = "InfluxDB";
}
{
id = "links";
value = [
{
targetBlank = true;
title = "";
url = "https://${config.hostnames.influxdb}";
}
];
}
];
}
{
matcher = {
id = "byName";
@ -929,6 +951,28 @@ in
}
];
}
{
matcher = {
id = "byName";
options = "localhost:9000";
};
properties = [
{
id = "displayName";
value = "The Lounge";
}
{
id = "links";
value = [
{
targetBlank = true;
title = "";
url = "https://${config.hostnames.irc}";
}
];
}
];
}
{
matcher = {
id = "byName";
@ -2321,7 +2365,7 @@ in
datasourceUid = promUid;
model = {
editorMode = "code";
expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
hide = false;
instant = true;
intervalMs = 1000;
@ -2418,7 +2462,7 @@ in
execErrState = "Error";
for = "5m";
annotations = {
description = "Cloudflare Tunnel for {{ $job }}.";
description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
summary = "Cloudflare Tunnel is down.";
};
isPaused = false;

2
modules/nixos/services/nextcloud.nix
View File

@ -26,6 +26,8 @@
trusted_domains = [ config.hostnames.content ];
trusted_proxies = [ "127.0.0.1" ];
maintenance_window_start = 4; # Run jobs at 4am UTC
log_type = "file";
loglevel = 1; # Include all actions in the log
};
extraAppsEnable = true;
extraApps = {

4
modules/nixos/services/victoriametrics.nix
View File

@ -38,6 +38,10 @@ in
config = {
services.victoriametrics.extraOptions = [
"-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
];
systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
description = "VictoriaMetrics basic auth proxy";
after = [ "network.target" ];

1
overlays/neovim-plugins.nix
View File

@ -38,5 +38,6 @@ in
base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
};
}