diff --git a/flake.lock b/flake.lock index 3efed53..09cf164 100644 --- a/flake.lock +++ b/flake.lock @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730490306, + "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "1743615b61c7285976f85b303a36cdf88a556503", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729781453, - "narHash": "sha256-zbtOI/ZRHdPyTsZjZjsvx3rbGoHDFE8+WdH9grapC88=", + "lastModified": 1730499652, + "narHash": "sha256-R21C3/2eI5hlwfUSkXFFX/8Wbs3lm43jVYrxd+9SPfM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3cec45d82113051d35e846e5d80719d8ea0f7002", + "rev": "32b18179dd789cde948c97eb3c2ebbdd6af36bf7", "type": "github" }, "original": { @@ -286,22 +286,6 @@ "type": "github" } }, - "master": { - "locked": { - "lastModified": 1729794533, - "narHash": "sha256-wXgSM2Yduogm+Z375yXiNfrFTHUyI/pfmRa29Wiwv40=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "13b932f79953aeb02fee27985af6fb9d1ac7f418", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", @@ -309,11 +293,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729733994, - "narHash": "sha256-OFI0EG5ToqHJMPgMKmo6eAJcHqhNVgrgcAMQ8oIHEN8=", + "lastModified": 1730425644, + "narHash": "sha256-dfxO6mkn1KkotGQXV93m/2MoS9ayLUwaIIbR3mReLd0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "af2e2e01939aa85a6ca588b97297a0856618f341", + "rev": "bcc7c896b56ccd644ca2daea74dac05c1731f59d", "type": "github" }, "original": { @@ -332,11 +316,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729790361, - "narHash": "sha256-MC/4icQpSukegVmQs2XrmhwoqK4m6naLvdsVM7KoKBg=", + "lastModified": 1730425244, + "narHash": "sha256-/iW9B9LZXXvSo6Hk7oRTN6gxEp3vcmXjmOjKZMPxe9E=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "327cc31d00c7d544746fba5028f5f320b3d15206", + "rev": "36545ab9f31f961df11f5882ce14aab10a0781a8", "type": "github" }, "original": { @@ -391,11 +375,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -407,11 +391,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -423,11 +407,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1729850857, + "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", "type": "github" }, "original": { @@ -439,11 +423,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -497,7 +481,6 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", - "master": "master", "nix-gaming": "nix-gaming", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_3", @@ -513,11 +496,11 @@ ] }, "locked": { - "lastModified": 1729736953, - "narHash": "sha256-Rb6JUop7NRklg0uzcre+A+Ebrn/ZiQPkm4QdKg6/3pw=", + "lastModified": 1730341826, + "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "29b1275740d9283467b8117499ec8cbb35250584", + "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", "type": "github" }, "original": { @@ -534,11 +517,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1729775275, - "narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -571,11 +554,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1728772489, - "narHash": "sha256-6sHjXNhPrRXIV1au5jlSXHeqn/QHb9wyRt7V0F5p4PA=", + "lastModified": 1729978972, + "narHash": "sha256-Zox0iAi4CRPn4rxrhOetFFZ2jcSipe8tGD8nMTgcjhE=", "ref": "refs/heads/main", - "rev": "475e2b37e34a663b11f8c92b79dd45637a3e848c", - "revCount": 770, + "rev": "72499f349ca81cb2838eced9d7c465b2cf71c4a2", + "revCount": 825, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/flake.nix b/flake.nix index 82edacd..5c98b66 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - master.url = "github:nixos/nixpkgs?ref=master"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -40,8 +39,7 @@ config.allowUnfree = true; }; pkgs = makePkgs nixpkgs; - pkgsM = makePkgs inputs.master; - overlays = [ (import ./overlay.nix { inherit pkgs pkgsM; }) ]; + overlays = [ (import ./overlay.nix { inherit pkgs; }) ]; createConfig = name: { inherit system; specialArgs = { diff --git a/modules/apps/multimedia.nix b/modules/apps/multimedia.nix index 06d5d41..1e8e87d 100644 --- a/modules/apps/multimedia.nix +++ b/modules/apps/multimedia.nix @@ -8,7 +8,6 @@ options.my.apps.multimedia.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.apps.multimedia.enable { users.users.jawz.packages = with pkgs; [ - fooyin # foobar inspired music player pitivi # video editor celluloid # video player curtail # image compressor diff --git a/modules/scripts/download.nix b/modules/scripts/download.nix index 10cc780..0cfea5b 100644 --- a/modules/scripts/download.nix +++ b/modules/scripts/download.nix @@ -12,23 +12,7 @@ }; config = let - download = - with pkgs; - python3Packages.buildPythonApplication { - pname = "download"; - version = "2.5"; - src = ../../scripts/download/.; - build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ - pyyaml - types-pyyaml - yt-dlp - ]; - propagatedBuildInputs = [ - gallery-dl - ffmpeg - ]; - }; + download = pkgs.callPackage ../../pkgs/download/default.nix { }; in { home-manager.users.jawz = { @@ -36,7 +20,7 @@ services.lorri.enable = true; programs.bash = { shellAliases = { - dl = "download -u jawz -i"; + dl = "${download}/bin/download -u jawz -i"; comic = ''dl "$(cat "$LC" | fzf --multi --exact -i)"''; gallery = ''dl "$(cat "$LW" | fzf --multi --exact -i)"''; }; @@ -57,7 +41,6 @@ wantedBy = [ "default.target" ]; path = [ pkgs.bash - download ]; serviceConfig = { TimeoutStartSec = 2000; diff --git a/overlay.nix b/overlay.nix index 8d4fe95..a2e9d34 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgsM }: +{ pkgs }: _self: super: { gnome = super.gnome.overrideScope ( _gFinal: gPrev: { @@ -32,7 +32,6 @@ _self: super: { "Agave" ]; }; - inherit (pkgsM) gallery-dl yt-dlp; handbrake = super.handbrake.override { useGtk = true; }; discord = super.discord.override { withOpenASAR = true; }; ripgrep = super.ripgrep.override { withPCRE2 = true; }; diff --git a/pkgs/download/default.nix b/pkgs/download/default.nix new file mode 100644 index 0000000..c512a04 --- /dev/null +++ b/pkgs/download/default.nix @@ -0,0 +1,21 @@ +{ + python3Packages, + gallery-dl, + ffmpeg, + ... +}: +python3Packages.buildPythonApplication { + pname = "download"; + version = "2.5"; + src = ../../scripts/download/.; + build-system = [ python3Packages.setuptools ]; + dependencies = with python3Packages; [ + pyyaml + types-pyyaml + yt-dlp + ]; + propagatedBuildInputs = [ + gallery-dl + ffmpeg + ]; +}