From e86860ea9570df83294e989aa182d07edfbfc584 Mon Sep 17 00:00:00 2001 From: Redyf Date: Wed, 17 Apr 2024 16:28:00 -0300 Subject: [PATCH 1/2] fix: catppuccin colorscheme not being applied This commit fixes catppuccin not being applied to Neve. The issue happened because nixvim changed the naming convention from camelCase to snake_case, so it had to be updated. --- config/colorschemes/catppuccin.nix | 9 +++++---- flake.lock | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config/colorschemes/catppuccin.nix b/config/colorschemes/catppuccin.nix index 18f6185..312d28a 100644 --- a/config/colorschemes/catppuccin.nix +++ b/config/colorschemes/catppuccin.nix @@ -8,10 +8,11 @@ dark = "mocha"; }; flavour = "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code - disableBold = false; - disableItalic = false; - disableUnderline = false; - transparentBackground = true; + disable_bold = false; + disable_italic = false; + disable_underline = false; + transparent_background = true; + term_colors = true; integrations = { cmp = true; noice = true; diff --git a/flake.lock b/flake.lock index a8a963a..95449f4 100644 --- a/flake.lock +++ b/flake.lock @@ -193,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "lastModified": 1713254108, + "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", + "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713087347, - "narHash": "sha256-RpRIJcbAjR3SF6tarvdG0ErN9afifG/zjxNlntRQrw4=", + "lastModified": 1713294906, + "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", "owner": "nix-community", "repo": "nixvim", - "rev": "ad6a08b69528fdaf7e12c90da06f9a34f32d7ea6", + "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", "type": "github" }, "original": { From 8561d2114948e7853c9fe2ca921ae6b0d438a136 Mon Sep 17 00:00:00 2001 From: Redyf Date: Wed, 17 Apr 2024 16:40:11 -0300 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20update=20ros=C3=A9-pine=20varia?= =?UTF-8?q?ble=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/colorschemes/rose-pine.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/colorschemes/rose-pine.nix b/config/colorschemes/rose-pine.nix index 86bf192..c81f51b 100644 --- a/config/colorschemes/rose-pine.nix +++ b/config/colorschemes/rose-pine.nix @@ -2,10 +2,14 @@ colorschemes = { rose-pine = { enable = false; - style = "main"; # "main", "moon", "dawn" or raw lua code - disableItalics = false; - transparentFloat = true; - transparentBackground = true; + variant = "main"; # "main", "moon", "dawn" or raw lua code + settings = { + styles = { + italic = true; + bold = true; + transparency = false; + }; + }; }; }; }