natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add catppuccin themes for emacs and nvim

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-01-24 15:10:52 +05:30
parent ec6533a782
commit 67a7c8ea27
9 changed files with 117 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
home/natto/config/emacs/config.org
View File

@@ -1,34 +1,11 @@
#+TITLE: My Emacs Configuration
#+AUTHOR: Amneesh Singh
# #+TITLE: My Emacs Configuration
# #+AUTHOR: Amneesh Singh
#+PROPERTY: header-args:emacs-lisp :tangle yes
* Color Variables
idk random variables to match my color theme
#+begin_src emacs-lisp
; -*- lexical-binding: t; -*-
( setq
c-bg "#073642"
c-fg "#eee8d5"
c-red "#dc322f"
c-green "#859900"
c-yellow "#b58900"
c-blue "#268bd2"
c-magenta "#d33682"
c-cyan "#2aa198"
c-white "#eee8d5"
c-black "#002b36"
c-red-2 "#cb4b16"
c-green-2 "#586e75"
c-yellow-2 "#657b83"
c-blue-2 "#839496"
c-magenta-2 "#6c71c4"
c-cyan-2 "#93a1a1"
c-white-2 "#fdf6e3")
#+end_src
* Settings
** Setting the default face
#+begin_src emacs-lisp
; -*- lexical-binding: t; -*-
(set-frame-font "Fira Code 13" nil t)
(add-to-list 'default-frame-alist '(font . "Fira Code-13"))
#+end_src
@@ -43,6 +20,7 @@ idk random variables to match my color theme
;; (cua-mode 1)
(global-display-line-numbers-mode 1)
(xterm-mouse-mode 1)
(setq ring-bell-function 'ignore)
#+end_src
** Setting some variables
@@ -53,7 +31,6 @@ idk random variables to match my color theme
scroll-step 1
display-line-numbers-type 'relative
confirm-kill-processes nil
dark-theme t
inhibit-startup-screen t)
(setq-default tab-width 2
indent-tabs-mode nil)
@@ -84,14 +61,10 @@ idk random variables to match my color theme
*** Set theme
#+begin_src emacs-lisp
(use-package doom-themes
(use-package catppuccin-theme
:config
(setq doom-themes-enable-bold t
doom-themes-enable-italic t
doom-themes-treemacs-theme "doom-colors")
(load-theme 'doom-solarized-dark t)
(doom-themes-treemacs-config)
(doom-themes-org-config))
(load-theme 'catppuccin t)
(setq dark-theme t))
#+end_src
** Configure Selectrum
@@ -267,11 +240,6 @@ For autocomplete
(use-package nix-mode
:mode "\\.nix\\'")
(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
(lsp-register-client
(make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
:major-modes '(nix-mode)
:server-id 'nix))
(use-package hcl-mode
:mode
@@ -418,29 +386,29 @@ For autocomplete
* Custom mode line
#+begin_src emacs-lisp
(defface mode-line-buf-name
`((t :foreground ,c-fg
:background ,c-bg
`((t :foreground ,(catppuccin-get-color 'text)
:background ,(catppuccin-get-color 'base)
:weight bold
))
"Custom face for buffer name"
:group 'mode-line-faces )
(defface mode-line-maj-mode
`((t :foreground ,c-fg
:background ,c-bg
`((t :foreground ,(catppuccin-get-color 'text)
:background ,(catppuccin-get-color 'base)
))
"Custom face for major mode"
:group 'mode-line-faces )
(defface mode-line-vc
`((t :foreground ,c-fg
:background ,c-red-2
`((t :foreground ,(catppuccin-get-color 'base)
:background ,(catppuccin-get-color 'sky)
:weight bold
))
"Custom face for VC"
:group 'mode-line-faces )
(defface mode-line-info
`((t :foreground ,c-bg
:background ,c-cyan
`((t :foreground ,(catppuccin-get-color 'base)
:background ,(catppuccin-get-color 'green)
:weight bold
))
"For showing line and column number"
@@ -462,14 +430,13 @@ For autocomplete
(add-hook 'post-command-hook
(lambda ()
(let ((color (cond ((minibufferp) default-color)
((evil-insert-state-p) (cons c-magenta c-fg))
((evil-visual-state-p) (cons c-cyan c-fg))
((evil-normal-state-p) (cons c-fg c-bg))
((buffer-modified-p) (cons c-blue c-fg))
((evil-insert-state-p) (cons (catppuccin-get-color 'mauve) (catppuccin-get-color 'base)))
((evil-normal-state-p) (cons (catppuccin-get-color 'yellow) (catppuccin-get-color 'base)))
((evil-visual-state-p) (cons (catppuccin-get-color 'teal) (catppuccin-get-color 'base)))
((buffer-modified-p) (cons (catppuccin-get-color 'red) (catppuccin-get-color 'text)))
(t default-color))))
(set-face-background 'mode-line-buf-name (car color))
(set-face-foreground 'mode-line-buf-name (cdr color))
))))
(set-face-foreground 'mode-line-buf-name (cdr color))))))
#+end_src
* Pop-up terminal
@@ -595,14 +562,13 @@ This returns the command to run in the terminal
#+begin_src emacs-lisp
(defun toggle-theme-shade ()
(if (symbol-value dark-theme)
(progn (disable-theme 'doom-solarized-dark)
(load-theme 'doom-solarized-light t))
(progn (disable-theme 'doom-solarized-light)
(load-theme 'doom-solarized-dark t)))
(progn (setq catppuccin-flavor 'latte)
(catppuccin-reload))
(progn (setq catppuccin-flavor 'mocha)
(catppuccin-reload)))
(setq-local dark-theme (not dark-theme))
(centaur-tabs-display-update)
(centaur-tabs-headline-match)
)
(centaur-tabs-headline-match))
(general-define-key
:states '(normal)

3
home/natto/config/neomutt/neomuttrc
View File

@@ -34,3 +34,6 @@ set mail_check=60
auto_view text/html
alternative_order text/enriched text/plain text/html text
macro index,pager U "<shell-escape>mbsync -a<enter>" "run mbsync to sync all emails"
macro index A \
"<tag-pattern>~N<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" \
"mark all new as read"

1
home/natto/gtk.nix
View File

@@ -14,5 +14,4 @@
name = "Zafiro-icons-Dark";
};
};
qt.platformTheme = "gtk";
}

1
home/natto/pkgs.nix
View File

@@ -82,5 +82,6 @@
anki-bin
tor-browser-bundle-bin
mailcap
libsForQt5.qtstyleplugins
];
}

1
home/natto/stuff.nix
View File

@@ -11,6 +11,7 @@
LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
QT_X11_NO_MITSHM = "1";
HM_CONF_DIR = "/etc/nixos";
QT_QPA_PLATFORMTHEME = "gtk2";
};
shellAliases = rec {

1
home/natto/zsh.nix
View File

@@ -22,6 +22,7 @@ in
};
initExtra = ''
. ${secretPath};
unsetopt extendedGlob
'';
};

2
hosts/modules/nvim/default.nix
View File

@@ -37,7 +37,7 @@
(nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
vim-latex-live-preview
lspkind-nvim
base16-vim
catppuccin-nvim
];
};
};

133
hosts/modules/nvim/init.lua
View File

@@ -1,11 +1,10 @@
--i do not really maintain this anymore since emacs is my main editor now
vim.api.nvim_set_option("termguicolors", true)
local comm = vim.api.nvim_command
local bind = vim.api.nvim_set_keymap
local setvar = vim.api.nvim_set_var
local getvar = vim.api.nvim_get_var
local bind = vim.keymap.set
function hi(hi_var, hi_value)
comm("hi " .. hi_var .. " " .. hi_value)
vim.cmd("hi " .. hi_var .. " " .. hi_value)
end
--SETTINGS
vim.o.cmdheight = 1
@@ -20,7 +19,6 @@ vim.o.cmdheight = 1
vim.o.mouse = "a"
vim.o.splitbelow = true
vim.o.splitright = true
--comm("set nowrap")
vim.o.conceallevel = 0
vim.o.tabstop = 2
vim.o.shiftwidth = 2
@@ -42,12 +40,8 @@ vim.o.cursorcolumn = true
--Colemak-DH bind fuction for hjkl [mnei])
local function cdhbind(a, b)
bind('n', a:lower(), b:lower(), { noremap = true})
bind('n', a:upper(), b:upper(), { noremap = true})
bind('o', a:lower(), b:lower(), { noremap = true})
bind('o', a:upper(), b:upper(), { noremap = true})
bind('x', a:lower(), b:lower(), { noremap = true})
bind('x', a:upper(), b:upper(), { noremap = true})
bind('', a:lower(), b:lower())
bind('', a:upper(), b:upper())
end
cdhbind('m', 'h')
@@ -61,20 +55,19 @@ cdhbind('f', 'e')
cdhbind('t', 'f')
cdhbind('j', 't')
bind('n', "<M-s>", ":w<CR>", {noremap=true})
bind('n', "<M-n>", ":resize -2<CR>", {noremap=true, silent=true})
bind('n', "<M-e>", ":resize +2<CR>", {noremap=true, silent=true})
bind('n', "<M-m>", ":vertical resize -2<CR>", {noremap=true, silent=true})
bind('n', "<M-i>", ":vertical resize +2<CR>", {noremap=true, silent=true})
bind('v', '<', "<gv", {noremap=true})
bind('v', '>', ">gv", {noremap=true})
bind('n', "<C-q>", "<C-w>q", {noremap=true})
bind('n', "<C-m>", "<C-w>h", {noremap=true})
bind('n', "<C-n>", "<C-w>j", {noremap=true})
bind('n', "<C-e>", "<C-w>k", {noremap=true})
bind('n', "<C-i>", "<C-w>l", {noremap=true})
bind('n', "<M-v>", ":vsplit<CR>", {noremap=true, silent=true})
bind('n', "<M-h>", ":split<CR>", {noremap=true, silent=true})
bind('n', "<M-n>", ":resize -2<CR>")
bind('n', "<M-e>", ":resize +2<CR>")
bind('n', "<M-m>", ":vertical resize -2<CR>")
bind('n', "<M-i>", ":vertical resize +2<CR>")
bind('v', '<', "<gv")
bind('v', '>', ">gv")
bind('n', "<C-q>", "<C-w>q")
bind('n', "<C-m>", "<C-w>h")
bind('n', "<C-n>", "<C-w>j")
bind('n', "<C-e>", "<C-w>k")
bind('n', "<C-i>", "<C-w>l")
bind('n', "<M-v>", ":vsplit<CR>")
bind('n', "<M-h>", ":split<CR>")
--RUN AND REPL (using vim-floaterm)
@@ -94,7 +87,7 @@ function _G.CompileRun()
['typescript']= 'tsc ' .. file .. ' && node ' .. noext .. '.js && rm ' .. noext .. '.js'
}
filetype = vim.api.nvim_buf_get_option(0, "filetype")
if commandMap[filetype] ~= nil then comm("FloatermNew --autoclose=0 " .. commandMap[filetype]) end
if commandMap[filetype] ~= nil then vim("FloatermNew --autoclose=0 " .. commandMap[filetype]) end
end
function _G.Repl()
@@ -110,17 +103,16 @@ function _G.Repl()
['lua'] = 'lua'
}
filetype = vim.api.nvim_buf_get_option(0, "filetype")
if commandMap[filetype] ~= nil then comm("FloatermNew " .. commandMap[filetype]) end
if commandMap[filetype] ~= nil then vim.cmd("FloatermNew " .. commandMap[filetype]) end
end
bind('n', "<F5>", ":call v:lua.CompileRun()<CR>", {silent=true})
bind('n', "<F6>", ":call v:lua.Repl()<CR>", {silent=true})
bind('n', "<F5>", ":call v:lua.CompileRun()<CR>")
bind('n', "<F6>", ":call v:lua.Repl()<CR>")
--PLUGINS CONFIG
--nvim-tree.lua
require'nvim-tree'.setup {
diagnostics = {
enable = true,
@@ -152,10 +144,22 @@ require'nvim-tree'.setup {
},
},
},
view = {
adaptive_size = true,
mappings = {
list = {
{ key = "e", action = "" },
{ key = "m", action = "" },
{ key = "f", action = "rename_basename" }
},
},
},
}
bind('n', "<M-o>", ":NvimTreeToggle<CR>", {noremap=true, silent=true})
bind('n', "<Space>r", ":NvimTreeRefresh<CR>", {noremap=true, silent=true})
bind('n', "<Space>f", ":NvimTreeFindFile<CR>", {noremap=true, silent=true})
bind('n', "<M-o>", ":NvimTreeToggle<CR>")
bind('n', "<Space>r", ":NvimTreeRefresh<CR>")
bind('n', "<Space>f", ":NvimTreeFindFile<CR>")
bind('n', "<Space>f", ":NvimTreeFindFile<CR>")
--floaterm
@@ -177,18 +181,18 @@ vim.g.closetag_emptyTags_caseSensitive = 1
vim.g.closetag_shortcut = '>'
--nerdcommenter
bind('n',"<C-c>","<plug>NERDCommenterToggle", {noremap=true, silent=true})
bind('n',"<C-d>","<plug>NERDCommenterSexy", {noremap=true, silent=true})
bind('n',"<M-c>","<plug>NERDCommenterToggle")
bind('n',"<M-d>","<plug>NERDCommenterSexy")
--barbar
bind('n', "<M-,>", ":BufferPrevious<CR>", {silent=true, noremap=true})
bind('n', "<M-.>", ":BufferNext<CR>", {silent=true, noremap=true})
bind('n', "<M-<>", ":BufferMovePrevious<CR>", {silent=true, noremap=true})
bind('n', "<M->>", ":BufferMoveNext<CR>", {silent=true, noremap=true})
bind('n', "<M-w>", ":BufferClose<CR>", {silent=true, noremap=true})
bind('n', "<M-,>", ":BufferPrevious<CR>")
bind('n', "<M-.>", ":BufferNext<CR>")
bind('n', "<M-<>", ":BufferMovePrevious<CR>")
bind('n', "<M->>", ":BufferMoveNext<CR>")
bind('n', "<M-w>", ":BufferClose<CR>")
for i = 1,8,1
do
bind('n', string.format("<M-%d>", i), string.format(":BufferGoto %d<CR>", i), {silent=true, noremap=true})
bind('n', string.format("<M-%d>", i), string.format(":BufferGoto %d<CR>", i))
end
--presence.nvim
@@ -223,7 +227,7 @@ local on_attach = function(client, bufnr)
vim.keymap.set('n', '<M-k>', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', "<M-f>", function() vim.lsp.buf.format { async = true } end, bufopts)
vim.keymap.set('n', "<M-C-f>", function() vim.lsp.buf.format { async = true } end, bufopts)
end
local servers = { "clangd", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix", "terraform_lsp", "html", "cssls", "jsonls", "svelte", "gopls" }
@@ -313,10 +317,10 @@ cmp.setup {
},
}
comm("set shortmess+=c")
vim.cmd("set shortmess+=c")
--STATUSLINE
comm("set noruler")
vim.cmd("set noruler")
vim.o.laststatus = 2
local function mode()
local mode_map = {
@@ -340,11 +344,21 @@ end
--theming
local dark = true
comm("colorscheme base16-solarized-dark")
hi("Light", "guibg=#eee8d5 guifg=#002b36")
hi("Misc", "guibg=#dc322f guifg=#fdf6e3")
hi("Dark", "guibg=#002b36 guifg=#839496")
require("catppuccin").setup({
flavour = "mocha",
background = {
light = "latte",
dark = "mocha",
},
})
vim.cmd("colorscheme catppuccin")
local colors = require("catppuccin.palettes").get_palette "latte"
hi("Light", "guibg=" .. colors.text .. " guifg=" .. colors.crust)
hi("Misc", "guibg=" .. colors.pink .. " guifg=" .. colors.base)
hi("Dark", "guibg=" .. colors.crust .. " guifg=" .. colors.text)
local function git()
local branch = io.popen([[git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n']]):read("*a")
@@ -375,15 +389,22 @@ vim.o.statusline = table.concat(statusline)
function _G.ToggleTheme()
if dark then
comm("colorscheme base16-solarized-light")
vim.cmd("set background=light")
local colors = require("catppuccin.palettes").get_palette "latte"
hi("Light", "guibg=" .. colors.crust .. " guifg=" .. colors.text)
hi("Misc", "guibg=" .. colors.peach .. " guifg=" .. colors.text)
hi("Dark", "guibg=" .. colors.text .. " guifg=" .. colors.crust)
vim.o.statusline = table.concat(statusline)
else
comm("colorscheme base16-solarized-dark")
vim.cmd("set background=dark")
local colors = require("catppuccin.palettes").get_palette "mocha"
hi("Light", "guibg=" .. colors.text .. " guifg=" .. colors.crust)
hi("Misc", "guibg=" .. colors.pink .. " guifg=" .. colors.base)
hi("Dark", "guibg=" .. colors.crust .. " guifg=" .. colors.text)
vim.o.statusline = table.concat(statusline)
end
dark = not dark
hi("Light", "guibg=#eee8d5 guifg=#002b36")
hi("Dark", "guibg=#002b36 guifg=#839496")
hi("Misc", "guibg=#dc322f guifg=#fdf6e3")
vim.o.statusline = table.concat(statusline)
end
bind('n', "<F7>", ":call v:lua.ToggleTheme()<CR>", {silent=true})
bind('n', "<F7>", ":call v:lua.ToggleTheme()<CR>")
vim.g.tex_flavor = "latex"

2
lib/colors.nix
View File

@@ -30,7 +30,7 @@ let
mantle = "#181825";
crust = "#11111B";
background = crust;
background = base;
foreground = text;
};
in