From 5b743ffe79da51ef68daa3cde0db0c03c1a3b8a9 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Mon, 8 Apr 2024 20:39:29 +0530 Subject: [PATCH] feat(nix): Updated flakes --- flake.lock | 146 +++++++++++++++++++----------------------- flake.nix | 3 - flakes/flake.lock | 42 ++++++------ neovim/flake.lock | 36 +++++------ neovim/nvim.nix | 6 +- overlays.nix | 50 +++++++-------- themes/catppuccin.nix | 13 ++-- 7 files changed, 137 insertions(+), 159 deletions(-) diff --git a/flake.lock b/flake.lock index 0aab263c..ba5d30fc 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1708794349, - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "lastModified": 1711681752, + "narHash": "sha256-LEg6/dmEFxx6Ygti5DO9MOhGNpyB7zdxdWtzv/FCTXk=", "owner": "ipetkov", "repo": "crane", - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "rev": "ada0fb4dcce4561acb1eb17c59b7306d9d4a95f3", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ ] }, "locked": { - "lastModified": 1711868868, - "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", + "lastModified": 1712462372, + "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", "owner": "nix-community", "repo": "home-manager", - "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", + "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", "type": "github" }, "original": { @@ -1088,11 +1088,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1711884603, - "narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=", + "lastModified": 1712509765, + "narHash": "sha256-iX4CCqPTiBIhy7g7tY8Ay3FKDcN4EGF4yqjdcbk5xJk=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "071ebcefb9070e4397d75103f5f535b58dacf250", + "rev": "bbbb960e42c6738c5f3829da8524835ed68e6400", "type": "github" }, "original": { @@ -1111,11 +1111,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1711841488, - "narHash": "sha256-FUtFI1D0k+oVJGs1PnS81INhWNKxBRuEcFj4Ukla3oU=", + "lastModified": 1712428469, + "narHash": "sha256-eCXYge2tA9/bvVOvhSkkLk5QJT+oq93zNTFDo8Sc59w=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "42ae9156458ab4c224f6ca155fc715f9fae44e3f", + "rev": "693f4074aee4bc83bfe49f877ef7f65e12c05beb", "type": "github" }, "original": { @@ -1137,11 +1137,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1711442573, - "narHash": "sha256-/A3YzcY5erYOPojp5Ffwgxv4X5MTnRiWwuaXfgXbK2g=", + "lastModified": 1712261512, + "narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "df7ac26bd24fac8baa94d60a02c3e0f0d4d16368", + "rev": "999c0cb03f748fe311bca78961dbf0562dc91659", "type": "github" }, "original": { @@ -1204,7 +1204,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-tCS3U1V/RGNFT3FFr8NGpCDPkInN0AjVUYQIi2PlMOw=", + "narHash": "sha256-UYnWk+ciSjaMCnV4Ecqwrg8U7mPj8KFdqjueNfN1zP0=", "path": "./neovim", "type": "path" }, @@ -1224,11 +1224,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1711669189, - "narHash": "sha256-VVRFhOKS/MmhV2u6av2e9Qzg4WE24vEmrW/JKed6tlo=", + "lastModified": 1712529338, + "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", "owner": "neovim", "repo": "neovim", - "rev": "e2224a7933b6e30ab6efb0b7ad4e3f26da57c226", + "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", "type": "github" }, "original": { @@ -1248,11 +1248,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1711806068, - "narHash": "sha256-NbLeH+sP0EHsYpio8Jc5AnKlX30oK6emhkGlMmum96I=", + "lastModified": 1712529338, + "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", "owner": "neovim", "repo": "neovim", - "rev": "12240600f5d2c992aa77bc4592edc16814abfafd", + "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", "type": "github" }, "original": { @@ -1273,11 +1273,11 @@ ] }, "locked": { - "lastModified": 1711843759, - "narHash": "sha256-wf4L9CRmKlJmgnejiWokF+DBt+QSZZ/Km42o4Fv9Jx8=", + "lastModified": 1712534643, + "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "65211de770b76f4ea25a89c7ee20bcef1d37a0e6", + "rev": "4cb2a8580de0498dd38eb90791728547b5826331", "type": "github" }, "original": { @@ -1354,11 +1354,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1711854532, - "narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=", + "lastModified": 1712459390, + "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7", + "rev": "4676d72d872459e1e3a248d049609f110c570e9a", "type": "github" }, "original": { @@ -1401,21 +1401,6 @@ "type": "github" } }, - "nixpkgs-main": { - "locked": { - "lastModified": 1711888344, - "narHash": "sha256-MsQmYqPmYUGALyZEFbC1rCVFZIrzUJPScuhLZ0wOzME=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8f4a6210b3ab450642daeb97c83dfcef70e2a41f", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -1450,11 +1435,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709200309, - "narHash": "sha256-lKdtMbhnBNU1lr978T+wEYet3sfIXXgyiDZNEgx8CV8=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe6e807793e7c9cc59cf81225fdee1a03413811", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -1464,11 +1449,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -1480,11 +1465,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -1508,11 +1493,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711888895, - "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", + "lastModified": 1712517143, + "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", "owner": "nix-community", "repo": "nixvim", - "rev": "db6b61f117c83943f15289ced03674f81d08256a", + "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", "type": "github" }, "original": { @@ -1534,11 +1519,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1711888895, - "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", + "lastModified": 1712517143, + "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", "owner": "nix-community", "repo": "nixvim", - "rev": "db6b61f117c83943f15289ced03674f81d08256a", + "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", "type": "github" }, "original": { @@ -1559,11 +1544,11 @@ ] }, "locked": { - "lastModified": 1711670984, - "narHash": "sha256-orA2u5/LqpdPCvYUZnQStarJjjRMylTDYS8JKf97ZfU=", + "lastModified": 1712534643, + "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6a5e80c188d3f3763a624df1610294b4a11764a0", + "rev": "4cb2a8580de0498dd38eb90791728547b5826331", "type": "github" }, "original": { @@ -1574,11 +1559,11 @@ }, "nur": { "locked": { - "lastModified": 1711881870, - "narHash": "sha256-PxPdSD5Xqk2+HPuOqSjIkuRt4L3eI4hsTzz9Kbr4gig=", + "lastModified": 1712584550, + "narHash": "sha256-YFGKzIJcMpEXrrNm6cw6OCXc8Ex9izJoUrXVtOT52cM=", "owner": "nix-community", "repo": "nur", - "rev": "9c8ba168159281644f751bc29bf8a9c00c61de88", + "rev": "ee1298c063ac6b77332f29cb362a8d581e80e186", "type": "github" }, "original": { @@ -1590,11 +1575,11 @@ "nvim-devdocs": { "flake": false, "locked": { - "lastModified": 1703234230, - "narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=", + "lastModified": 1712567876, + "narHash": "sha256-T9bF56J2ZVlSMXP8GKLJ0vBqt0uFV0ikYH/i4eOoqtQ=", "owner": "luckasRanarison", "repo": "nvim-devdocs", - "rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1", + "rev": "a541e8c49a4f46c64fa559d3cd64cb0678766023", "type": "github" }, "original": { @@ -1709,7 +1694,6 @@ "nix-darwin": "nix-darwin_2", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_5", - "nixpkgs-main": "nixpkgs-main", "nixvim": "nixvim_2", "nur": "nur", "rust-overlay": "rust-overlay_6", @@ -1764,11 +1748,11 @@ ] }, "locked": { - "lastModified": 1709172595, - "narHash": "sha256-0oYeE5VkhnPA7YBl+0Utq2cYoHcfsEhSGwraCa27Vs8=", + "lastModified": 1711851236, + "narHash": "sha256-EJ03x3N9ihhonAttkaCrqxb0djDq3URCuDpmVPbNZhA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72fa0217f76020ad3aeb2dd9dd72490905b23b6f", + "rev": "f258266af947599e8069df1c2e933189270f143a", "type": "github" }, "original": { @@ -1837,11 +1821,11 @@ ] }, "locked": { - "lastModified": 1711851236, - "narHash": "sha256-EJ03x3N9ihhonAttkaCrqxb0djDq3URCuDpmVPbNZhA=", + "lastModified": 1712542394, + "narHash": "sha256-UZebDBECRSrJqw4K+LxZ6qFdYnScu6q1XCwqtsu1cas=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f258266af947599e8069df1c2e933189270f143a", + "rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0", "type": "github" }, "original": { @@ -1885,7 +1869,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-FXBBslH2CHFNTtc3NQmcoJAcjGz/c9/+k6oJegUaYig=", + "narHash": "sha256-9kmeDsl6voQvxLQSDPibkA3d3j+SxP/DGvTqNvV3DuM=", "path": "./flakes", "type": "path" }, diff --git a/flake.nix b/flake.nix index b5c4d1e7..1a56dac6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ description = "Home Manager configuration of fs0c131y"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-main.url = "github:nixos/nixpkgs"; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -69,7 +67,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - neovim = { url = "path:./neovim"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/flakes/flake.lock b/flakes/flake.lock index 7e0b22ec..6a27d43a 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "csshacks": { + "flake": false, + "locked": { + "lastModified": 1712075115, + "narHash": "sha256-asxjHWOHWK9Hrf7qF4D+KfFlxQOpPK8oYgdbR1b4gxc=", + "owner": "MrOtherGuy", + "repo": "firefox-csshacks", + "rev": "daf2d17b3607085d51e30a0da01bf9b713672827", + "type": "github" + }, + "original": { + "owner": "MrOtherGuy", + "repo": "firefox-csshacks", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -20,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -34,27 +50,11 @@ "type": "github" } }, - "nvim-devdocs": { - "flake": false, - "locked": { - "lastModified": 1703234230, - "narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=", - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1", - "type": "github" - }, - "original": { - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "type": "github" - } - }, "root": { "inputs": { + "csshacks": "csshacks", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nvim-devdocs": "nvim-devdocs" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/neovim/flake.lock b/neovim/flake.lock index a395db1b..4a175490 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1711669189, - "narHash": "sha256-VVRFhOKS/MmhV2u6av2e9Qzg4WE24vEmrW/JKed6tlo=", + "lastModified": 1712529338, + "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", "owner": "neovim", "repo": "neovim", - "rev": "e2224a7933b6e30ab6efb0b7ad4e3f26da57c226", + "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", "type": "github" }, "original": { @@ -297,11 +297,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711888895, - "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", + "lastModified": 1712517143, + "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", "owner": "nix-community", "repo": "nixvim", - "rev": "db6b61f117c83943f15289ced03674f81d08256a", + "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1711670984, - "narHash": "sha256-orA2u5/LqpdPCvYUZnQStarJjjRMylTDYS8JKf97ZfU=", + "lastModified": 1712534643, + "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6a5e80c188d3f3763a624df1610294b4a11764a0", + "rev": "4cb2a8580de0498dd38eb90791728547b5826331", "type": "github" }, "original": { @@ -364,11 +364,11 @@ "nvim-devdocs": { "flake": false, "locked": { - "lastModified": 1703234230, - "narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=", + "lastModified": 1712567876, + "narHash": "sha256-T9bF56J2ZVlSMXP8GKLJ0vBqt0uFV0ikYH/i4eOoqtQ=", "owner": "luckasRanarison", "repo": "nvim-devdocs", - "rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1", + "rev": "a541e8c49a4f46c64fa559d3cd64cb0678766023", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index d2551a75..78796804 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -114,7 +114,7 @@ in rec { telescope = { enable = true; - extraOptions = { + settings = { defaults = { layout_strategy = "vertical"; layout_config = { @@ -132,7 +132,7 @@ in rec { undo.enable = true; ui-select.enable = true; fzf-native.enable = true; - file_browser.enable = true; + file-browser.enable = true; }; }; @@ -202,8 +202,6 @@ in rec { enable = true; settings.formatting.command = [ "${pkgs.alejandra}/bin/alejandra" - # "${pkgs.nixfmt}/bin/nixfmt" - # "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; # nix.flake.autoArchive = true; }; diff --git a/overlays.nix b/overlays.nix index a67648be..fa264944 100644 --- a/overlays.nix +++ b/overlays.nix @@ -151,30 +151,30 @@ } $out/files ''; }; - catppuccin = final: prev: { - pythonPackagesExtensions = - prev.pythonPackagesExtensions - ++ [ - ( - python-final: python-prev: { - catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec { - version = "1.3.2"; - # TODO: Move to subflake - 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 - ]; - }); - } - ) - ]; - }; + # catppuccin = final: prev: { + # pythonPackagesExtensions = + # prev.pythonPackagesExtensions + # ++ [ + # ( + # python-final: python-prev: { + # catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec { + # version = "1.3.2"; + # # TODO: Move to subflake + # 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 + # ]; + # }); + # } + # ) + # ]; + # }; zellij = final: prev: { zellijPlugins = { zjstatus = inputs.zjstatus.packages.${prev.system}.default; @@ -193,6 +193,6 @@ in [ inputs.nixvim.overlays.default inputs.nur.overlay inputs.neovim.overlays.default - catppuccin + # catppuccin inputs.rust-overlay.overlays.default ] diff --git a/themes/catppuccin.nix b/themes/catppuccin.nix index f3245b10..0113d828 100644 --- a/themes/catppuccin.nix +++ b/themes/catppuccin.nix @@ -72,13 +72,12 @@ in { sha256 = "sha256-2T41qWMe++3Qxl9veRNHMeRI3eU4+LAueKTss02gYNk"; }; - # gtk = pkgs.catppuccin-gtk.override { - # variant = "mocha"; - # size = "standard"; - # accents = ["mauve"]; - # tweaks = ["normal"]; - # }; - gtk = pkgs.catppuccin-gtk; + gtk = pkgs.catppuccin-gtk.override { + variant = "mocha"; + size = "standard"; + accents = ["mauve"]; + tweaks = ["normal"]; + }; papirus-folders = pkgs.catppuccin-papirus-folders.override { accent = "mauve";