diff --git a/flake.lock b/flake.lock index 00de854..0a41d77 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1734423772, - "narHash": "sha256-AN8gnO871LRm1vvclMqXt+YWS5fJeX5BE2BDuaIQdHs=", + "lastModified": 1734488063, + "narHash": "sha256-tyWwlPhPw5TQgU44hOflykBjzizbpDMlU0UX7Aba6mU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "840a2fa3e9d546ecbcc080ee13bf6aa0e8697b10", + "rev": "c52319c9046fdc812035dae70ce0a238eaab71dd", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734453087, - "narHash": "sha256-z066gEEaPRLZiN6KI4celbT5OFt1vPvK/8F+xUUGFNo=", + "lastModified": 1734456362, + "narHash": "sha256-eb+OcQaSp7pcJxNe6wi52AiqLle820aD4Ejq10wmsjo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e2c78c00e50a0835c3830c8a0cd82049dc5700b8", + "rev": "5f1df55fcb45a72e92258113685aa9064f6ebf3e", "type": "github" }, "original": { @@ -567,7 +567,9 @@ }, "jawz-scripts": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1734312686, @@ -587,15 +589,15 @@ "inputs": { "doomemacs": "doomemacs", "emacs-overlay": "emacs-overlay", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2" }, "locked": { - "lastModified": 1734424909, - "narHash": "sha256-P06anJ94BOMY8wIlOrpZ4+wDG63zDUz8hTWU757dlgM=", + "lastModified": 1734511246, + "narHash": "sha256-c1gzpHdPMhqvgYfvLuwfXtF+7Aauk8+NFnVWoxT34xk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "3923ae495bf08dffd21efef50b04b074a54299b1", + "rev": "a4dcf71d7b789b48fe282e7c4db099fc6da75d1b", "type": "github" }, "original": { @@ -613,11 +615,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1734313951, - "narHash": "sha256-DCjhmX5dVn11J8Ss+5Py4yMh8k7a63HakMENccGZBr4=", + "lastModified": 1734486355, + "narHash": "sha256-e9ui1RA/Bf57fiABB0ddXy4m/FoqM9yiEv6XtaoTyag=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a5f8dee3f7e6864da0d69a227bc8a90a3cbf9d0f", + "rev": "3a37d41cbe8cda558c5d1a83e73fd452207cd914", "type": "github" }, "original": { @@ -628,10 +630,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "path": "/nix/store/22r7q7s9552gn1vpjigkbhfgcvhsrz68-source", - "type": "path" + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "type": "github" }, "original": { "id": "nixpkgs", @@ -668,23 +672,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 0, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "path": "/nix/store/22r7q7s9552gn1vpjigkbhfgcvhsrz68-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -703,11 +695,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734454139, - "narHash": "sha256-x+oXLV5NzK+gLy/VY1O5U5EIJzks6NCiv6Np2tZ368Y=", + "lastModified": 1734529681, + "narHash": "sha256-pe/fHd6nuz8nxwyVsLDDilgy+0rXJ1iYhCFojFlV8QE=", "owner": "nix-community", "repo": "nur", - "rev": "5f37c66585d5c978b2f42ac5a23dd74f215a0b30", + "rev": "29cbfd0aad3f30ed30312668b3d8dca522175349", "type": "github" }, "original": { @@ -747,7 +739,7 @@ "jawz-scripts": "jawz-scripts", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", @@ -793,11 +785,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110168, - "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", + "lastModified": 1734531336, + "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", "owner": "danth", "repo": "stylix", - "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", + "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index afaac84..bccaeba 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,10 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; ucodenix.url = "github:e-tho/ucodenix"; nix-doom-emacs-unstraightened.url = "github:marienz/nix-doom-emacs-unstraightened"; - jawz-scripts.url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git"; + jawz-scripts = { + url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur = { url = "github:nix-community/nur"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,7 +32,6 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; outputs = diff --git a/modules/shell/multimedia.nix b/modules/shell/multimedia.nix index aed4d83..40bd256 100644 --- a/modules/shell/multimedia.nix +++ b/modules/shell/multimedia.nix @@ -16,7 +16,7 @@ yt-dlp # downloads videos from most video websites ffmpeg # not ffmpreg, the coolest video conversion tool! imagemagick # photoshop what?? - # ffpb # make ffmpeg encoding... a bit fun + ffpb # make ffmpeg encoding... a bit fun ; }; };