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