Compare commits

..

No commits in common. "6870bf6b6c59d98725b46fcdbd001132bbb92d5f" and "a40df1473206f35f7e676bb7103c48928b4bd72f" have entirely different histories.

5 changed files with 32 additions and 62 deletions

View file

@ -47,11 +47,11 @@
]
},
"locked": {
"lastModified": 1694069327,
"narHash": "sha256-Si2otUNjCe8kY5nsV7tILi4PsI0odBFrdSu8cCjn/eQ=",
"lastModified": 1692199161,
"narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=",
"owner": "nix-community",
"repo": "disko",
"rev": "7bee8de8e6755506c70323b864a884f9624cc23a",
"rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c",
"type": "github"
},
"original": {
@ -178,11 +178,11 @@
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1694145944,
"narHash": "sha256-TVotu2rG6ie63qc4FeZIYk4VNP0X/Q1WFRbHFA09b3w=",
"lastModified": 1692934113,
"narHash": "sha256-DAQBNj9x6Fd90CxtuXovQJv7HRYC3EV2waHCNoy5RkY=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "6c391a705bdcbbe43c4b17bf7732d7e4cbbe77b1",
"rev": "6ca342ac670b56ad15124314d71852276e892062",
"type": "github"
},
"original": {
@ -479,11 +479,11 @@
]
},
"locked": {
"lastModified": 1693208669,
"narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
"lastModified": 1692099905,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
"type": "github"
},
"original": {
@ -612,11 +612,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1693718952,
"narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
"lastModified": 1692373088,
"narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
"rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
"type": "github"
},
"original": {
@ -712,11 +712,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1693675694,
"narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=",
"lastModified": 1692492726,
"narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d",
"rev": "5e63e8bbc46bc4fc22254da1edaf42fc7549c18a",
"type": "github"
},
"original": {
@ -728,11 +728,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1693985761,
"narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
"lastModified": 1692734709,
"narHash": "sha256-SCFnyHCyYjwEmgUsHDDuU0TsbVMKeU1vwkR+r7uS2Rg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
"rev": "b85ed9dcbf187b909ef7964774f8847d554fab3b",
"type": "github"
},
"original": {
@ -775,11 +775,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1694048570,
"narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
"lastModified": 1692794066,
"narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
"rev": "fc944919f743bb22379dddf18dcb72db6cff84aa",
"type": "github"
},
"original": {
@ -805,11 +805,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1693626178,
"narHash": "sha256-Rpiy6lIOu4zny8tfGuIeN1ji9eSz9nPmm9yBhh/4IOM=",
"lastModified": 1692463654,
"narHash": "sha256-F8hZmsQINI+S6UROM4jyxAMbQLtzE44pI8Nk6NtMdao=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bfb7dfec93f3b5d7274db109f2990bc889861caf",
"rev": "ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783",
"type": "github"
},
"original": {
@ -988,11 +988,11 @@
},
"retiolum": {
"locked": {
"lastModified": 1693818010,
"narHash": "sha256-A6p33I4ByqXoSXJL87t+FDbm1TjeHMj+E0cLq6v6TnU=",
"lastModified": 1691992809,
"narHash": "sha256-qUTsMDSV2L5t6Oj+L60n0KQKbvOhak3+d6++h9AZJPg=",
"owner": "Mic92",
"repo": "retiolum",
"rev": "4d9b888cb2683cb97a1bc3b8b4eb06ea8fbe3277",
"rev": "6216c30551876303dac5373e92690a7f05fd0f6f",
"type": "github"
},
"original": {
@ -1117,11 +1117,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1693898833,
"narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=",
"lastModified": 1692728678,
"narHash": "sha256-02MjG7Sb9k7eOi86CcC4GNWVOjT6gjmXFSqkRjZ8Xyk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623",
"rev": "1b7b3a32d65dbcd69c217d7735fdf0a6b2184f45",
"type": "github"
},
"original": {

View file

@ -49,7 +49,6 @@
#./kiosk.nix
./trilium.nix
./gitea.nix
#./atuin.nix
./cache.nix

View file

@ -51,16 +51,6 @@ let
target = "/media/youtube/series/Sunk Cost Galaxy";
output = "Sunk Cost Galaxy S01E%(playlist_index)s %(title)s.%(ext)s";
};
BigLez = {
url = "https://www.youtube.com/watch?list=PLGMC7oz7XpmCR1RWxqvFWvXVO_ry6FdHI";
target = "/media/youtube/series/Big Lez";
output = "Big Lez S01E%(playlist_index)s %(title)s.%(ext)s";
};
Sassy = {
url = "https://www.youtube.com/watch?v=Dw_tGRblTXk";
target = "/media/youtube/series/Big Lez";
output = "Big Lez S02E01 %(title)s.%(ext)s";
};
# channels
# --------
@ -155,11 +145,6 @@ let
target = "/media/youtube/loot";
output = "%(title)s.%(ext)s";
};
FridayVideos = {
url = "https://www.youtube.com/playlist?list=PLP33x-q_GftbqHBybHABOwsRcUX7XZl_D";
target = "/media/youtube/loot";
output = "%(title)s.%(ext)s";
};
};
downloadScript =
@ -169,7 +154,6 @@ let
, sponsorBlockCategories ? [ "default" ]
, notOlderThan ? "" # e.g: 1week
, breakOnExisting ? true
, reverse ? false
}: pkgs.writers.writeDash "download-script-${name}" ''
mkdir -p "${target}"
yt-dlp \
@ -177,7 +161,7 @@ let
--no-mark-watched \
--continue \
${optionalString (notOlderThan != "") "--dateafter now-${notOlderThan}" } \
${optionalString reverse "--playlist-reverse" } \
--playlist-reverse \
--download-archive "${target}/.downloaded.txt" \
--output "${target}/${output}" \
--format "bestvideo[ext=mp4]+bestaudio[ext=m4a]" \

View file

@ -82,19 +82,7 @@ in
#fractal
#legacy_2205.mirage-im
#cinny-desktop
#fluffychat
#(fluffychat.overrideAttrs
# (old: rec {
# version = "1.13.0";
# src = fetchFromGitHub {
# owner = "krille-chan";
# repo = "fluffychat";
# rev = "v${version}";
# hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc=";
# };
# vendorHash = "";
# })
#)
fluffychat
tor-browser-bundle-bin
#(tor-browser-bundle-bin.overrideAttrs (old: rec {

View file

@ -1 +0,0 @@