diff --git a/flake.lock b/flake.lock index 0dffb28..388ca02 100644 --- a/flake.lock +++ b/flake.lock @@ -300,22 +300,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -433,29 +417,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nix-gaming", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -478,28 +439,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nix-gaming", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -720,28 +659,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1780805823, - "narHash": "sha256-skM5Lf+QfqllrCQnzAAo43QS8IXlGYFCyn1y9L8wKqk=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "26aa8174cab36e58c8e93774b5d5ec43331fae59", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix4nvchad": { "inputs": { "flake-utils": "flake-utils", @@ -768,7 +685,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1780310866, @@ -861,22 +778,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1780336545, - "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1780243769, "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", @@ -892,7 +793,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1779560665, "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=", @@ -905,7 +806,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -1002,22 +903,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1780747962, - "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -1030,7 +915,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1780243769, "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", @@ -1046,10 +931,26 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "systems": "systems_4" }, "locked": { @@ -1113,7 +1014,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1780838252, @@ -1207,10 +1108,9 @@ "niri-flake": "niri-flake", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-doom": "nix-doom", - "nix-gaming": "nix-gaming", "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", "nixvim": "nixvim", @@ -1305,7 +1205,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "systems": "systems_6" }, "locked": { @@ -1551,7 +1451,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1780220602, diff --git a/flake.nix b/flake.nix index bb0cf7e..ee84929 100644 --- a/flake.nix +++ b/flake.nix @@ -219,13 +219,6 @@ repo = "emacs-overlay"; }; - nix-gaming = { - type = "github"; - owner = "fufexan"; - repo = "nix-gaming"; - inputs.flake-parts.follows = "flake-parts"; - }; - noctalia = { type = "github"; owner = "noctalia-dev"; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 93e82e4..ed5cbd3 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -121,7 +121,6 @@ neovim-nightly doom-emacs neovide - osu-lazer-bin # typochecker: disable-line prismlauncher sbctl diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index 7fff8be..4b4af97 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -12,7 +12,6 @@ in ./rime-all.nix ./nixvim.nix ./doom-emacs.nix - ./osu-lazer-bin.nix # typochecker: disable-line ./iosevka-serif_fixed.nix ./pkgsNoCuda.nix diff --git a/overlays/additions/osu-lazer-bin.nix b/overlays/additions/osu-lazer-bin.nix deleted file mode 100644 index d16989c..0000000 --- a/overlays/additions/osu-lazer-bin.nix +++ /dev/null @@ -1,6 +0,0 @@ -{inputs, ...}: _final: prev: let - inherit (inputs) nix-gaming; - inherit (prev.stdenv.hostPlatform) system; -in { - inherit (nix-gaming.packages.${system}) osu-lazer-bin; # typochecker: disable-line -}