diff --git a/flake.lock b/flake.lock index f9aa892..c326a18 100644 --- a/flake.lock +++ b/flake.lock @@ -121,56 +121,6 @@ "type": "github" } }, - "cachix": { - "inputs": { - "devenv": [ - "devenv" - ], - "flake-compat": [ - "devenv", - "flake-compat" - ], - "git-hooks": [ - "devenv", - "git-hooks" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1777487137, - "narHash": "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw=", - "owner": "cachix", - "repo": "cachix", - "rev": "a66a440c321d35f7193472c317f42a55ccd1cb93", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "crate2nix": { - "flake": false, - "locked": { - "lastModified": 1772186516, - "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=", - "owner": "rossng", - "repo": "crate2nix", - "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", - "type": "github" - }, - "original": { - "owner": "rossng", - "repo": "crate2nix", - "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", - "type": "github" - } - }, "darkly": { "inputs": { "nixpkgs": [ @@ -191,39 +141,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix", - "crate2nix": "crate2nix", - "flake-compat": [ - "flake-compat" - ], - "flake-parts": [ - "flake-parts" - ], - "ghostty": "ghostty", - "git-hooks": "git-hooks", - "nix": "nix", - "nixd": "nixd", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1785001160, - "narHash": "sha256-iyjX3d/q7lqYP9wkJR4k9xI2J01BJGGyfVamP0v2LXU=", - "owner": "cachix", - "repo": "devenv", - "rev": "126fa142775d8a6d89c97d69297f7095b6585e4e", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -296,21 +213,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1723604017, - "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", - "owner": "srid", - "repo": "flake-root", - "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": [ @@ -347,47 +249,6 @@ "type": "github" } }, - "ghostty": { - "flake": false, - "locked": { - "lastModified": 1784602798, - "narHash": "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782908218, - "narHash": "sha256-wLMOrPgVyeF3XmP+qfYcLqnVdTxikdcSvbIY7rA9jTA=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9f7e99119ece7705299595299f3b031f39356de1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -407,36 +268,6 @@ "type": "gitlab" } }, - "go-musicfox": { - "inputs": { - "devenv": [ - "devenv" - ], - "flake-parts": [ - "flake-parts" - ], - "flake-root": "flake-root", - "mission-control": "mission-control", - "mk-shell-bin": "mk-shell-bin", - "nix2container": "nix2container", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774163189, - "narHash": "sha256-X+1kQ611zdZNJfPQTLGz/zjazjU8PngzsZqmVhxSlb4=", - "owner": "imxyy1soope1", - "repo": "go-musicfox", - "rev": "6a7a4a5b7b14be5cb1e897c7540c7685034aa693", - "type": "github" - }, - "original": { - "owner": "imxyy1soope1", - "repo": "go-musicfox", - "type": "github" - } - }, "haumea": { "inputs": { "nixpkgs": [ @@ -546,36 +377,6 @@ "type": "github" } }, - "mission-control": { - "locked": { - "lastModified": 1733438716, - "narHash": "sha256-1tt43rwHk0N5fwEhbpsHWO4nBVFCQN0w1KM427DNycM=", - "owner": "Platonic-Systems", - "repo": "mission-control", - "rev": "65d04c4ab9db076eff09824d2936a5c215c21f36", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "mission-control", - "type": "github" - } - }, - "mk-shell-bin": { - "locked": { - "lastModified": 1677004959, - "narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=", - "owner": "rrbutani", - "repo": "nix-mk-shell-bin", - "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887", - "type": "github" - }, - "original": { - "owner": "rrbutani", - "repo": "nix-mk-shell-bin", - "type": "github" - } - }, "my-templates": { "locked": { "lastModified": 1765097937, @@ -629,96 +430,6 @@ "type": "github" } }, - "nix": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-parts": [ - "devenv", - "flake-parts" - ], - "git-hooks-nix": [ - "devenv", - "git-hooks" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-23-11": [ - "devenv" - ], - "nixpkgs-regression": [ - "devenv" - ] - }, - "locked": { - "lastModified": 1782407171, - "narHash": "sha256-xem+4ncdQCTFJsQ4PrVuyVmi3j4w/Yqg298hBUzVejA=", - "owner": "cachix", - "repo": "nix", - "rev": "782ac1b155679b065ec945ae50d0fa1d495883b7", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "devenv-2.34", - "repo": "nix", - "type": "github" - } - }, - "nix2container": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "go-musicfox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730479402, - "narHash": "sha256-79NLeNjpCa4mSasmFsE3QA6obURezF0TUO5Pm+1daog=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "5fb215a1564baa74ce04ad7f903d94ad6617e17a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nixd": { - "inputs": { - "flake-parts": [ - "devenv", - "flake-parts" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1783935112, - "narHash": "sha256-IAQ14nteIKXAz4cd75UcZrsHGEVJ7QNrkUwX9rmeZ/Y=", - "owner": "nix-community", - "repo": "nixd", - "rev": "a64cd33e53b316b6b092ea0a966640cd2309bf3d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixd", - "type": "github" - } - }, "nixos-wsl": { "inputs": { "flake-compat": [ @@ -883,12 +594,10 @@ "inputs": { "angrr": "angrr", "darkly": "darkly", - "devenv": "devenv", "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", - "go-musicfox": "go-musicfox", "haumea": "haumea", "home-manager": "home-manager", "impermanence": "impermanence", @@ -929,27 +638,6 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782875958, - "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1126,28 +814,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "devenv", - "nixd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "xwayland-satellite-unstable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ca92f42..40265ad 100644 --- a/flake.nix +++ b/flake.nix @@ -75,13 +75,6 @@ url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - go-musicfox = { - url = "github:imxyy1soope1/go-musicfox"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - inputs.devenv.follows = "devenv"; - inputs.nix2container.inputs.flake-utils.follows = "flake-utils"; - }; llm-agents = { url = "github:numtide/llm-agents.nix"; # Not followed intentionally (binary cache) @@ -122,12 +115,6 @@ inputs.systems.follows = "systems"; }; systems.url = "github:nix-systems/default"; - devenv = { - url = "github:cachix/devenv"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - inputs.flake-compat.follows = "flake-compat"; - }; }; outputs = diff --git a/flake/pkgs.nix b/flake/pkgs.nix index 4e3b12d..55fcc0b 100644 --- a/flake/pkgs.nix +++ b/flake/pkgs.nix @@ -9,7 +9,6 @@ _module.args = { pkgsParams = { overlays = builtins.attrValues config.flake.overlays ++ [ - inputs.go-musicfox.overlays.default inputs.niri-nix.overlays.niri-nix inputs.fenix.overlays.default inputs.angrr.overlays.default diff --git a/modules/cli/media/all.nix b/modules/cli/media/all.nix index 4f97f08..800f6b4 100644 --- a/modules/cli/media/all.nix +++ b/modules/cli/media/all.nix @@ -9,7 +9,6 @@ in config = lib.mkIf cfg.enable { my.cli.media = { - go-musicfox.enable = true; ffmpeg.enable = true; }; }; diff --git a/modules/cli/media/go-musicfox.nix b/modules/cli/media/go-musicfox.nix deleted file mode 100644 index a355711..0000000 --- a/modules/cli/media/go-musicfox.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - pkgs, - secrets, - ... -}: -let - cfg = config.my.cli.media.go-musicfox; -in -{ - options.my.cli.media.go-musicfox = { - enable = lib.mkEnableOption "go-musicfox"; - }; - - config = lib.mkIf cfg.enable { - my = { - hm = { - home.packages = [ - pkgs.go-musicfox - ]; - sops.secrets.go-musicfox = { - sopsFile = secrets.go-musicfox; - format = "binary"; - path = "${config.my.hm.xdg.configHome}/go-musicfox/config.toml"; - }; - }; - - desktop.media.mpv.enable = lib.mkForce true; - - persist.homeDirs = [ - ".local/share/go-musicfox/db" - ]; - persist.homeFiles = [ - ".local/share/go-musicfox/cookie" - ]; - }; - }; -}