Compare commits

...

10 Commits

Author SHA1 Message Date
21cce15cf0 zsh-autocomplete: switch back to upstream 2023-08-13 19:23:03 +02:00
mic92-buildbot
a79cc21417 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/406d34d919e9e8b831b531782cf5ef6995188566' (2023-08-12)
  → 'github:nix-community/home-manager/c3ab5ea047e6dc73df530948f7367455749d8906' (2023-08-12)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/9a203c6bf691f7c4b66618bb5d085395c5cfe1d1' (2023-08-13)
  → 'github:nix-community/nix-index-database/f4d70d098f066a30c7087144063dca179495f7d6' (2023-08-13)
• Updated input 'nixpkgs':
    'github:Mic92/nixpkgs/c821edbc51896b653fd5f45170319a6f6ab03c2a' (2023-08-13)
  → 'github:Mic92/nixpkgs/6e4233d5a2673ac2eb68a8c1eee91495732b07bb' (2023-08-13)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5f5d9a3c8bc247eb574823b9f16a79e054dafe73' (2023-08-12)
  → 'github:Mic92/sops-nix/32603de0dc988d60a7b80774dd7aed1083cd9629' (2023-08-13)
2023-08-13 10:11:12 +01:00
c24149099c turingmachine: remove unused with 2023-08-13 11:04:09 +02:00
5d8fd09660 drop unused module 2023-08-13 11:03:08 +02:00
79898f05c1 eve/borgbackup: fix telegraf logging 2023-08-13 11:03:08 +02:00
Jörg Thalheim
45b75c2887
Merge pull request #793 from qowoz/borg
eva/prometheus/alert-rules: remove borgbackup-nixpkgs-update
2023-08-13 09:32:46 +01:00
zowoq
f2b917c050 eva/prometheus/alert-rules: remove borgbackup-nixpkgs-update 2023-08-13 16:24:39 +10:00
3b71cad001 eva: also monitor matchbox backup 2023-08-13 07:50:59 +02:00
4adc55bd1f rename borgbackup monitoring events after their systemd services 2023-08-13 07:47:55 +02:00
5c750d09a4 nvim: update settings with upstream repo 2023-08-13 07:24:29 +02:00
9 changed files with 42 additions and 32 deletions

2
.gitmodules vendored
View File

@ -21,4 +21,4 @@
url = https://github.com/hugsy/gef
[submodule "zsh/zsh-autocomplete"]
path = zsh/zsh-autocomplete
url = https://github.com/Mic92/zsh-autocomplete
url = https://github.com/marlonrichert/zsh-autocomplete

View File

@ -242,11 +242,11 @@
]
},
"locked": {
"lastModified": 1691856649,
"narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=",
"lastModified": 1691882297,
"narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "406d34d919e9e8b831b531782cf5ef6995188566",
"rev": "c3ab5ea047e6dc73df530948f7367455749d8906",
"type": "github"
},
"original": {
@ -309,11 +309,11 @@
]
},
"locked": {
"lastModified": 1691895447,
"narHash": "sha256-B7xNHuu0XgRlE1eKCGLBlCX5rNE2CP0iKx+hM6EszK0=",
"lastModified": 1691897365,
"narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "9a203c6bf691f7c4b66618bb5d085395c5cfe1d1",
"rev": "f4d70d098f066a30c7087144063dca179495f7d6",
"type": "github"
},
"original": {
@ -408,11 +408,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1691895572,
"narHash": "sha256-Qrm9i+dH5KpVrexlobQ6WqwDpauEPdap58GLv9LUNRE=",
"lastModified": 1691917741,
"narHash": "sha256-iI6vAJRpcz4IjkUKT4wzQY0XyXzNYPxiBUAX7jZ1G1g=",
"owner": "Mic92",
"repo": "nixpkgs",
"rev": "c821edbc51896b653fd5f45170319a6f6ab03c2a",
"rev": "6e4233d5a2673ac2eb68a8c1eee91495732b07bb",
"type": "github"
},
"original": {
@ -545,11 +545,11 @@
"nixpkgs-stable": []
},
"locked": {
"lastModified": 1691830846,
"narHash": "sha256-ffR5maL8R4gsoF43YZRSBVzB7qYxzG+Ssjjktg80Wy4=",
"lastModified": 1691915920,
"narHash": "sha256-4pitrahUZc1ftIw38CelScd+JYGUVZ4mQTMe3VAz44c=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "5f5d9a3c8bc247eb574823b9f16a79e054dafe73",
"rev": "32603de0dc988d60a7b80774dd7aed1083cd9629",
"type": "github"
},
"original": {

View File

@ -11,6 +11,7 @@ function open_or_create_file(tfilename)
vim.cmd(':e ' .. newfilepath)
end
-- Mapping data with "desc" stored directly by vim.keymap.set().
--
-- Please use this mappings table to set keyboard mapping since this is the
@ -19,13 +20,18 @@ end
return {
-- first key is the mode
n = {
-- Don't error if file doesn't exist
["gf"] = { function() open_or_create_file(vim.fn.expand("<cfile>")) end, desc = "Create file" },
["<leader>*"] = { function() require("telescope.builtin").grep_string() end, desc = "Find for word under cursor", },
["<leader><leader>"] = { function() require("telescope.builtin").find_files() end, desc = "Find files" },
-- second key is the lefthand side of the map
-- navigate buffer tabs with `H` and `L`
-- L = {
-- function() require("astronvim.utils.buffer").nav(vim.v.count > 0 and vim.v.count or 1) end,
-- desc = "Next buffer",
-- },
-- H = {
-- function() require("astronvim.utils.buffer").nav(-(vim.v.count > 0 and vim.v.count or 1)) end,
-- desc = "Previous buffer",
-- },
-- mappings seen under group name "Buffer"
["<leader>bn"] = { "<cmd>tabnew<cr>", desc = "New tab" },
["<leader>bD"] = {
function()
require("astronvim.utils.status").heirline.buffer_picker(function(bufnr) require("astronvim.utils.buffer").close(bufnr) end)
@ -37,6 +43,11 @@ return {
["<leader>b"] = { name = "Buffers" },
-- quick save
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
-- Don't error if file doesn't exist
["gf"] = { function() open_or_create_file(vim.fn.expand("<cfile>")) end, desc = "Create file" },
["<leader>*"] = { function() require("telescope.builtin").grep_string() end, desc = "Find for word under cursor", },
["<leader><leader>"] = { function() require("telescope.builtin").find_files() end, desc = "Find files" },
},
t = {
-- setting a mapping to false will disable it

View File

@ -16,6 +16,7 @@ return {
diagnostics_mode = 3, -- set the visibility of diagnostics in the UI (0=off, 1=only show in status line, 2=virtual text off, 3=all on)
icons_enabled = true, -- disable icons in the UI (disable if no nerd font is available, requires :PackerSync after changing)
ui_notifications_enabled = true, -- disable notifications when toggling UI elements
resession_enabled = false, -- enable experimental resession.nvim session management (will be default in AstroNvim v4)
},
}
-- If you need more control, you can use the function()...end notation

View File

@ -88,11 +88,12 @@ lib.mapAttrsToList
};
}
// (lib.genAttrs [
"borgbackup-turingmachine"
"borgbackup-eve"
"borgbackup-nfs-home"
"borgbackup-nfs-share"
"borgbackup-nixpkgs-update"
"borgbackup-job-turingmachine.service"
"borgbackup-job-eve.service"
"borgbackup-job-nfs-home.service"
"borgbackup-job-nfs-share.service"
# TODO: rename
"borgbackup-matchbox"
]
(name: {
condition = ''absent_over_time(task_last_run{name="${name}"}[1d])'';

View File

@ -2,11 +2,11 @@
sops.secrets.borgbackup-passphrase = { };
sops.secrets.borgbackup-ssh = { };
systemd.services.borgbackup-job-eva.serviceConfig.ReadWritePaths = [
systemd.services.borgbackup-job-eve.serviceConfig.ReadWritePaths = [
"/var/log/telegraf"
];
services.borgbackup.jobs.eva = {
services.borgbackup.jobs.eve = {
paths = [
"/home"
"/etc"
@ -48,7 +48,7 @@
preHook = "set -x";
postHook = ''
cat > /var/log/telegraf/borgbackup-eve <<EOF
cat > /var/log/telegraf/borgbackup-job-eve.service <<EOF
task,frequency=daily last_run=$(date +%s)i,state="$([[ $exitStatus == 0 ]] && echo ok || echo fail)"
EOF
'';

View File

@ -3,7 +3,7 @@
, pkgs
, ...
}:
with builtins; let
let
backupPath = "borg@blob64.r:/zdata/borg/turingmachine";
in
{
@ -57,7 +57,7 @@ in
ssh-add ${config.sops.secrets.ssh-borgbackup.path}
'';
postHook = ''
cat > /var/log/telegraf/borgbackup-turingmachine <<EOF
cat > /var/log/telegraf/borgbackup-job-turingmachine.service <<EOF
task,frequency=daily last_run=$(date +%s)i,state="$([[ $exitStatus == 0 ]] && echo ok || echo fail)"
EOF
'';

View File

@ -1,3 +0,0 @@
{
mic92.telegraf.mode = "push";
}

@ -1 +1 @@
Subproject commit ff95db2e8906e912ef7b27e8c168b56190b7d37b
Subproject commit 6d059a3634c4880e8c9bb30ae565465601fb5bd2