From bc499e6cccf49198b06a43248ae5f8d033e7b5c3 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 10 Nov 2023 03:13:38 +0000
Subject: [PATCH] Update urls and fix compatibility with new nixpkgs

---
 flake.lock   | 56 ++++++++++++++++++++++++++--------------------------
 flake.nix    |  2 +-
 home/mpv.nix |  6 +++---
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25ee9b7..65a335f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -139,15 +139,15 @@
       "locked": {
         "lastModified": 1694323018,
         "narHash": "sha256-qjqjd4X79FJyv+JcULm5AQeXdtrg/+zGKvjXBcHkqT8=",
-        "owner": "artemist",
-        "repo": "fonts",
+        "ref": "refs/heads/canon",
         "rev": "a5002a6881b40efbc91829a990a8e11983105db9",
-        "type": "github"
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.mildlyfunctional.gay/artemist/fonts"
       },
       "original": {
-        "owner": "artemist",
-        "repo": "fonts",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.mildlyfunctional.gay/artemist/fonts"
       }
     },
     "gitignore": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699025595,
-        "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=",
+        "lastModified": 1699368917,
+        "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d",
+        "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698550809,
-        "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=",
+        "lastModified": 1699156599,
+        "narHash": "sha256-Qk9ZE/pG9lNIGUVNArJxL0Hc0Soa92eQPPIhcDwWinU=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c",
+        "rev": "5388a4002179d6778d212dc2fdcc7ac3fdbd5b65",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1699044561,
-        "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=",
+        "lastModified": 1699159446,
+        "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c",
+        "rev": "627bc9b88256379578885a7028c9e791c29fb581",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1698924604,
-        "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
+        "lastModified": 1699099776,
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1699022904,
-        "narHash": "sha256-Qc0zMAsRU7gyqHmkc9QUP/FHCNKNkoYGoojnMAUcUQg=",
+        "lastModified": 1699308475,
+        "narHash": "sha256-sFHOFiE+GV1JkwDmHi0LLJLSRyggdIK1Yra02oj2eZg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "76291156fa182a7d3fdfa9233a7bcbe116c50b68",
+        "rev": "6b93c8fa6db999320d53f13e0ebd555e33f86577",
         "type": "github"
       },
       "original": {
@@ -390,11 +390,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1698227354,
-        "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
+        "lastModified": 1698852633,
+        "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
+        "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0",
         "type": "github"
       },
       "original": {
@@ -436,11 +436,11 @@
     },
     "private": {
       "locked": {
-        "lastModified": 1698692803,
-        "narHash": "sha256-k2Ga4hMDGu6Vdm04Dcp3tEMbU5n+q7vv1WHezFmbJhM=",
+        "lastModified": 1699584232,
+        "narHash": "sha256-nVMcOMUtTKfdZZlp+DAp3NYsEXCGWwUpaAYAmyv+PkY=",
         "ref": "unified",
-        "rev": "6a88a8511a0581d7b3e8825344014abaac42a29c",
-        "revCount": 36,
+        "rev": "5248b9d52f4d73f4781d49dbc8e05d6b2fd1adae",
+        "revCount": 37,
         "type": "git",
         "url": "ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private"
       },
diff --git a/flake.nix b/flake.nix
index c1e4777..c05975d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
     utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     fonts = {
-      url = "github:artemist/fonts";
+      url = "git+https://git.mildlyfunctional.gay/artemist/fonts";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "utils";
     };
diff --git a/home/mpv.nix b/home/mpv.nix
index 28bb96c..a0369a4 100644
--- a/home/mpv.nix
+++ b/home/mpv.nix
@@ -1,13 +1,13 @@
 { pkgs, config, ... }:
 let
-  ffmpeg_5 = pkgs.ffmpeg_5-full;
+  ffmpeg = pkgs.ffmpeg-full;
   scripts = with pkgs.mpvScripts; [ sponsorblock ];
-  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg_5; }) {
+  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg; }) {
     inherit scripts;
   };
 
 in {
-  home.packages = [ ffmpeg_5 ];
+  home.packages = [ ffmpeg ];
   programs.mpv = {
     enable = true;
     package = mpv;