From e722c97188a636d1a02106b3583889fd429dff6f Mon Sep 17 00:00:00 2001 From: Frothy <76622149+FrothyMarrow@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:19:29 -0600 Subject: [PATCH] theme/oxocarbon: add oxocarbon theme module --- flake.lock | 18 ++++++++++++++++++ flake.nix | 5 +++++ lib/types/plugins.nix | 1 + .../statusline/lualine/supported_themes.nix | 1 + modules/theme/supported_themes.nix | 15 +++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/flake.lock b/flake.lock index 6d5084f..70aceb2 100644 --- a/flake.lock +++ b/flake.lock @@ -1332,6 +1332,23 @@ "type": "github" } }, + "oxocarbon": { + "flake": false, + "locked": { + "lastModified": 1687168305, + "narHash": "sha256-2o++5aRDULfI35d+7psa6bk0eSXH2HwfuGjGtYGjR4w=", + "owner": "glyh", + "repo": "oxocarbon.nvim", + "rev": "7591d2e18df05374d612acba2b2573c7ff44dce4", + "type": "github" + }, + "original": { + "owner": "glyh", + "ref": "lualine-support", + "repo": "oxocarbon.nvim", + "type": "github" + } + }, "plenary-nvim": { "flake": false, "locked": { @@ -1492,6 +1509,7 @@ "obsidian-nvim": "obsidian-nvim", "onedark": "onedark", "orgmode-nvim": "orgmode-nvim", + "oxocarbon": "oxocarbon", "plenary-nvim": "plenary-nvim", "presence-nvim": "presence-nvim", "project-nvim": "project-nvim", diff --git a/flake.nix b/flake.nix index 27b5cb9..03c5d0f 100644 --- a/flake.nix +++ b/flake.nix @@ -312,6 +312,11 @@ flake = false; }; + oxocarbon = { + url = "github:glyh/oxocarbon.nvim/lualine-support"; + flake = false; + }; + # Rust crates crates-nvim = { url = "github:Saecki/crates.nvim"; diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix index 7d8c95b..368fb50 100644 --- a/lib/types/plugins.nix +++ b/lib/types/plugins.nix @@ -42,6 +42,7 @@ with lib; let "onedark" "catppuccin" "dracula" + "oxocarbon" "minimap-vim" "dashboard-nvim" "alpha-nvim" diff --git a/modules/statusline/lualine/supported_themes.nix b/modules/statusline/lualine/supported_themes.nix index e5de3f6..0276998 100644 --- a/modules/statusline/lualine/supported_themes.nix +++ b/modules/statusline/lualine/supported_themes.nix @@ -2,4 +2,5 @@ "tokyonight" "onedark" "catppuccin" + "oxocarbon" ] diff --git a/modules/theme/supported_themes.nix b/modules/theme/supported_themes.nix index d9459f1..05da3c4 100644 --- a/modules/theme/supported_themes.nix +++ b/modules/theme/supported_themes.nix @@ -77,4 +77,19 @@ ''; styles = ["latte" "frappe" "macchiato" "mocha"]; }; + + oxocarbon = { + setup = { + style ? "dark", + transparent ? false, + }: let + style' = + lib.warnIf (style == "light") "oxocarbon: light theme is not well-supported" style; + in '' + require('oxocarbon') + vim.opt.background = "${style'}" + vim.cmd.colorscheme = "oxocarbon" + ''; + styles = ["dark" "light"]; + }; }