From 0f2ac2be9dd276a369071792ea8d33aaad52d60b Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Thu, 16 Jan 2025 19:04:06 -0800 Subject: [PATCH] Updated lockfile --- flake.lock | 336 +++++++++++++++---- modules/home/apps/bat/default.nix | 6 +- modules/home/apps/btop/default.nix | 2 +- modules/home/apps/tmux/default.nix | 27 +- modules/home/programs/fuzzel/default.nix | 6 +- modules/home/programs/fzf/default.nix | 6 +- modules/home/programs/swaylock/default.nix | 6 +- modules/home/programs/yazi/default.nix | 6 +- modules/home/tools/git/default.nix | 4 +- modules/home/windowManagers/sway/default.nix | 8 +- 10 files changed, 297 insertions(+), 110 deletions(-) diff --git a/flake.lock b/flake.lock index f06f65d..4b6de5b 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -26,12 +26,21 @@ } }, "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1734057772, - "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", + "lastModified": 1736957255, + "narHash": "sha256-qZZ/K5XheRMjCNYgle90QESuys0PIFJNPJJswMJ0GEA=", "owner": "catppuccin", "repo": "nix", - "rev": "20b6328df20ae45752c81311d225fd47cba32483", + "rev": "f06fcadf9a61b6581b392e72f230fa6783fe36e4", "type": "github" }, "original": { @@ -40,6 +49,34 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734734291, + "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "revCount": 344, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -135,11 +172,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -157,11 +194,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -172,7 +209,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -190,7 +227,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_2" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -211,6 +248,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -245,11 +300,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -284,15 +339,58 @@ "home-manager": { "inputs": { "nixpkgs": [ + "catppuccin", "nixpkgs" ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "type": "github" }, "original": { @@ -302,7 +400,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -311,11 +409,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -325,6 +423,34 @@ } }, "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -363,11 +489,11 @@ ] }, "locked": { - "lastModified": 1731642829, - "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -378,11 +504,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733620091, - "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -399,11 +525,11 @@ ] }, "locked": { - "lastModified": 1733965598, - "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -414,11 +540,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -430,11 +556,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -446,23 +572,55 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -481,11 +639,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1731803494, - "narHash": "sha256-BbyDllxqBSfxQaX42MU7P9dIKRiAoWtD62C+smxnqko=", + "lastModified": 1735371574, + "narHash": "sha256-DGDm3qUAQk8OM0qqOXQvoIX7XOD7j2Uwhvm+eU5lvyo=", "owner": "alejandro-angulo", "repo": "nixvim-config", - "rev": "7d69922dc91e7d82a8e925e316adad7c3ff9f307", + "rev": "ddb857e6acfead07a9bdbf591cac148f88e291b3", "type": "github" }, "original": { @@ -500,18 +658,18 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731780782, - "narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=", + "lastModified": 1735343514, + "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", "owner": "nix-community", "repo": "nixvim", - "rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935", + "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", "type": "github" }, "original": { @@ -520,10 +678,33 @@ "type": "github" } }, - "nuschtosSearch": { + "nuscht-search": { "inputs": { "flake-utils": "flake-utils", "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "owner": "NuschtOS", + "repo": "search", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixvim", @@ -531,11 +712,11 @@ ] }, "locked": { - "lastModified": 1731582522, - "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "13300b2297c51368e0892c3ebe220f688014fe15", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -547,11 +728,11 @@ "powerlevel10k": { "flake": false, "locked": { - "lastModified": 1731651047, - "narHash": "sha256-0ORdl9kLhfaDPhUZU3bxd3oVqB7hsrZPZ2wUPVu48gY=", + "lastModified": 1736162665, + "narHash": "sha256-6tWuayZgQd9pUrD3xKlUSmOFQCgZ96G3DB8ojgZ/a78=", "owner": "romkatv", "repo": "powerlevel10k", - "rev": "ef83e13c22cf8641f7ab2d50cd1338d01bb31cd2", + "rev": "3e2053a9341fe4cf5ab69909d3f39d53b1dfe772", "type": "github" }, "original": { @@ -566,10 +747,10 @@ "agenix": "agenix", "catppuccin": "catppuccin", "deploy-rs": "deploy-rs", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "powerlevel10k": "powerlevel10k", "snowfall-lib": "snowfall-lib", @@ -585,11 +766,11 @@ ] }, "locked": { - "lastModified": 1732544274, - "narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=", + "lastModified": 1736130495, + "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", "owner": "snowfallorg", "repo": "lib", - "rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb", + "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", "type": "github" }, "original": { @@ -658,6 +839,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -667,11 +863,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -682,7 +878,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, diff --git a/modules/home/apps/bat/default.nix b/modules/home/apps/bat/default.nix index ebc0e64..112a6a3 100644 --- a/modules/home/apps/bat/default.nix +++ b/modules/home/apps/bat/default.nix @@ -13,9 +13,7 @@ in { }; config = mkIf cfg.enable { - programs.bat = { - enable = true; - catppuccin.enable = true; - }; + catppuccin.bat.enable = true; + programs.bat.enable = true; }; } diff --git a/modules/home/apps/btop/default.nix b/modules/home/apps/btop/default.nix index b239b3c..8cb630e 100644 --- a/modules/home/apps/btop/default.nix +++ b/modules/home/apps/btop/default.nix @@ -13,9 +13,9 @@ in { }; config = mkIf cfg.enable { + catppuccin.btop.enable = true; programs.btop = { enable = true; - catppuccin.enable = true; settings = { theme_background = false; vim_keys = true; diff --git a/modules/home/apps/tmux/default.nix b/modules/home/apps/tmux/default.nix index 118d690..3acf417 100644 --- a/modules/home/apps/tmux/default.nix +++ b/modules/home/apps/tmux/default.nix @@ -28,23 +28,24 @@ in { config = lib.mkIf cfg.enable { home.packages = [pkgs.tmux-sessionizer]; + catppuccin.tmux = { + enable = true; + extraConfig = '' + set -g @catppuccin_window_status_style "rounded" + + set -g status-right-length 100 + set -g status-left-length 100 + set -g status-left "" + set -g status-right "#{E:@catppuccin_status_application}" + set -ag status-right "#{E:@catppuccin_status_session}" + set -ag status-right "#{E:@catppuccin_status_host}" + ''; + }; + programs.tmux = { enable = true; baseIndex = 1; - catppuccin = { - enable = true; - extraConfig = '' - set -g @catppuccin_window_status_style "rounded" - - set -g status-right-length 100 - set -g status-left-length 100 - set -g status-left "" - set -g status-right "#{E:@catppuccin_status_application}" - set -ag status-right "#{E:@catppuccin_status_session}" - set -ag status-right "#{E:@catppuccin_status_host}" - ''; - }; keyMode = "vi"; newSession = true; sensibleOnTop = true; diff --git a/modules/home/programs/fuzzel/default.nix b/modules/home/programs/fuzzel/default.nix index 5ccb6df..fef0e85 100644 --- a/modules/home/programs/fuzzel/default.nix +++ b/modules/home/programs/fuzzel/default.nix @@ -14,9 +14,7 @@ in { config = lib.mkIf cfg.enable { home.packages = [pkgs.bemoji]; - programs.fuzzel = { - enable = true; - catppuccin.enable = true; - }; + catppuccin.fuzzel.enable = true; + programs.fuzzel.enable = true; }; } diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix index bd955e9..ab9a09a 100644 --- a/modules/home/programs/fzf/default.nix +++ b/modules/home/programs/fzf/default.nix @@ -11,9 +11,7 @@ in { }; config = lib.mkIf cfg.enable { - programs.fzf = { - enable = true; - catppuccin.enable = true; - }; + catppuccin.fzf.enable = true; + programs.fzf.enable = true; }; } diff --git a/modules/home/programs/swaylock/default.nix b/modules/home/programs/swaylock/default.nix index 79a911e..4df4934 100644 --- a/modules/home/programs/swaylock/default.nix +++ b/modules/home/programs/swaylock/default.nix @@ -13,9 +13,7 @@ in { }; config = mkIf cfg.enable { - programs.swaylock = { - enable = true; - catppuccin.enable = true; - }; + catppuccin.swaylock.enable = true; + programs.swaylock.enable = true; }; } diff --git a/modules/home/programs/yazi/default.nix b/modules/home/programs/yazi/default.nix index eac80a1..9aadc2d 100644 --- a/modules/home/programs/yazi/default.nix +++ b/modules/home/programs/yazi/default.nix @@ -11,9 +11,7 @@ in { }; config = lib.mkIf cfg.enable { - programs.yazi = { - enable = true; - catppuccin.enable = true; - }; + programs.yazi.enable = true; + catppuccin.yazi.enable = true; }; } diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index 69fc54c..db4ab54 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -33,10 +33,10 @@ in { "gco" = "${pkgs.git}/bin/git checkout $(${pkgs.git}/bin/git branch | ${pkgs.fzf}/bin/fzf)"; }; + catppuccin.delta.enable = true; programs.git = { delta = { enable = true; - catppuccin.enable = true; options = { line-numbers = true; navigate = true; @@ -93,9 +93,9 @@ in { }; }; + catppuccin.lazygit.enable = true; programs.lazygit = { enable = true; - catppuccin.enable = true; settings = { quitOnTopLevelReturn = true; gui.nerdFontsVersion = "3"; diff --git a/modules/home/windowManagers/sway/default.nix b/modules/home/windowManagers/sway/default.nix index 2fabfb2..579caad 100644 --- a/modules/home/windowManagers/sway/default.nix +++ b/modules/home/windowManagers/sway/default.nix @@ -65,15 +65,15 @@ in { xdg-utils ]; - catppuccin.pointerCursor = { + catppuccin.cursors = { enable = true; accent = "dark"; }; - gtk.catppuccin = { + catppuccin.gtk = { enable = true; icon.enable = true; }; - qt.style.catppuccin = { + catppuccin.kvantum = { enable = true; apply = true; }; @@ -87,12 +87,12 @@ in { xdg.dataFile.${cfg.wallpaperPath}.source = ./wallpaper.jpg; + catppuccin.sway.enable = true; wayland.windowManager.sway = { # WORKAROUND: https://github.com/nix-community/home-manager/issues/5311 checkConfig = false; enable = true; - catppuccin.enable = true; swaynag.enable = true; wrapperFeatures.gtk = true; # so that gtk works properly systemd.enable = true; # needed this for screen sharing to work