From 639685ce904ebb837954e1334eb5fa8f826d12e2 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Wed, 1 Nov 2023 15:28:01 +0100 Subject: [PATCH] fix: update R2 token, remove currently not building yamlfix from devshell --- flake.nix | 2 -- nixos/services/chaotic/chaotic.nix | 4 +--- nixos/services/monitoring/monitoring.nix | 2 +- secrets | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index ec455ce..37c000a 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,6 @@ nixpkgs-fmt.enable = true; prettier.enable = true; statix.enable = true; - yamllint.enable = true; }; src = ./.; }; @@ -172,7 +171,6 @@ { package = "manix"; } { package = "nixos-install-tools"; } { package = "pre-commit"; } - { package = "yamlfix"; } { name = "apply"; help = "Applies the infra-nix configuration pushed to the servers"; diff --git a/nixos/services/chaotic/chaotic.nix b/nixos/services/chaotic/chaotic.nix index f4165c7..251ed46 100644 --- a/nixos/services/chaotic/chaotic.nix +++ b/nixos/services/chaotic/chaotic.nix @@ -1,8 +1,8 @@ { config +, garuda-lib , lib , pkgs , sources -, garuda-lib , ... }: with lib; @@ -36,9 +36,7 @@ let propagatedBuildInputs = with pkgs.python3.pkgs; [ appdirs colorama - # Pinned python-telegram-bot 13.15 python-telegram-bot - # (callPackage (builtins.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/a0389fe5c691f80bb794a0aa9731d5e4ad6752ac/pkgs/development/python-modules/python-telegram-bot/default.nix"; sha256 = "sha256:1xz49dzydfyv1xksm8apj9v6r2px15339xznkr8zqjgzzhvarjbg"; }) { }) ]; }; repodir = "${cfg.repos-dir}/${cfg.db-name}"; diff --git a/nixos/services/monitoring/monitoring.nix b/nixos/services/monitoring/monitoring.nix index 4771e44..0d194cd 100644 --- a/nixos/services/monitoring/monitoring.nix +++ b/nixos/services/monitoring/monitoring.nix @@ -54,7 +54,7 @@ in { enable = true; # https://github.com/nix-community/nixpkgs.lib/commit/1111263e3da005fe29fd72b87283fc17bfba2d81 - package = (pkgs.netdata.override { withCloud = true; }); + package = pkgs.netdata.override { withCloud = true; }; # Extra Python packages required for Netdata to function python.extraPackages = ps: [ ps.psycopg2 ]; diff --git a/secrets b/secrets index 002d1cc..559fe45 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 002d1ccc43dadbe9d127e246f8780dc37c105ea4 +Subproject commit 559fe457f808e990c5196a9bf9f69f53826a21a5