From 87cb4e44e74d6693a4fb846cdbd22b917e7bca83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Tue, 16 Jan 2024 18:08:56 +0100 Subject: [PATCH] feat: add neovide adjustments --- home/default.nix | 1 + home/programs/neovide.nix | 4 ++++ home/programs/neovide.toml | 6 ++++++ home/programs/nixvim.nix | 28 +++++++++++++++++++++++++--- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 home/programs/neovide.nix create mode 100644 home/programs/neovide.toml diff --git a/home/default.nix b/home/default.nix index 6f2127d..4950598 100644 --- a/home/default.nix +++ b/home/default.nix @@ -18,6 +18,7 @@ inputs.ags.homeManagerModules.default inputs.nixvim.homeManagerModules.nixvim inputs.anyrun.homeManagerModules.default + ./programs/neovide.nix ./packages ./programs ./services diff --git a/home/programs/neovide.nix b/home/programs/neovide.nix new file mode 100644 index 0000000..51d4404 --- /dev/null +++ b/home/programs/neovide.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: { + home.packages = [pkgs.neovide]; + xdg.configFile."neovide/config.toml".source = ./neovide.toml; +} diff --git a/home/programs/neovide.toml b/home/programs/neovide.toml new file mode 100644 index 0000000..750a2d5 --- /dev/null +++ b/home/programs/neovide.toml @@ -0,0 +1,6 @@ +maximized = false + +[font] +normal = ["JetBrains Mono"] +size = 16 +edging = "subpixelantialias" diff --git a/home/programs/nixvim.nix b/home/programs/nixvim.nix index 1f49c1f..d862f4e 100644 --- a/home/programs/nixvim.nix +++ b/home/programs/nixvim.nix @@ -188,12 +188,20 @@ in { minimap_close_buftypes = ["nofile"]; minimap_block_filetypes = ["NvimTree"]; - catppuccin_debug = true; - mapleader = ";"; mergetool_layout = "mr"; mergetool_prefer_revision = "local"; + + guifont = "JetBrains_Mono:h12"; + + neovide_transparency = 0.8; + neovide_padding_top = 10; + neovide_padding_bottom = 10; + neovide_padding_left = 10; + neovide_padding_right = 10; + neovide_floating_blur_amount_x = 10; + neovide_floating_blur_amount_y = 10; }; clipboard = { @@ -202,7 +210,9 @@ in { }; extraConfigVim = '' - hi Normal guibg=NONE ctermbg=NONE + if !exists("g:neovide") + hi Normal guibg=NONE ctermbg=NONE + endif set noshowmode ''; @@ -212,6 +222,17 @@ in { require("rest-nvim").setup({}) require("actions-preview").setup({}) + if vim.g.neovide then + vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "*", + callback = function() + local flavour = require("catppuccin").options.background[vim.o.background] + local palette = require("catppuccin.palettes").get_palette(flavour) + vim.cmd("hi Normal guibg=" .. palette.base) + end, + }) + end + local signs = { { name = "DiagnosticSignError", text = "" }, { name = "DiagnosticSignWarn", text = "" }, @@ -257,6 +278,7 @@ in { colorschemes.catppuccin = { enable = true; + terminalColors = true; transparentBackground = true; background = { dark = "frappe";