From 4a01d917e36456b0a99f2ea955dc2f88142c29af Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 4 Nov 2022 20:45:09 +0100 Subject: [PATCH] update --- flake.lock | 118 +++++++++++++++----------- nixos/machines/robi/transmission2.nix | 2 +- nixos/system/server/netdata.nix | 19 ++++- 3 files changed, 84 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 7aaf346..4678b73 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1665350797, - "narHash": "sha256-7XAcfqRlsJf+y7174WcKJzHoZlq5ChrrymShL0xj8QY=", + "lastModified": 1667072567, + "narHash": "sha256-z8ciml6BOzVDX3MbRY22C5GonJrDxi2xrVuS6Gyxorc=", "owner": "zhaofengli", "repo": "colmena", - "rev": "872949504befb9b5540e69f846c6965def7150f9", + "rev": "5432fe488ebec7ee30aaea5fb18a759e30e59612", "type": "github" }, "original": { @@ -61,23 +61,24 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1660901074, - "narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=", + "lastModified": 1662497747, + "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", "type": "github" }, "original": { "owner": "doomemacs", - "ref": "master", "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", "type": "github" } }, "doom-emacs-nix": { "inputs": { "doom-emacs": "doom-emacs", + "doom-modeline": "doom-modeline", "doom-snippets": "doom-snippets", "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", @@ -106,11 +107,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1664622347, - "narHash": "sha256-pJTnEG68PhrXjpkfz/784BlcxaHgV06b1cUVGRxhMdw=", + "lastModified": 1667054602, + "narHash": "sha256-U3Q3opq5mGaHZijdwbM+GUziELb31LJKW6/dvO9yzRQ=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "b65e204ce9d20b376acc38ec205d08007eccdaef", + "rev": "e9a0c496d813c79857e38511708eefc80ea1f4fe", "type": "github" }, "original": { @@ -119,6 +120,23 @@ "type": "github" } }, + "doom-modeline": { + "flake": false, + "locked": { + "lastModified": 1648449595, + "narHash": "sha256-HjULFxtNDAJ7PDpy/e2bhoDYgBjwGpBdBoTY135puYA=", + "owner": "seagle0128", + "repo": "doom-modeline", + "rev": "ce9899f00af40edb78f58b9af5c3685d67c8eed2", + "type": "github" + }, + "original": { + "owner": "seagle0128", + "repo": "doom-modeline", + "rev": "ce9899f00af40edb78f58b9af5c3685d67c8eed2", + "type": "github" + } + }, "doom-snippets": { "flake": false, "locked": { @@ -138,11 +156,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1664478431, - "narHash": "sha256-XTPklm/+e2UfIitB0+s/fKTheMJSw3G1p+t0SsBCuo4=", + "lastModified": 1666900021, + "narHash": "sha256-KEDx6LhRMxEdLXL1jF1LNIm+QCtOCcKcFmTJrA/iU3E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6c78924bc5b6daaf98c0dbe63bdfcf80e6433f4b", + "rev": "b3f81bcbda84bf2ef957cfff6cf89aedbdfa2be9", "type": "github" }, "original": { @@ -154,11 +172,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1666156198, - "narHash": "sha256-mTgPP4OIYerBpn9vVwcVdLn4GDjmlsZiqrVxHqZTiNo=", + "lastModified": 1667478861, + "narHash": "sha256-zXBOE+4plWIs/hnzo58+LiwfEAnJM0YDnW4xVgVFMFA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "858214991200eccc2f0a4f929f4baa0ffd8281c6", + "rev": "620f79f8ca3c3f30536a9a3cd27e74fc6e34af36", "type": "github" }, "original": { @@ -452,11 +470,11 @@ ] }, "locked": { - "lastModified": 1665996265, - "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=", + "lastModified": 1667469118, + "narHash": "sha256-2YrDEmeYKCDOCuDDrjHoaUOVO3hyh9cIrWAJET1HPg8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891", + "rev": "d78b3488a76d251701ab58a9b7f0dd092b806c1e", "type": "github" }, "original": { @@ -566,11 +584,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1665870850, - "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -589,11 +607,11 @@ ] }, "locked": { - "lastModified": 1657716877, - "narHash": "sha256-VZrLebgC/0lioEYh8oqJAhbfMyGtVNp6ASevf6t11IE=", + "lastModified": 1667229616, + "narHash": "sha256-FZXQ7r1acO7s8v8kzUug1vamZ4T0kPqTmYM2ncuqM/s=", "owner": "nix-community", "repo": "nixpkgs-fmt", - "rev": "3c4addcc0aa9a6eb9fb64d9206733110d1153a52", + "rev": "cddd029dea02942fe2e1d15bc5fef71c8a3acbfd", "type": "github" }, "original": { @@ -604,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1666109165, - "narHash": "sha256-BMLyNVkr0oONuq3lKlFCRVuYqF75CO68Z8EoCh81Zdk=", + "lastModified": 1667231093, + "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32096899af23d49010bd8cf6a91695888d9d9e73", + "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458", "type": "github" }, "original": { @@ -620,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1666056570, - "narHash": "sha256-e7EkIY68Tp7NKyp9JSHh6CgPPdsKYYWxiL4wZQN8Cwg=", + "lastModified": 1667318659, + "narHash": "sha256-mRXqCdlnxPgm3Wk7mNAOanl7B3Q3U5scYTEiyYmNEOE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47edaa313fc3767ce3026037a5b62352f22f3602", + "rev": "b3a8f7ed267e0a7ed100eb7d716c9137ff120fe3", "type": "github" }, "original": { @@ -650,11 +668,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1665830552, - "narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=", + "lastModified": 1667055375, + "narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a", + "rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba", "type": "github" }, "original": { @@ -699,11 +717,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1664493874, - "narHash": "sha256-8zLosjfQX0aR5HprtCeiSqN1pfB+GEUF9AULk6WRcR4=", + "lastModified": 1666586252, + "narHash": "sha256-cwYEMnsv8kreTPKslM2yz59I4zm331w4WU4OHGzcslc=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "fe1f4f2ccf040deff9c57288d987f17cc2da321f", + "rev": "48b237d9e21a4edf528d4bd1ed99d1f3757e4931", "type": "github" }, "original": { @@ -782,11 +800,11 @@ "private_assets": { "flake": false, "locked": { - "lastModified": 1663253057, - "narHash": "sha256-uj5eO4c8v1ybm7pp0SXswFTmGqdTgf1Il3UEiFrEymw=", + "lastModified": 1666443661, + "narHash": "sha256-8cAQush+8XSIa4UZi3MtJljaUjg/tUUBypny/CHvGBQ=", "ref": "main", - "rev": "c9457b3bb7edd04f1a51ade9868692ee1902d511", - "revCount": 2, + "rev": "ff82fc815f2699a29ed549337e77d77971ad6cfe", + "revCount": 3, "type": "git", "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git" }, @@ -799,11 +817,11 @@ "retiolum": { "flake": false, "locked": { - "lastModified": 1665574902, - "narHash": "sha256-rwhh+C0u5Z78X9AKDQf/SxISf4+Z8YcYVGjoS6er8OI=", + "lastModified": 1667116880, + "narHash": "sha256-d4kiPSZ2rRTwNJAAqYFH+zxfYyUl5QeMh4X5eOH94s8=", "owner": "krebs", "repo": "retiolum", - "rev": "289712a3becfec77dab8963d450b2afe616569e0", + "rev": "090210e31fa6f28dbee523fbaa0369743780f43b", "type": "github" }, "original": { @@ -815,11 +833,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1664012352, - "narHash": "sha256-Pu5p6HqIO2wvWiTEhsQyIuwlWEIa1GjO3EDXosznyYE=", + "lastModified": 1665992801, + "narHash": "sha256-bqNgaBT6WPfumhdG1VPZ6ngn0QA9RDuVtVJtVwxbOd4=", "owner": "hakimel", "repo": "reveal.js", - "rev": "468132320d6e072abd1297d7cc24766a2b7a832d", + "rev": "f6f657b627f9703e32414d8d3f16fb49d41031cb", "type": "github" }, "original": { @@ -921,11 +939,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1666078616, - "narHash": "sha256-ifW3GhIxuKv5+AidKAPpmtS8M7TY2d7VS6eFnaCFdfU=", + "lastModified": 1667427533, + "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e470d4eac115aa793437e52e84e7f9abdce236b", + "rev": "486b4455da16272c1ed31bc82adcdbe7af829465", "type": "github" }, "original": { diff --git a/nixos/machines/robi/transmission2.nix b/nixos/machines/robi/transmission2.nix index 5d8eca4..563ea89 100644 --- a/nixos/machines/robi/transmission2.nix +++ b/nixos/machines/robi/transmission2.nix @@ -40,7 +40,7 @@ let (source: target: '' if [[ "$TR_TORRENT_DIR" == "${source}" ]] then - cp -val "$TR_TORRENT_DIR/$TR_TORRENT_NAME" "${target}/$TR_TORRENT_NAME" + cp -lR "$TR_TORRENT_DIR/$TR_TORRENT_NAME" "${target}/$TR_TORRENT_NAME" fi '') copy_map); diff --git a/nixos/system/server/netdata.nix b/nixos/system/server/netdata.nix index 5f33e28..68e1ea3 100644 --- a/nixos/system/server/netdata.nix +++ b/nixos/system/server/netdata.nix @@ -5,11 +5,22 @@ config = { global = { "memory mode" = "ram"; - "debug log" = "none"; - "access log" = "none"; - "error log" = "syslog"; }; }; - + configDir."python.d.conf" = pkgs.writeText "python.d.conf" '' + example: yes + default_run: no + samba: yes + ''; }; + + # add samba to path of python plugin + systemd.services.netdata.path = [ pkgs.sudo pkgs.samba ]; + systemd.services.netdata.serviceConfig.CapabilityBoundingSet = [ "~" ]; + security.sudo.extraConfig = '' + netdata ALL=(root) NOPASSWD: ${pkgs.samba}/bin/smbstatus + netdata ALL=(root) NOPASSWD: /run/current-system/sw/bin/smbstatus + ''; + + }