Compare commits

..

No commits in common. "71516840bfc6fcf92469a7587002c85f8f420092" and "f02f58896daf8463a4f1fe97b2bdbbe750d01735" have entirely different histories.

2 changed files with 75 additions and 91 deletions

160
flake.lock generated
View File

@ -225,7 +225,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -243,7 +243,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -261,7 +261,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -338,11 +338,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721135958, "lastModified": 1720470846,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -404,18 +404,17 @@
"hypridle": { "hypridle": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1721162167, "lastModified": 1719068457,
"narHash": "sha256-seS+vRTrXWMBPUHUM0MYLd5Sg1JBICSzZX5daA/Vw+c=", "narHash": "sha256-q2p1YzCg9Dq2jt+6+kjHec9lb6BjCbg5rnVP2Uc/840=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "fc4e3bd2dccd3b2e816c7cbe2dca25fa5e83a4bd", "rev": "7c5747b7855d06b4a63a4f515625ab3229278298",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -428,18 +427,18 @@
"inputs": { "inputs": {
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems_3", "systems": "systems_4",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1721248202, "lastModified": 1720453602,
"narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=", "narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9", "rev": "b03f41efec14273cf25c42d4cef326acc36cb319",
"revCount": 4930, "revCount": 4913,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -479,25 +478,18 @@
}, },
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"hyprutils": [
"hypridle",
"hyprutils"
],
"nixpkgs": [ "nixpkgs": [
"hypridle", "hypridle",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": "systems_2"
"hypridle",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1720381373, "lastModified": 1713121246,
"narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -536,31 +528,6 @@
} }
}, },
"hyprutils": { "hyprutils": {
"inputs": {
"nixpkgs": [
"hypridle",
"nixpkgs"
],
"systems": [
"hypridle",
"systems"
]
},
"locked": {
"lastModified": 1721071737,
"narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -572,11 +539,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721071737, "lastModified": 1720203444,
"narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", "narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", "rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +584,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720709712, "lastModified": 1718476555,
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=", "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade", "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -652,11 +619,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720926593, "lastModified": 1720334033,
"narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "rev": "685e40e1348007d2cf76747a201bab43d86b38cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,11 +641,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721263542, "lastModified": 1720572381,
"narHash": "sha256-2N3mgTxhETvDmApaU08N8IeGBdbuDFmq/lvB/NtivpM=", "narHash": "sha256-y3sXBK51k3LIqGvH48ObjVgzFa+GMOHRdr+2KABU12g=",
"owner": "Silveere", "owner": "Silveere",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ba8874eaa57e7190df18a808ad361365d66d7089", "rev": "ffd41af3e7035bb033c30ef9758a4d41466d0de9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -697,11 +664,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721266005, "lastModified": 1720574857,
"narHash": "sha256-YTrojAxT4WrTFafLjcR64ajX8W9DV/sUgChWY8hWoTc=", "narHash": "sha256-d54eAlQJ+8qJIeiBxjGT63qNgOhhx8G8h4UzmUUWXTU=",
"owner": "infinidoge", "owner": "infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "6a3d0a0af401c6900de72149287690d9b86dddec", "rev": "94356ef03990fb5b8a3015a13df397ceb612ddc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +686,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721226275, "lastModified": 1720428387,
"narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=", "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "8ebede998342477736e0d0acdcc13ddb166a335f", "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,11 +724,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720957393, "lastModified": 1720031269,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -773,11 +740,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1721116560, "lastModified": 1720571246,
"narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=", "narHash": "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93", "rev": "16e401f01842c5bb2499e78c1fe227f939c0c474",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -805,11 +772,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1721226092, "lastModified": 1720553833,
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c716603a63aca44f39bef1986c13402167450e0a", "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,7 +805,7 @@
"nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024", "nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_7" "systems": "systems_8"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -848,11 +815,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721269159, "lastModified": 1720577957,
"narHash": "sha256-eHrGuKZKQb762qdCkrfoyyxXLKumYhiXJca1ig0RftE=", "narHash": "sha256-RZuzLdB/8FaXaSzEoWLg3au/mtbuH7MGn2LmXUKT62g=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c3e217122ac55680606d69bc693bdf262f14f602", "rev": "a434177dfcc53bf8f1f348a3c39bfb336d760286",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,16 +908,16 @@
}, },
"systems_4": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1689347949,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"type": "github" "type": "github"
} }
}, },
@ -999,6 +966,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, osConfig ? { }, ...}: { config, lib, pkgs, inputs, osConfig ? { }, ...}:
let let
cfg = config.nixfiles.packageSets.multimedia; cfg = config.nixfiles.packageSets.multimedia;
inherit (lib) optionals mkEnableOption mkIf; inherit (lib) optionals mkEnableOption mkIf;
@ -16,6 +16,8 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ { assertion = inputs.nixpkgs-unstable.sourceInfo.lastModified <= 1720571246; message = "re-add picard and remove this assertion"; } ];
home.packages = with pkgs; optionals config.nixfiles.meta.graphical [ home.packages = with pkgs; optionals config.nixfiles.meta.graphical [
mpv mpv
gimp gimp
@ -24,7 +26,7 @@ in
obs-studio obs-studio
nomacs nomacs
audacity audacity
picard # picard
spicetify-cli spicetify-cli
] ++ [ ] ++ [
yt-dlp yt-dlp