From a86126d9d98af1c900115338654bc0ed548acdf1 Mon Sep 17 00:00:00 2001 From: Sathvik Birudavolu Date: Mon, 22 Jan 2024 19:41:06 -0500 Subject: [PATCH] add kanagawa again --- configs/nvim/init.lua | 18 +++++++++++++----- home/alacritty.nix | 43 +++++++++++++++++++++++++++++++++++++++++-- home/packages.nix | 2 ++ 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index a62e39d..f8f23cf 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -166,6 +166,13 @@ require("lazy").setup({ end, }, + { + "rebelot/kanagawa.nvim", + config = function() + require("kanagawa").setup() + end, + }, + { "akinsho/bufferline.nvim", dependencies = "nvim-tree/nvim-web-devicons", @@ -254,13 +261,15 @@ require("lazy").setup({ action_callback = require("gitlinker.actions").open_in_browser, print_url = true, }, + callbacks = { + ["github.kensho.com"] = require("gitlinker.hosts").get_github_type_url, + }, mappings = "go", }) end, }, - { "sindrets/diffview.nvim" - }, + { "sindrets/diffview.nvim" }, -- tree-sitter for parsing, syntax highlighting and much more { @@ -301,8 +310,7 @@ require("lazy").setup({ }, -- Non-LSP language support (formatters mostly) - { "nathangrigg/vim-beancount" - }, + { "nathangrigg/vim-beancount" }, { "mhartington/formatter.nvim", @@ -607,7 +615,7 @@ set.list = true -- Setup autocmds -- to change to light mode -vim.cmd([[colorscheme github_dark]]) +vim.cmd([[colorscheme kanagawa]]) vim.keymap.set("n", "/", ":noh", { noremap = true, silent = true }) diff --git a/home/alacritty.nix b/home/alacritty.nix index 3e40ac2..b7203cc 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -4,7 +4,7 @@ # Alacritty terminal programs.alacritty.enable = true; - programs.alacritty.settings = { + programs.alacritty.settings = rec { shell = { program = "${pkgs.fish}/bin/fish"; args = [ "-c" "${pkgs.tmux}/bin/tmux attach || ${pkgs.tmux}/bin/tmux" ]; @@ -35,8 +35,47 @@ size = 15.0; }; + # Select the coloscheme + colors = kanagawa; + + # Alabaster + # https://github.com/alacritty/alacritty-theme/blob/master/themes/alabaster.toml + alabaster = { + primary = { + background = "#F7F7F7"; + foreground = "#434343"; + }; + + cursor = { + text = "#F7F7F7"; + cursor = "#434343"; + }; + + normal = { + black = "#000000"; + red = "#AA3731"; + green = "#448C27"; + yellow = "#CB9000"; + blue = "#325CC0"; + magenta = "#7A3E9D"; + cyan = "#0083B2"; + white = "#BBBBBB"; + }; + + bright = { + black = "#777777"; + red = "#F05050"; + green = "#60CB00"; + yellow = "#FFBC5D"; + blue = "#007ACC"; + magenta = "#E64CE6"; + cyan = "#00AACB"; + white = "#FFFFFF"; + }; + }; + # Kanagawa Alacritty Colors - colors = { + kanagawa = { primary = { background = "0x1f1f28"; foreground = "0xdcd7ba"; diff --git a/home/packages.nix b/home/packages.nix index a674e44..7c9ff61 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -120,6 +120,8 @@ diff-so-fancy# used for `git diff` fq jq + yq + tailspin ; # Kensho stuff