1
0
Fork 0

Update deps

This commit is contained in:
Daniel Kempkens 2023-07-07 19:57:55 +02:00
parent 946cc0fda1
commit cde3cc1571
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
9 changed files with 25 additions and 38 deletions

View file

@ -28,8 +28,6 @@
fedifetcher-config = { fedifetcher-config = {
file = ./fedifetcher/config.age; file = ./fedifetcher/config.age;
symlink = false;
path = "/var/lib/fedifetcher/config.json";
}; };
linkding-environment = { linkding-environment = {

View file

@ -276,11 +276,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688552611, "lastModified": 1688731042,
"narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=", "narHash": "sha256-D1p/LLP1SpDYjutt9W+O5Ek+XGdszsjYjvL30ad++OY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85", "rev": "34db2f05219bcb0e41cc85490e4c338e2405546c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +389,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1688718598, "lastModified": 1688749462,
"narHash": "sha256-brBQ6kgCYQM1Xbtt84um96q5jptvTn+VGFKXNKL5Zkc=", "narHash": "sha256-/rC/KqMMUyVEcEkvQp9Y20rscU3RbrWtzUrK2RcqsoA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54303b65ef01f701d3a727b0df9feba5ce0a0495", "rev": "93d6f73da121e49bafe04dc1be5e6cf04b18a8d5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -66,12 +66,16 @@
:callback #(update-cache-gitsigns $1.buf) :callback #(update-cache-gitsigns $1.buf)
:group augroup :group augroup
:desc "Update cached gitsigns signs"}) :desc "Update cached gitsigns signs"})
(aucmd [:BufWipeout :BufWritePre] (aucmd :BufWipeout
{:callback (fn [args] {:callback (fn [args]
(tset cache :diagnostics args.buf nil) (tset cache :diagnostics args.buf nil)
(tset cache :gitsigns args.buf nil)) (tset cache :gitsigns args.buf nil))
:group augroup :group augroup
:desc "Clear sign cache for current buffer"}) :desc "Clear sign cache for current buffer"})
(aucmd :BufWritePre
{:callback #(tset cache :diagnostics $1.buf nil)
:group augroup
:desc "Reset diagnostic signs on save"})
;; Line Number ;; Line Number
(set mod.line-number {:condition #(or (o.number:get) (o.relativenumber:get)) (set mod.line-number {:condition #(or (o.number:get) (o.relativenumber:get))
1 statusline.push-right 1 statusline.push-right

View file

@ -47,7 +47,9 @@
;; Custom ;; Custom
(lsp.elixirls.setup (->> {:cmd [:elixir-ls]} (lsp.elixirls.setup (->> {:cmd [:elixir-ls]}
(vim.tbl_extend :force default-config))) (vim.tbl_extend :force default-config)))
(lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}} ;(lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}
; (vim.tbl_extend :force default-config)))
(lsp.nixd.setup (->> {:settings {:formatting {:command [:nixpkgs-fmt]}}}
(vim.tbl_extend :force default-config))) (vim.tbl_extend :force default-config)))
(let [inlay-hints {:includeInlayParameterNameHints :all (let [inlay-hints {:includeInlayParameterNameHints :all
:includeInlayParameterNameHintsWhenArgumentMatchesName false :includeInlayParameterNameHintsWhenArgumentMatchesName false

View file

@ -61,6 +61,7 @@ args@{ pkgs, config, lib, ... }:
hyperfine hyperfine
lnav lnav
mtr mtr
nix-tree
nix-output-monitor nix-output-monitor
nurl nurl
parallel parallel

View file

@ -26,6 +26,7 @@ in
# LSP # LSP
fennel-ls fennel-ls
lua-language-server
nil nil
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs
@ -33,7 +34,7 @@ in
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 nixd
taplo-lsp taplo-lsp
# Diagnostic Tools # Diagnostic Tools

View file

@ -499,8 +499,8 @@ in
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lukas-reineke"; owner = "lukas-reineke";
repo = "indent-blankline.nvim"; repo = "indent-blankline.nvim";
rev = "fedad189e6ab1037939b79d32b7acaf05a0d4fb0"; rev = "4541d690816cb99a7fc248f1486aa87f3abce91c";
sha256 = "0v29jg8hm388r9w537ij1r96n4i8zh1y7yipdr875xdkdfrvia20"; sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

View file

@ -1,14 +1,6 @@
{ config, ... }: { pkgs, config, ... }:
let
podman = config.virtualisation.podman.package;
image = "ghcr.io/nanos/fedifetcher:latest";
in
{ {
systemd.tmpfiles.rules = [
"d /var/lib/fedifetcher 0744 root root"
];
systemd.services.fedifetcher = { systemd.services.fedifetcher = {
description = "FediFetcher"; description = "FediFetcher";
wants = [ "mastodon-web.service" "mastodon-wait-for-available.service" ]; wants = [ "mastodon-web.service" "mastodon-wait-for-available.service" ];
@ -16,23 +8,12 @@ in
# wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
startAt = "*:0/25"; startAt = "*:0/25";
serviceConfig =
let
data = "/var/lib/fedifetcher:/app/artifacts";
in
{
Type = "oneshot";
ExecStart = "${podman}/bin/podman run --name fedifetcher -v ${data} --rm ${image} --config=/app/artifacts/config.json";
};
};
systemd.services.fedifetcher-updater = {
description = "FediFetcher Updater";
startAt = "daily";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${podman}/bin/podman pull ${image}"; DynamicUser = true;
StateDirectory = "fedifetcher";
LoadCredential = "config.json:${config.age.secrets.fedifetcher-config.path}";
ExecStart = "${pkgs.fedifetcher}/bin/fedifetcher --config=%d/config.json";
}; };
}; };
} }