diff --git a/flake.lock b/flake.lock index 83b6f7d..3af226e 100644 --- a/flake.lock +++ b/flake.lock @@ -135,38 +135,6 @@ "type": "github" } }, - "discord-tokyonight": { - "flake": false, - "locked": { - "lastModified": 1632310328, - "narHash": "sha256-LcxXTGdo6ZW5glECkH5vgLWAYMZ3ez/3USc059dR9cE=", - "owner": "DanisDGK", - "repo": "zelk-customizations", - "rev": "c5ed0be3f2dd4421c42a4c62d28fc52d18c68ef1", - "type": "github" - }, - "original": { - "owner": "DanisDGK", - "repo": "zelk-customizations", - "type": "github" - } - }, - "discover": { - "flake": false, - "locked": { - "lastModified": 1734385014, - "narHash": "sha256-GMbkCB70Rp18fk3mUIfYEQlqibDWtMg74ejxecT75mA=", - "owner": "trigg", - "repo": "Discover", - "rev": "e7992e015212bdaaf36c9800cfcba1000cea0f65", - "type": "github" - }, - "original": { - "owner": "trigg", - "repo": "Discover", - "type": "github" - } - }, "fast-syntax-highlighting": { "flake": false, "locked": { @@ -309,24 +277,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -415,28 +365,6 @@ "type": "github" } }, - "home-manager-raccoon": { - "inputs": { - "nixpkgs": [ - "nixpkgs-raccoon" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1685325875, - "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b372d7f8d5518aaba8a4058a453957460481afbc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-22.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager-stable": { "inputs": { "nixpkgs": [ @@ -459,27 +387,6 @@ "type": "github" } }, - "home-manager-stable_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1719827415, - "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -521,22 +428,6 @@ "type": "github" } }, - "hosts-blocklists": { - "flake": false, - "locked": { - "lastModified": 1687788647, - "narHash": "sha256-nKNz9ux1FPxoL14VZtH/1tfnn67LeXmdVQJz7I9+Srk=", - "owner": "notracking", - "repo": "hosts-blocklists", - "rev": "2ab426e806985d0d3d1c3eb447d7e772a836e10d", - "type": "github" - }, - "original": { - "owner": "notracking", - "repo": "hosts-blocklists", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -642,57 +533,6 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1740560979, @@ -721,22 +561,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, - "nixpkgs-raccoon": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1734600368, @@ -753,22 +577,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1740791350, @@ -840,22 +648,6 @@ "type": "github" } }, - "packwiz": { - "flake": false, - "locked": { - "lastModified": 1737328283, - "narHash": "sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx+0=", - "owner": "comp500", - "repo": "packwiz", - "rev": "241f24b550f6fe838913a56bdd58bac2fc53254a", - "type": "github" - }, - "original": { - "owner": "comp500", - "repo": "packwiz", - "type": "github" - } - }, "pure": { "flake": false, "locked": { @@ -878,93 +670,21 @@ "agenix": "agenix", "catppuccin": "catppuccin", "catppuccin-palette": "catppuccin-palette", - "discord-tokyonight": "discord-tokyonight", - "discover": "discover", "fast-syntax-highlighting": "fast-syntax-highlighting", "home-manager": "home-manager_3", - "home-manager-raccoon": "home-manager-raccoon", - "home-manager-stable": "home-manager-stable_2", - "hosts-blocklists": "hosts-blocklists", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", - "nixos-generators": "nixos-generators", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-raccoon": "nixpkgs-raccoon", - "nixpkgs-stable": "nixpkgs-stable_2", "nvim-treesitter": "nvim-treesitter", - "packwiz": "packwiz", "pure": "pure", - "rust-overlay": "rust-overlay", - "spicetify-nix": "spicetify-nix", - "spicetify-themes": "spicetify-themes", "spotify-adblock": "spotify-adblock", - "tree-sitter-glimmer": "tree-sitter-glimmer", "tree-sitter-jsonc": "tree-sitter-jsonc", - "website": "website", "wine-discord-ipc-bridge": "wine-discord-ipc-bridge", "zsh-abbr": "zsh-abbr", "zsh-history-substring-search": "zsh-history-substring-search" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "spicetify-nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727460820, - "narHash": "sha256-j54SjpQVoIOblTzyGRWnQnJz63eUCPb1sI/oyDm+eO0=", - "owner": "the-argus", - "repo": "spicetify-nix", - "rev": "6cce28acab7d9ec26188ed71295f6b4306e0a7f5", - "type": "github" - }, - "original": { - "owner": "the-argus", - "repo": "spicetify-nix", - "type": "github" - } - }, - "spicetify-themes": { - "flake": false, - "locked": { - "lastModified": 1740994554, - "narHash": "sha256-+lcRYilVK3cp5Ii6Q3/d00udTsq+UGqD+yKv2e2e6eA=", - "owner": "spicetify", - "repo": "spicetify-themes", - "rev": "10431678bd682547a2afdff855e8d26a3007f2c8", - "type": "github" - }, - "original": { - "owner": "spicetify", - "repo": "spicetify-themes", - "type": "github" - } - }, "spotify-adblock": { "flake": false, "locked": { @@ -1011,37 +731,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tree-sitter-glimmer": { - "flake": false, - "locked": { - "lastModified": 1724183464, - "narHash": "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4=", - "owner": "alexlafroscia", - "repo": "tree-sitter-glimmer", - "rev": "da605af8c5999b43e6839b575eae5e6cafabb06f", - "type": "github" - }, - "original": { - "owner": "alexlafroscia", - "repo": "tree-sitter-glimmer", - "type": "github" - } - }, "tree-sitter-jsonc": { "flake": false, "locked": { @@ -1079,38 +768,6 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "website": { - "flake": false, - "locked": { - "lastModified": 1668017714, - "narHash": "sha256-ywy/7xeT6FHkF7lcs+stW1WPV+piE8ztSwcQ161iico=", - "owner": "LavaDesu", - "repo": "lavadesu.github.io", - "rev": "4e30c50be520a0a1bbecf408f056e6aaf135df67", - "type": "github" - }, - "original": { - "owner": "LavaDesu", - "ref": "master", - "repo": "lavadesu.github.io", - "type": "github" - } - }, "wine-discord-ipc-bridge": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 7f9280f..083448c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,9 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-raccoon.url = "github:NixOS/nixpkgs/nixos-22.11"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager.url = "github:nix-community/home-manager"; - home-manager-raccoon.url = "github:nix-community/home-manager/release-22.11"; - home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; - nixos-hardware.url = "github:NixOS/nixos-hardware"; agenix.url = "github:ryantm/agenix"; - nixos-generators.url = "github:nix-community/nixos-generators"; - spicetify-nix.url = "github:the-argus/spicetify-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -18,18 +11,13 @@ catppuccin.inputs.nixpkgs.follows = "nixpkgs"; catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; }; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; - home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; neovim-nightly.inputs.nixpkgs.follows = "nixpkgs"; - nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; - spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; # services - hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; - website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; }; - spicetify-themes = { url = "github:spicetify/spicetify-themes"; flake = false; }; + # hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; + # website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; }; # zsh plugins zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; }; @@ -38,22 +26,14 @@ pure = { url = "github:sindresorhus/pure"; flake = false; }; # overlays - discord-tokyonight = { url = "github:DanisDGK/zelk-customizations"; flake = false; }; - discover = { url = "github:trigg/Discover"; flake = false; }; linux-tkg = { url = "github:Frogging-Family/linux-tkg"; flake = false; }; nvim-treesitter = { url = "github:nvim-treesitter/nvim-treesitter"; flake = false; }; - packwiz = { url = "github:comp500/packwiz"; flake = false; }; spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; }; - tree-sitter-glimmer = { url = "github:alexlafroscia/tree-sitter-glimmer"; flake = false; }; tree-sitter-jsonc = { url = "gitlab:WhyNotHugo/tree-sitter-jsonc"; flake = false; }; wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; }; - - # shells - rust-overlay.url = "github:oxalica/rust-overlay"; - rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, agenix, catppuccin, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: + outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -99,18 +79,5 @@ { inherit (pkgs.me) linux-lava spotify-adblock; }; - - packages."aarch64-linux" = - let - pkgs = import nixpkgs-raccoon { - inherit overlays; - system = "aarch64-linux"; - }; - in - { - }; - - # TODO: currently broken - # devShells.x86_64-linux = pkgs.callPackage ./shells { inherit inputs; }; }; } diff --git a/packages/default.nix b/packages/default.nix index dc903b8..4ae8658 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -2,18 +2,11 @@ callPackage, linuxLavaNixpkgs, inputs -}: rec { - discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; }; - discover-overlay = callPackage ./discover { inherit inputs; }; - epson-201112j = callPackage ./epson-201112j { }; +}: { linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; }; nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; }; - packwiz = callPackage ./packwiz { inherit inputs; }; - psensor = callPackage ./psensor { }; + psensor = callPackage ./psensor { }; spotify-adblock = callPackage ./spotify-adblock { inherit inputs; }; - tetrio-desktop = callPackage ./tetrio/base.nix { }; - tetrio-desktop-plus = callPackage ./tetrio/plus.nix { inherit tetrio-desktop; }; - tree-sitter-glimmer = callPackage ./tree-sitter-glimmer { inherit inputs; }; tree-sitter-jsonc = callPackage ./tree-sitter-jsonc { inherit inputs; }; wine-discord-ipc-bridge = callPackage ./wine-discord-ipc-bridge { inherit inputs; }; } diff --git a/packages/discord-tokyonight/default.nix b/packages/discord-tokyonight/default.nix deleted file mode 100644 index d9a3832..0000000 --- a/packages/discord-tokyonight/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - inputs, - stdenvNoCC -}: -stdenvNoCC.mkDerivation { - pname = "discord-tokyonight"; - version = "1.0.0"; - dontUnpack = true; - installPhase = '' - cp -r ${inputs.discord-tokyonight} $out - chmod u+w $out - cp ${./powercord_manifest.json} $out/powercord_manifest.json - ''; -} diff --git a/packages/discord-tokyonight/powercord_manifest.json b/packages/discord-tokyonight/powercord_manifest.json deleted file mode 100644 index 16efa69..0000000 --- a/packages/discord-tokyonight/powercord_manifest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": "1.0", - "name": "Tokyo Night Colours", - "author": "DanisDGK", - "license": "MIT", - "theme": "colors/tokyonight_night.css", - "description": "Tokyonight colourscheme" -} diff --git a/packages/discover/default.nix b/packages/discover/default.nix deleted file mode 100644 index 883fdf6..0000000 --- a/packages/discover/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ inputs -, python3Packages -, gtk3 -, gobject-introspection -, wrapGAppsHook -, ... -}: -python3Packages.buildPythonApplication { - pname = "discover-overlay"; - version = "1.0"; - src = inputs.discover; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - propagatedBuildInputs = with python3Packages; [ - gtk3 - gobject-introspection - pygobject3 - websocket-client - pyxdg - requests - python-pidfile - pillow - ]; -} diff --git a/packages/epson-201112j/default.nix b/packages/epson-201112j/default.nix deleted file mode 100644 index 6424a46..0000000 --- a/packages/epson-201112j/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: - -let - version = "1.0.0"; - filterVersion = "1.0.0"; -in - stdenv.mkDerivation { - pname = "epson-201112j"; - inherit version; - - src = fetchurl { - # NOTE: Don't forget to update the webarchive link too! - urls = [ - "http://download.ebz.epson.net/dsc/f/01/00/01/68/36/cbf6cf36263b5a6c4f370266f2479556cd665d7c/epson-inkjet-printer-201112j-${version}-1lsb3.2.src.rpm" - ]; - - sha256 = "sha256-+n5QQDMgEjKYFlH62bVAZRtr0GjyG8yDahPquOjIZWA="; - }; - - nativeBuildInputs = [ rpmextract autoreconfHook file ]; - - buildInputs = [ libjpeg cups ]; - - unpackPhase = '' - rpmextract $src - tar -zxf epson-inkjet-printer-201112j-${version}.tar.gz - tar -zxf epson-inkjet-printer-filter-${filterVersion}.tar.gz - for ppd in epson-inkjet-printer-201112j-${version}/ppds/*; do - substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-201112j" "$out" - substituteInPlace $ppd --replace "/cups/lib" "/lib/cups" - done - cd epson-inkjet-printer-filter-${filterVersion} - ''; - - preConfigure = '' - chmod +x configure - export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - ''; - - postInstall = '' - cd ../epson-inkjet-printer-201112j-${version} - cp -a lib64 resource watermark $out - mkdir -p $out/share/cups/model/epson-inkjet-printer-201112j - cp -a ppds $out/share/cups/model/epson-inkjet-printer-201112j/ - cp -a Manual.txt $out/doc/ - cp -a README $out/doc/README.driver - ''; - - meta = with lib; { - homepage = "https://www.openprinting.org/driver/epson-201112j"; - description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; - longDescription = '' - This software is a filter program used with the Common UNIX Printing - System (CUPS) under Linux. It supplies high quality printing with - Seiko Epson Color Ink Jet Printers. - List of printers supported by this package: - Epson BX535WD Series - Epson BX630FW Series - Epson BX635FWD Series - Epson ME940FW Series - Epson NX530 Series - Epson SX535WD Series - Epson WorkForce 545 Series - Epson WorkForce 645 Series - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson-201112j ]; - }; - ''; - license = with licenses; [ lgpl21 epson ]; - platforms = platforms.linux; - maintainers = []; - }; - } diff --git a/packages/packwiz/default.nix b/packages/packwiz/default.nix deleted file mode 100644 index 3a54208..0000000 --- a/packages/packwiz/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ inputs -, buildGoModule -}: -buildGoModule { - pname = "packwiz"; - version = inputs.packwiz.shortRev; - src = inputs.packwiz; - vendorSha256 = "1f2xh8czq8fh823dyp54rdv5mmb9gf62f5fimdah4wmghqw4wbzy"; -} diff --git a/packages/tetrio/base.nix b/packages/tetrio/base.nix deleted file mode 100644 index 27a42e6..0000000 --- a/packages/tetrio/base.nix +++ /dev/null @@ -1,90 +0,0 @@ -# Copied from https://github.com/NixOS/nixpkgs/pull/146940 - -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, alsa-lib -, cups -, dpkg -, gtk3 -, libpulseaudio -, libX11 -, libXScrnSaver -, libXtst -, mesa -, nss -, systemd -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "tetrio-desktop"; - version = "8.0.0"; - - src = fetchurl { - url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; - name = "${pname}.deb"; - sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf"; - }; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - wrapGAppsHook - ]; - - dontWrapGApps = true; - - buildInputs = [ - alsa-lib - cups - libX11 - libXScrnSaver - libXtst - mesa - nss - gtk3 - ]; - - libPath = lib.makeLibraryPath [ - libpulseaudio - systemd - ]; - - unpackCmd = "dpkg -x $curSrc src"; - - installPhase = '' - runHook preInstall - - mkdir $out - cp -r opt/ usr/share/ $out - - mkdir $out/bin - ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/ - - substituteInPlace $out/share/applications/tetrio-desktop.desktop \ - --replace "Exec=\"/opt/TETR.IO/tetrio-desktop\"" "Exec=\"$out/opt/TETR.IO/tetrio-desktop\"" - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/opt/TETR.IO/tetrio-desktop \ - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO \ - ''${gappsWrapperArgs[@]} - ''; - - meta = with lib; { - homepage = "https://tetr.io"; - downloadPage = "https://tetr.io/about/desktop/"; - description = "TETR.IO desktop client"; - longDescription = '' - TETR.IO is a modern yet familiar online stacker. - Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours! - ''; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - #maintainers = with maintainers; [ wackbyte ]; - }; -} diff --git a/packages/tetrio/plus.nix b/packages/tetrio/plus.nix deleted file mode 100644 index c6a0a07..0000000 --- a/packages/tetrio/plus.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - fetchzip, - lib, - symlinkJoin, - stdenvNoCC, - tetrio-desktop, - unzip -}: - -let - version = "0.23.7"; - - patchedAsar = stdenvNoCC.mkDerivation rec { - pname = "tetrio-plus"; - version = "0.25.3"; - - src = fetchzip { - url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/684477053451cd0819e2c84e145966eb/tetrio-plus_0.25.3_app.asar.zip"; - sha256 = "sha256-GQgt4GZNeKx/uzmVsuKppW2zg8AAiGqsk2JYJIkqfVE="; - }; - - installPhase = '' - runHook preInstall - install app.asar $out - runHook postInstall - ''; - - meta = with lib; { - description = "TETR.IO customization toolkit"; - homepage = "https://gitlab.com/UniQMG/tetrio-plus"; - license = licenses.mit; - maintainers = with maintainers; [ huantian ]; - platforms = [ "x86_64-linux" ]; - }; - }; -in tetrio-desktop.overrideAttrs(old: { - pname = "tetrio-desktop-plus"; - version = old.version + "+${version}"; - - postInstall = '' - cp ${patchedAsar} $out/opt/TETR.IO/resources/app.asar - ''; -}) diff --git a/packages/tree-sitter-glimmer/default.nix b/packages/tree-sitter-glimmer/default.nix deleted file mode 100644 index 5b0e426..0000000 --- a/packages/tree-sitter-glimmer/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - callPackage, - inputs -}: -callPackage (inputs.nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} { - language = "glimmer"; - version = "1.0.0"; - src = inputs.tree-sitter-glimmer; -} diff --git a/shells/cs/default.nix b/shells/cs/default.nix deleted file mode 100644 index 8f7e42a..0000000 --- a/shells/cs/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - callPackage, - lib, - mkShell, - dotnetCorePackages -}: -mkShell { - nativeBuildInputs = [ (with dotnetCorePackages; combinePackages [ sdk_6_0 runtime_6_0 ]) ]; - DOTNET_CLI_TELEMETRY_OPTOUT = 1; - - passthru = { - osu = callPackage ./osu.nix {}; - }; -} diff --git a/shells/cs/osu.nix b/shells/cs/osu.nix deleted file mode 100644 index cfaba27..0000000 --- a/shells/cs/osu.nix +++ /dev/null @@ -1,80 +0,0 @@ -# Flake for development on https://github.com/ppy/osu -{ - lib, - mkShell, - writeScript, - stdenv, - stdenvNoCC, - - dotnetCorePackages, - - alsa-lib, - ffmpeg_4, - icu, - lttng-ust, - numactl, - openssl, - SDL2 -}: -let - baseBuild = "-f net5.0 -v minimal osu.Desktop -- $@"; - - deps = [ - alsa-lib ffmpeg_4 icu lttng-ust numactl openssl SDL2 - ]; - - fixSdl = writeScript "osu-fixsdl" '' - ln -sft osu.Desktop/bin/Debug/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sft osu.Desktop/bin/Release/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} - ''; - buildScript = writeScript "osu-build" '' - rm -f osu.Desktop/bin/Debug/net5.0/linux-x64/libSDL2.so - dotnet build -c Debug -r linux-x64 ${baseBuild} && ${fixSdl} - ''; - buildReleaseScript = writeScript "osu-build-rel" '' - rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so - dotnet build -c Release -r linux-x64 /property:Version=$OSU_VERSION ${baseBuild} && ${fixSdl} - ''; - publishScript = writeScript "osu-publish" '' - rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so - dotnet publish -c Release -r linux-x64 --self-contained false ${baseBuild} && ${fixSdl} - ''; - publishWinScript = writeScript "osu-publish-win" '' - dotnet publish -c Release -r win-x64 --self-contained false -o build-win ${baseBuild} - ''; - runScript = writeScript "osu-run" '' - ${buildScript} && dotnet run --no-build -c Debug -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@ - ''; - runReleaseScript = writeScript "osu-run-rel" '' - ${buildReleaseScript} && dotnet run --no-build -c Release -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@ - ''; - - scripts = stdenvNoCC.mkDerivation { - pname = "osu-scripts"; - version = "1.0.0"; - dontUnpack = true; - installPhase = '' - mkdir $out - cp ${fixSdl} $out/osu-fixsdl - cp ${buildScript} $out/osu-build - cp ${buildReleaseScript} $out/osu-build-rel - cp ${publishScript} $out/osu-publish - cp ${publishWinScript} $out/osu-publish-win - cp ${runScript} $out/osu-run - cp ${runReleaseScript} $out/osu-run-rel - ''; - }; -in mkShell { - nativeBuildInputs = [ - icu - - (with dotnetCorePackages; combinePackages [ sdk_5_0 runtime_5_0 ]) - ]; - - DOTNET_CLI_TELEMETRY_OPTOUT = 1; - DRI_PRIME = 1; - LD_LIBRARY_PATH = lib.makeLibraryPath deps; - shellHook = '' - export PATH="${scripts}:$PATH" - ''; -} diff --git a/shells/default.nix b/shells/default.nix deleted file mode 100644 index d4a08da..0000000 --- a/shells/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, inputs }: { - cs = callPackage ./cs {}; - flutter = callPackage ./flutter {}; - js = callPackage ./js {}; - php = callPackage ./php {}; - rust = callPackage ./rust { inherit inputs; }; -} diff --git a/shells/flutter/default.nix b/shells/flutter/default.nix deleted file mode 100644 index 0f49c4d..0000000 --- a/shells/flutter/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - mkShell, - - flutter, - clang, - cmake, - ninja, - pkg-config, - - atk, - cairo, - gdk-pixbuf, - glib, - gtk3, - harfbuzz, - libGL, - pango, - wayland, - xorg, -}: -let - makeIncludePath = lib.makeSearchPathOutput "include" "include"; - - includePath = makeIncludePath [ - xorg.xorgproto - xorg.libX11.dev - ]; -in mkShell { - nativeBuildInputs = [ - flutter - clang - cmake - ninja - pkg-config - ]; - - C_INCLUDE_PATH = includePath; - CPLUS_INCLUDE_PATH = includePath; - - LD_LIBRARY_PATH = lib.makeLibraryPath "/lib" [ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libGL - pango - wayland - xorg.libX11 - ]; -} diff --git a/shells/js/default.nix b/shells/js/default.nix deleted file mode 100644 index a8e7610..0000000 --- a/shells/js/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkShell, - - nodejs-18_x, - nodePackages, - watchman -}: -mkShell { - buildInputs = [ - nodejs-18_x - watchman - - nodePackages.pnpm - ]; - - shellHook = '' - export PATH="$(readlink -f ./node_modules/.bin):$PATH" - ''; -} diff --git a/shells/php/default.nix b/shells/php/default.nix deleted file mode 100644 index f0777dd..0000000 --- a/shells/php/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - callPackage, - mkShell, - php80, - php80Packages, -}: -mkShell { - buildInputs = [ - php80 - php80Packages.composer - ]; - - passthru = { - osu-web = callPackage ./osu-web.nix {}; - }; -} diff --git a/shells/php/osu-web.nix b/shells/php/osu-web.nix deleted file mode 100644 index 582979b..0000000 --- a/shells/php/osu-web.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Flake for development on https://github.com/ppy/osu-web -{ - mkShell, - nodejs-14_x, - nodePackages, - php80, - php80Packages, - python3 -}: -let - phpPkg = php80.withExtensions ({ enabled, all }: - enabled ++ [ all.intl all.redis ] - ); -in mkShell { - buildInputs = [ - nodejs-14_x - nodePackages.yarn - phpPkg - php80Packages.composer - python3 - ]; - - shellHook = '' - export PATH="$(readlink -f ./node_modules/.bin):$PATH" - ''; -} diff --git a/shells/rust/default.nix b/shells/rust/default.nix deleted file mode 100644 index 65f1877..0000000 --- a/shells/rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - inputs, - mkShell, - - pkg-config -}: -let - overlays = [ (import inputs.rust-overlay) ]; - pkgs = import inputs.nixpkgs { - inherit system overlays; - }; - - toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain; - - rustPlatform = pkgs.makeRustPlatform { - inherit (toolchain) cargo rustc; - }; -in mkShell { - nativeBuildInputs = [ - toolchain - pkg-config - ]; - - RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; -}