From 926bf9edc1c9f8404b24f04ff41911ecf82083b4 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 22 Mar 2024 23:53:06 +0530 Subject: [PATCH] [feat] Add rust_1.75 overlay for pylyzer --- flake.lock | 42 +++++++++++++++++++++--------------------- overlays.nix | 33 +++++++++++++++++++++++++++++++++ themes/catppuccin.nix | 13 +++++++------ 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index a6a9cc88..60c71952 100644 --- a/flake.lock +++ b/flake.lock @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -675,11 +675,11 @@ ] }, "locked": { - "lastModified": 1710974515, - "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "lastModified": 1711122977, + "narHash": "sha256-EnHux7wf7/7r+YMv8d/Ym1OTllp4sqqq0Bws1a4s2Zo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "rev": "19b87b9ae6ecfd81104a2a36ef8364f1de1b54b1", "type": "github" }, "original": { @@ -696,11 +696,11 @@ ] }, "locked": { - "lastModified": 1710820906, - "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "022464438a85450abb23d93b91aa82e0addd71fb", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -986,11 +986,11 @@ }, "nixpkgs-main": { "locked": { - "lastModified": 1711115889, - "narHash": "sha256-zkQXlAyua4x+LWyxqd8Giq7i6MzOdr9fQYCiNP5AZno=", + "lastModified": 1711127751, + "narHash": "sha256-AnIoFk9LTj+z1QRvKGrbucIL1AFElQZYfamyInBB1Gs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5d01c67cfeb71c1c6f0972a6828f206061b7678", + "rev": "d089679c701bd6de3785d7ebfda68c0ba36221f7", "type": "github" }, "original": { @@ -1090,11 +1090,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711109741, - "narHash": "sha256-QGjyabkJSkKP/RCs11xuVUj/j1wYLLtVRoNB/uGlAvY=", + "lastModified": 1711124705, + "narHash": "sha256-vgFQxvs6T9RcaV9sd9Io+RxQuRKovauMvueGajWWanw=", "owner": "nix-community", "repo": "nixvim", - "rev": "848543d527cdaa3d708dbb69db94dd8e91859ab1", + "rev": "822ec15646b8f7b621468b503118921d644acf39", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ }, "nur": { "locked": { - "lastModified": 1711114923, - "narHash": "sha256-fX5g4ZNlTNGSW6dzUkfzKCQTacIVgLGAovhsA3nbRPs=", + "lastModified": 1711124939, + "narHash": "sha256-IBXc/O+T5ZLBrC6ognGgaDDVOkN0rXHYk2DXmy6OP6o=", "owner": "nix-community", "repo": "nur", - "rev": "058c918315ecbc64295046d2e81227be92ea9595", + "rev": "f9e330219c525b46c8bdf71996a5f45310c741bc", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ ] }, "locked": { - "lastModified": 1710843117, - "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { diff --git a/overlays.nix b/overlays.nix index 4d206d9b..193db0e5 100644 --- a/overlays.nix +++ b/overlays.nix @@ -72,6 +72,12 @@ cargoLock = {lockFile = "${picat-src}/Cargo.lock";}; }; + pylyzer = prev.pylyzer.override { + rustPlatform = final.makeRustPlatform { + rustc = final.pkgs.rust-bin.stable."1.75.0".default; + cargo = final.pkgs.cargo; + }; + }; psst = if final.pkgs.stdenv.isLinux then @@ -242,6 +248,31 @@ }; }; }; + catppuccin = final: prev: { + pythonPackagesExtensions = + prev.pythonPackagesExtensions + ++ [ + ( + python-final: python-prev: { + catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec { + version = "1.3.2"; + + src = prev.fetchFromGitHub { + owner = "catppuccin"; + repo = "python"; + rev = "refs/tags/v${version}"; + hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik="; + }; + + # can be removed next version + disabledTestPaths = [ + "tests/test_flavour.py" # would download a json to check correctness of flavours + ]; + }); + } + ) + ]; + }; in [ catppuccinThemes vimPlugins @@ -253,6 +284,8 @@ in [ misc-applications inputs.neovim-nightly-overlay.overlay inputs.nur.overlay + catppuccin + (import (builtins.fetchTarball { url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; sha256 = "sha256:1k1d7bkx6kdqcvawsm2mm2rd8a0apfkx5y6m1lzr8lxv3bimp4ry";})) # rest-nvim-overlay # inputs.rustaceanvim.overlays.default # inputs.nixneovim.overlays.default diff --git a/themes/catppuccin.nix b/themes/catppuccin.nix index 69109b27..d0414939 100644 --- a/themes/catppuccin.nix +++ b/themes/catppuccin.nix @@ -64,12 +64,13 @@ in { sha256 = "sha256-czvR3bVZ0NfBmuu0JixalS7B1vf1uEGSTSUVVTclKxI"; }; - gtk = pkgs.catppuccin-gtk.override { - variant = "mocha"; - size = "standard"; - accents = ["mauve"]; - tweaks = ["normal"]; - }; + # gtk = pkgs.catppuccin-gtk.override { + # variant = "mocha"; + # size = "standard"; + # accents = ["mauve"]; + # tweaks = ["normal"]; + # }; + gtk = pkgs.catppuccin-gtk; papirus-folders = pkgs.catppuccin-papirus-folders.override { accent = "mauve";