From cde3cc15718e2363b6a32fedb9127c5283c7cdfe Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 7 Jul 2023 19:57:55 +0200 Subject: [PATCH] Update deps --- agenix/hosts/tanker/config.nix | 2 -- agenix/hosts/tanker/fedifetcher/config.age | Bin 580 -> 688 bytes flake.lock | 12 ++++----- home/config/nvim/nifoc/statuscolumn.fnl | 6 ++++- home/config/nvim/plugins/lsp.fnl | 6 +++-- home/hosts/Styx.nix | 1 + home/programs/nvim/default.nix | 3 ++- home/programs/nvim/plugins.nix | 4 +-- system/nixos/fedifetcher.nix | 29 ++++----------------- 9 files changed, 25 insertions(+), 38 deletions(-) diff --git a/agenix/hosts/tanker/config.nix b/agenix/hosts/tanker/config.nix index 5b5ba7b..c2930c1 100644 --- a/agenix/hosts/tanker/config.nix +++ b/agenix/hosts/tanker/config.nix @@ -28,8 +28,6 @@ fedifetcher-config = { file = ./fedifetcher/config.age; - symlink = false; - path = "/var/lib/fedifetcher/config.json"; }; linkding-environment = { diff --git a/agenix/hosts/tanker/fedifetcher/config.age b/agenix/hosts/tanker/fedifetcher/config.age index 967c12b8fbf0500f5605d7f2d76ca553544ef822..101a14573b1e00ce2d0b9c1cc8947b8cc2879f5b 100644 GIT binary patch delta 656 zcmV;B0&o4q1h55=EPr)yVsLO~M@3I^G&ycUVopL%Rz*i+XHjr(M_NurZ$W8qR8x3z zH!?YTV+vMDHY-FqXK!;&MK^h3L1lVwdU!HsF==LDZgOdGQBg=sQ&C7-H*PpMV+t)k zAaiqQEoEdfH8n9gAZbrHFEnQ$OJR0Wb2mpeNj7CvFH22tPJd5CP)KxYR%=jYOJQqk zSZ-)obvafza#Thz3Uo_jcTzJkD{MArZ$xTXPB>a(FEvP0XmM~#VM{nTZZ=Iyb#!l0 zQB65f3N1b$LqtI{R4r$6Wnpt=AbeF(H8eALASXdeMN=sXFG^@pZ8Sw^Gfrq_WL0Wn zS#DA%V+t=y zGc|8=QB_GaaZqe(F*Q(OO*dn3OH*WL3N0-yAVe!lPEK_;FnBUbV{TprGf=QfpRUu|T7g zRfLHS9k9CajpZ$xHNPHSpYd3Z`^NOoy&dUrBb zIbv3NMG8?#WHd}iIYf9@SujN_Wo|=bOj3DHL3(U!Sa?l1Fm6X|V`xfdPI_u*MG7rG zAaiqQEoEdfH8n9gAZbrHFEnQ$QfF3rN>_PeGd5~LOmi!4H-B?ZG;UQeb2V2-Q)(|U zPg-ebcV>5ZG> {:cmd [:elixir-ls]} (vim.tbl_extend :force default-config))) - (lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}} - (vim.tbl_extend :force default-config))) + ;(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))) (let [inlay-hints {:includeInlayParameterNameHints :all :includeInlayParameterNameHintsWhenArgumentMatchesName false :includeInlayFunctionParameterTypeHints true diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index bdd1f2f..68e08b1 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -61,6 +61,7 @@ args@{ pkgs, config, lib, ... }: hyperfine lnav mtr + nix-tree nix-output-monitor nurl parallel diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 069c0b1..3e5feb2 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -26,6 +26,7 @@ in # LSP fennel-ls + lua-language-server nil nodePackages.bash-language-server nodePackages.dockerfile-language-server-nodejs @@ -33,7 +34,7 @@ in nodePackages.typescript-language-server nodePackages.vscode-langservers-extracted nodePackages.yaml-language-server - lua-language-server + nixd taplo-lsp # Diagnostic Tools diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 43da133..3bd0545 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -499,8 +499,8 @@ in src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "fedad189e6ab1037939b79d32b7acaf05a0d4fb0"; - sha256 = "0v29jg8hm388r9w537ij1r96n4i8zh1y7yipdr875xdkdfrvia20"; + rev = "4541d690816cb99a7fc248f1486aa87f3abce91c"; + sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr"; fetchSubmodules = false; }; }; diff --git a/system/nixos/fedifetcher.nix b/system/nixos/fedifetcher.nix index 0a865f4..fa0f03e 100644 --- a/system/nixos/fedifetcher.nix +++ b/system/nixos/fedifetcher.nix @@ -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 = { description = "FediFetcher"; wants = [ "mastodon-web.service" "mastodon-wait-for-available.service" ]; @@ -16,23 +8,12 @@ in # wantedBy = [ "multi-user.target" ]; 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 = { 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"; }; }; }