commit f57f045967f41609dcb26fc50b08ece50d869122
parent c516ce2b3eedef70a36dbd499263a83743e02070
Author: mtmn <miro@haravara.org>
Date: Wed, 27 May 2026 13:08:30 +0200
chore: bandcamp cleanup
Diffstat:
8 files changed, 22 insertions(+), 318 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -24,28 +24,6 @@
"type": "github"
}
},
- "bandeno": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "dir": "bandeno",
- "lastModified": 1779567620,
- "narHash": "sha256-LQQ0nLrYdIOUxS0v0ityqTWCBROIdUFWeCNQexJ4b6o=",
- "owner": "~mtmn",
- "repo": "tools",
- "rev": "913b85b9a8acaa222929e52f6cd372abe54c3b1c",
- "type": "sourcehut"
- },
- "original": {
- "dir": "bandeno",
- "owner": "~mtmn",
- "repo": "tools",
- "type": "sourcehut"
- }
- },
"corpus": {
"inputs": {
"elm2nix": "elm2nix",
@@ -323,6 +301,22 @@
"type": "github"
}
},
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1779536132,
+ "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"ragenix": {
"inputs": {
"agenix": "agenix",
@@ -349,7 +343,6 @@
},
"root": {
"inputs": {
- "bandeno": "bandeno",
"corpus": "corpus",
"deploy-rs": "deploy-rs",
"disko": "disko",
@@ -383,9 +376,7 @@
},
"shirts": {
"inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1779564727,
diff --git a/flake.nix b/flake.nix
@@ -29,14 +29,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- bandeno = {
- url = "sourcehut:~mtmn/tools?dir=bandeno";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
shirts = {
url = "sourcehut:~mtmn/shirts";
- inputs.nixpkgs.follows = "nixpkgs";
};
corpus = {
diff --git a/home.nix b/home.nix
@@ -50,7 +50,8 @@
auto-optimise-store = true;
warn-dirty = false;
experimental-features = ["nix-command" "flakes"];
- inherit (import ./lib/nix-cache.nix) substituters trusted-public-keys;
+ substituters = lib.mkDefault (import ./lib/nix-cache.nix).substituters;
+ trusted-public-keys = lib.mkDefault (import ./lib/nix-cache.nix).trusted-public-keys;
};
gc = {
automatic = true;
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -19,6 +19,7 @@
vdirsyncer
khal
tiny
+ ungoogled-chromium
];
data = [
diff --git a/lib/nix-cache.nix b/lib/nix-cache.nix
@@ -3,10 +3,12 @@
"https://cache.nixos.org"
"https://nix-community.cachix.org"
"https://cache.garnix.io"
+ "https://attic.haravara.org/public"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+ "public:GSx/SAvm6t21GP8+jTcVy51bZWCguZwKdZT7fYyYaOk="
];
}
diff --git a/modules/mixins/dotfiles/config/newsraft/feeds b/modules/mixins/dotfiles/config/newsraft/feeds
@@ -114,221 +114,6 @@ https://vinylvagabond.substack.com/feed
https://cloudcollecting.substack.com/feed
-
-@ bandcamp fans < reload-period 0
-https://bc.mtmn.name/?fan=niccoloexad
-https://bc.mtmn.name/?fan=wonja
-https://bc.mtmn.name/?fan=thetrilogytapes
-https://bc.mtmn.name/?fan=maxaxa
-https://bc.mtmn.name/?fan=andriykostyukov
-https://bc.mtmn.name/?fan=c_aromando
-https://bc.mtmn.name/?fan=cccconrad
-https://bc.mtmn.name/?fan=carlosdelascuevas
-https://bc.mtmn.name/?fan=curated_by
-https://bc.mtmn.name/?fan=philinamaze
-https://bc.mtmn.name/?fan=abdonoval
-https://bc.mtmn.name/?fan=ian_mcdowell
-https://bc.mtmn.name/?fan=eehaw
-https://bc.mtmn.name/?fan=trishak
-https://bc.mtmn.name/?fan=lolobcr
-https://bc.mtmn.name/?fan=weirdpebble
-https://bc.mtmn.name/?fan=br_dge
-https://bc.mtmn.name/?fan=senot
-https://bc.mtmn.name/?fan=luuuc
-https://bc.mtmn.name/?fan=personnealienee
-https://bc.mtmn.name/?fan=zitinio
-https://bc.mtmn.name/?fan=peak_flow
-https://bc.mtmn.name/?fan=pugilisttunes
-https://bc.mtmn.name/?fan=willmemotone
-https://bc.mtmn.name/?fan=oortcloud
-https://bc.mtmn.name/?fan=shawnreynaldo
-https://bc.mtmn.name/?fan=finnoftomland
-https://bc.mtmn.name/?fan=poponly
-https://bc.mtmn.name/?fan=wejamencona
-https://bc.mtmn.name/?fan=avsluta
-https://bc.mtmn.name/?fan=microchic
-https://bc.mtmn.name/?fan=stoneinfocus
-https://bc.mtmn.name/?fan=vannesacarlton
-https://bc.mtmn.name/?fan=kuscheln
-https://bc.mtmn.name/?fan=kmru
-https://bc.mtmn.name/?fan=theslowbrownfox
-https://bc.mtmn.name/?fan=seafood_soup
-https://bc.mtmn.name/?fan=akirayamagata
-https://bc.mtmn.name/?fan=tomcolebrook
-https://bc.mtmn.name/?fan=ludwigundotto
-https://bc.mtmn.name/?fan=hugoz
-https://bc.mtmn.name/?fan=rgb1
-https://bc.mtmn.name/?fan=limbotapes
-https://bc.mtmn.name/?fan=mvachuska
-https://bc.mtmn.name/?fan=iffiiffi
-https://bc.mtmn.name/?fan=ben_aguero
-https://bc.mtmn.name/?fan=akse
-https://bc.mtmn.name/?fan=sselevolave
-https://bc.mtmn.name/?fan=elephantjams
-https://bc.mtmn.name/?fan=sleekfata
-https://bc.mtmn.name/?fan=gibbin
-https://bc.mtmn.name/?fan=jrhartley
-https://bc.mtmn.name/?fan=time_snark
-https://bc.mtmn.name/?fan=jayfox16
-https://bc.mtmn.name/?fan=kumiaicho
-https://bc.mtmn.name/?fan=enimsajirol
-https://bc.mtmn.name/?fan=parcae
-https://bc.mtmn.name/?fan=wisecarver
-https://bc.mtmn.name/?fan=ysksaske
-https://bc.mtmn.name/?fan=sarahhwreath
-https://bc.mtmn.name/?fan=bossameow
-https://bc.mtmn.name/?fan=oomcl
-https://bc.mtmn.name/?fan=maxmackenzie
-
-
-@ bandcamp artists < reload-period 0
-https://bc.mtmn.name/?artist=tinarecords
-https://bc.mtmn.name/?artist=plasmasources
-https://bc.mtmn.name/?artist=worst-records
-https://bc.mtmn.name/?artist=detachrecordings
-https://bc.mtmn.name/?artist=5gatetemple
-https://bc.mtmn.name/?artist=hotreleases
-https://bc.mtmn.name/?artist=idorecords
-https://bc.mtmn.name/?artist=missile-records
-https://bc.mtmn.name/?artist=lostdomain
-https://bc.mtmn.name/?artist=abulmogard
-https://bc.mtmn.name/?artist=silhouettetapes1
-https://bc.mtmn.name/?artist=auralconduct
-https://bc.mtmn.name/?artist=southernlightsrec
-https://bc.mtmn.name/?artist=vladislavdelay
-https://bc.mtmn.name/?artist=hoganordrekords
-https://bc.mtmn.name/?artist=invisible-inc
-https://bc.mtmn.name/?artist=sizetenrecords
-https://bc.mtmn.name/?artist=bluenightjungle
-https://bc.mtmn.name/?artist=malrecordings
-https://bc.mtmn.name/?artist=blackteethrecords
-https://bc.mtmn.name/?artist=hayescollective
-https://bc.mtmn.name/?artist=alwootton
-https://bc.mtmn.name/?artist=chateauflight
-https://bc.mtmn.name/?artist=relationreset
-https://bc.mtmn.name/?artist=tapehiss
-https://bc.mtmn.name/?artist=glinted-records
-https://bc.mtmn.name/?artist=efficientspace
-https://bc.mtmn.name/?artist=punctumtapes
-https://bc.mtmn.name/?artist=emotional-response
-https://bc.mtmn.name/?artist=12thisle
-https://bc.mtmn.name/?artist=lowtec-workshop-records
-https://bc.mtmn.name/?artist=nonplusrecords
-https://bc.mtmn.name/?artist=fastcastle
-https://bc.mtmn.name/?artist=bardouinmusic
-https://bc.mtmn.name/?artist=blushtbc
-https://bc.mtmn.name/?artist=lakeway
-https://bc.mtmn.name/?artist=distal
-https://bc.mtmn.name/?artist=twtwlondon
-https://bc.mtmn.name/?artist=worshipbristol
-https://bc.mtmn.name/?artist=pressurerecords
-https://bc.mtmn.name/?artist=worship-productions
-https://bc.mtmn.name/?artist=zamzamrec
-https://bc.mtmn.name/?artist=digitalsting
-https://bc.mtmn.name/?artist=divisi62
-https://bc.mtmn.name/?artist=ana-sound
-https://bc.mtmn.name/?artist=kashual
-https://bc.mtmn.name/?artist=bizaarbazaar
-https://bc.mtmn.name/?artist=goo1
-https://bc.mtmn.name/?artist=doo-solution
-https://bc.mtmn.name/?artist=oscillasound
-https://bc.mtmn.name/?artist=appendixfiles
-https://bc.mtmn.name/?artist=limbotapes
-https://bc.mtmn.name/?artist=clam-pressure
-https://bc.mtmn.name/?artist=tomvalrecords
-https://bc.mtmn.name/?artist=29speedway1
-https://bc.mtmn.name/?artist=area127
-https://bc.mtmn.name/?artist=iliantape
-https://bc.mtmn.name/?artist=flxk1
-https://bc.mtmn.name/?artist=subglow
-https://bc.mtmn.name/?artist=northernelectronics
-https://bc.mtmn.name/?artist=nosejob
-https://bc.mtmn.name/?artist=nousklaer
-https://bc.mtmn.name/?artist=delsinrecords
-https://bc.mtmn.name/?artist=nullpunktrec
-https://bc.mtmn.name/?artist=nehzarecords
-https://bc.mtmn.name/?artist=midgar-records
-https://bc.mtmn.name/?artist=mapledeathrecords
-https://bc.mtmn.name/?artist=heatcrimes
-https://bc.mtmn.name/?artist=manaabundance
-https://bc.mtmn.name/?artist=naffrecordings
-https://bc.mtmn.name/?artist=pressuredome
-https://bc.mtmn.name/?artist=timedance
-https://bc.mtmn.name/?artist=cherche-encore
-https://bc.mtmn.name/?artist=glarc
-https://bc.mtmn.name/?artist=acolourfulstorm
-https://bc.mtmn.name/?artist=siamesetwinsrecords
-https://bc.mtmn.name/?artist=banoffeepiesrecords
-https://bc.mtmn.name/?artist=global-warming-records
-https://bc.mtmn.name/?artist=atoldiskz1
-https://bc.mtmn.name/?artist=comicsansrecords
-https://bc.mtmn.name/?artist=organicsigns
-https://bc.mtmn.name/?artist=bblisss
-https://bc.mtmn.name/?artist=omenwapta
-https://bc.mtmn.name/?artist=osare-editions
-https://bc.mtmn.name/?artist=brukrecords
-https://bc.mtmn.name/?artist=themothclub
-https://bc.mtmn.name/?artist=analog-records
-https://bc.mtmn.name/?artist=shaytoonrecords
-https://bc.mtmn.name/?artist=poorlyknituk
-https://bc.mtmn.name/?artist=nyegenyegetapes
-https://bc.mtmn.name/?artist=accidentalmeetings
-https://bc.mtmn.name/?artist=berceuseheroique
-https://bc.mtmn.name/?artist=pointless-geometry
-https://bc.mtmn.name/?artist=avonterrorcorps
-https://bc.mtmn.name/?artist=theyouthlabel
-https://bc.mtmn.name/?artist=westmineral
-https://bc.mtmn.name/?artist=motionward
-https://bc.mtmn.name/?artist=plaquebristol
-https://bc.mtmn.name/?artist=baroquesunburst
-https://bc.mtmn.name/?artist=maloca
-https://bc.mtmn.name/?artist=corruptterritories
-https://bc.mtmn.name/?artist=scopeotaku
-https://bc.mtmn.name/?artist=eclipsetribez
-https://bc.mtmn.name/?artist=warmwintersltd
-https://bc.mtmn.name/?artist=mappa
-https://bc.mtmn.name/?artist=brutaz
-https://bc.mtmn.name/?artist=heart
-https://bc.mtmn.name/?artist=crowdspacer
-https://bc.mtmn.name/?artist=unexplainedsoundsgroup
-https://bc.mtmn.name/?artist=zvukolom
-https://bc.mtmn.name/?artist=bigsciencerecords
-https://bc.mtmn.name/?artist=shukai
-https://bc.mtmn.name/?artist=flippendisks
-https://bc.mtmn.name/?artist=sneakersocialclub
-https://bc.mtmn.name/?artist=feveram
-https://bc.mtmn.name/?artist=wellstreetrecords
-https://bc.mtmn.name/?artist=stroomtv
-https://bc.mtmn.name/?artist=teenagemenopause
-https://bc.mtmn.name/?artist=redstonepress
-https://bc.mtmn.name/?artist=tempa
-https://bc.mtmn.name/?artist=tectonicrecordings
-https://bc.mtmn.name/?artist=northfieldrecords
-https://bc.mtmn.name/?artist=drownedbylocals
-https://bc.mtmn.name/?artist=ad93
-https://bc.mtmn.name/?artist=mindgamesmusic
-https://bc.mtmn.name/?artist=ruptureldn
-https://bc.mtmn.name/?artist=isla
-https://bc.mtmn.name/?artist=westernlore
-https://bc.mtmn.name/?artist=thetrilogytapes
-https://bc.mtmn.name/?artist=uvb-76music
-https://bc.mtmn.name/?artist=murmursrecordings
-https://bc.mtmn.name/?artist=shortspanrecords
-https://bc.mtmn.name/?artist=trule
-https://bc.mtmn.name/?artist=painmgmt
-https://bc.mtmn.name/?artist=canyoufeelthesun
-https://bc.mtmn.name/?artist=brainwavescrew
-https://bc.mtmn.name/?artist=yukumusic
-https://bc.mtmn.name/?artist=yesnowave
-https://bc.mtmn.name/?artist=fonstret
-https://bc.mtmn.name/?artist=nostilevo
-https://bc.mtmn.name/?artist=odyseerecordings
-https://bc.mtmn.name/?artist=akuphone
-https://bc.mtmn.name/?artist=annihayarecords
-https://bc.mtmn.name/?artist=xterea
-https://bc.mtmn.name/?artist=svbkvlt
-
-
@ music @ youtube < reload-period 120; item-rule "link NOT LIKE '%/shorts/%'"
https://www.youtube.com/feeds/videos.xml?channel_id=UCWPuTvilQQakGwM-MGkfvIQ R Tape Archive
https://www.youtube.com/feeds/videos.xml?channel_id=UCpQttkSFVS9cOLWnk4HoUxA Aeon Shaker IV
diff --git a/modules/services/bandeno.nix b/modules/services/bandeno.nix
@@ -1,70 +0,0 @@
-{
- config,
- lib,
- pkgs,
- inputs,
- haravara,
- ...
-}: let
- cfg = config.services.haravara.bandeno;
-
- bandeno-src = inputs.bandeno.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in {
- options.services.haravara.bandeno = {
- enable = lib.mkEnableOption "Bandeno - Bandcamp RSS feed proxy";
-
- port = lib.mkOption {
- type = lib.types.port;
- default = 9231;
- };
-
- host = lib.mkOption {
- type = lib.types.str;
- default = "127.0.0.1";
- };
-
- domain = lib.mkOption {
- type = lib.types.str;
- };
- };
-
- config = lib.mkIf cfg.enable {
- systemd.services.bandeno = {
- description = "Bandeno Service";
- wantedBy = ["multi-user.target"];
- after = ["network.target"];
-
- environment = {
- PORT = toString cfg.port;
- HOST = cfg.host;
- DENO_DIR = "/var/lib/bandeno/.cache";
- HOME = "/var/lib/bandeno";
- };
-
- serviceConfig = {
- ExecStart = "${pkgs.deno}/bin/deno run --allow-net --allow-read --allow-env --config ${bandeno-src}/deno.json ${bandeno-src}/main.ts";
- Restart = "always";
- User = "bandeno";
- Group = "bandeno";
- StateDirectory = "bandeno";
- WorkingDirectory = "/var/lib/bandeno";
- };
- };
-
- users.users.bandeno = {
- isSystemUser = true;
- group = "bandeno";
- };
- users.groups.bandeno = {};
-
- services.caddy.virtualHosts."${cfg.domain}".extraConfig = ''
- @bandeno_rss expression {query}.matches("(artist|fan)")
- handle @bandeno_rss {
- reverse_proxy 127.0.0.1:${toString cfg.port}
- }
- handle {
- redir https://${haravara.stripSubdomain cfg.domain}
- }
- '';
- };
-}
