From 2df718cea9fe9941216f302c73c11b84b597ade1 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 20 Mar 2022 19:04:19 +0100 Subject: [PATCH] Clean up remnants from qbittorrent migration --- flake.lock | 72 ++----------------- flake.nix | 8 --- .../userscripts/better-nginx-index.user.js | 3 - 3 files changed, 5 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 23d0066..fdd7f0d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,49 +1,5 @@ { "nodes": { - "AriaNg": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1641157028, - "narHash": "sha256-Da9GR1v2niJCU02NnC3aKLDMkUDEN2GULFgBQAT3tsY=", - "ref": "master", - "rev": "ea678a781a34613cf67c9c81d4f176d531f40630", - "revCount": 604, - "type": "git", - "url": "https://git.sbruder.de/simon/AriaNg" - }, - "original": { - "type": "git", - "url": "https://git.sbruder.de/simon/AriaNg" - } - }, - "aria2_exporter": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1621073204, - "narHash": "sha256-NXjp8rgWsNwX3WR8F11TAGxYoi8QZjrmuc5nsj/IjdQ=", - "owner": "sbruder", - "repo": "aria2_exporter", - "rev": "4b170f34720be5da2d2b8e791ff891624fe40e51", - "type": "github" - }, - "original": { - "owner": "sbruder", - "repo": "aria2_exporter", - "type": "github" - } - }, "bang-evaluator": { "inputs": { "flake-utils": [ @@ -185,16 +141,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1619464443, - "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=", + "lastModified": 1647490331, + "narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17", + "rev": "2c66a7a6e036971c4847cca424125f55b9eb0b0b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } @@ -241,26 +197,8 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1647490331, - "narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c66a7a6e036971c4847cca424125f55b9eb0b0b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "AriaNg": "AriaNg", - "aria2_exporter": "aria2_exporter", "bang-evaluator": "bang-evaluator", "flake-utils": "flake-utils", "home-manager": "home-manager", @@ -268,7 +206,7 @@ "krops": "krops", "nix-pre-commit-hooks": "nix-pre-commit-hooks", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-overlay": "nixpkgs-overlay", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index ad5013a..63694bf 100644 --- a/flake.nix +++ b/flake.nix @@ -34,13 +34,6 @@ bang-evaluator.url = "git+https://git.sbruder.de/simon/bangs"; bang-evaluator.inputs.flake-utils.follows = "flake-utils"; bang-evaluator.inputs.nixpkgs.follows = "nixpkgs"; - - aria2_exporter.url = "github:sbruder/aria2_exporter"; - aria2_exporter.inputs.flake-utils.follows = "flake-utils"; - aria2_exporter.inputs.nixpkgs.follows = "nixpkgs"; - - AriaNg.url = "git+https://git.sbruder.de/simon/AriaNg"; - AriaNg.inputs.flake-utils.follows = "flake-utils"; }; outputs = @@ -206,7 +199,6 @@ home-manager.nixosModules.home-manager sops-nix.nixosModules.sops - aria2_exporter.nixosModules.aria2_exporter bang-evaluator.nixosModules.bang-evaluator ]) ++ (builtins.attrValues nixpkgs-overlay.nixosModules) ++ extraModules; diff --git a/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js b/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js index d4587e2..4cb8eaa 100644 --- a/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js +++ b/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js @@ -39,9 +39,6 @@ function parseLine(line) { function processLine(line) { meta = parseLine(line) - if (meta.filename.endsWith('.aria2') || meta.filename.endsWith('.torrent') || meta.filename === 'dht.dat' || meta.filename === 'torrents' || meta.filename === 'torrents.old' || meta.filename === 'history.csv') { - return '' - } return `${meta.filename}${meta.size === '-' ? '-' : humanFileSize(meta.size)}` }