Compare commits

..

No commits in common. "b106c6392aa50a65032589af4e6fa31a3133cd7e" and "c3af2f43630c1f3f5e357b984a4b3094518e5ece" have entirely different histories.

7 changed files with 38 additions and 103 deletions

View file

@ -14,10 +14,9 @@ alias grep='grep --color=auto'
alias ip='ip -color=auto' alias ip='ip -color=auto'
alias ls='ls --color=auto' alias ls='ls --color=auto'
alias checkupdates='checkupdates && paru -Qua'
alias hx=helix
alias kssh='/usr/bin/kitty +kitten ssh'
alias pacman-rm-unused='pacman -Qtdq | sudo pacman -Rns -'
alias vim=nvim alias vim=nvim
alias kssh='/usr/bin/kitty +kitten ssh'
alias wget='wget --hsts-file="${XDG_STATE_HOME}/wget-hsts"' alias wget='wget --hsts-file="${XDG_STATE_HOME}/wget-hsts"'
alias zigup='zigup --install-dir "${XDG_DATA_HOME}/zigup" --path-link "${HOME}/.local/bin/zig"' alias zigup='zigup --install-dir "${XDG_DATA_HOME}/zigup" --path-link "${HOME}/.local/bin/zig"'
alias pacman-rm-unused='pacman -Qtdq | sudo pacman -Rns -'
alias checkupdates='checkupdates && paru -Qua'

View file

@ -1,5 +1,5 @@
#import = ["~/.config/alacritty/everforest.toml",] #import = ["~/.config/alacritty/everforest.toml",]
import = ["~/.config/alacritty/catppuccin-macchiato.toml"] import = ["~/.config/alacritty/catppuccin-mocha.toml"]
live_config_reload = true live_config_reload = true
[window] [window]

View file

@ -1,6 +1,6 @@
font_family Hack font_family Hack
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
font_size 13 font_size 12
{{- else }} {{- else }}
font_size 10 font_size 10
{{- end }} {{- end }}
@ -10,4 +10,5 @@ shell_integration enabled no-cursor
enable_audio_bell no enable_audio_bell no
background_opacity 0.95 background_opacity 0.95
window_padding_width 20 window_padding_width 20
include macchiato.conf #background #202020
include everforest-dark.conf

View file

@ -1,80 +0,0 @@
# vim:ft=kitty
## name: Catppuccin Kitty Macchiato
## author: Catppuccin Org
## license: MIT
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/macchiato.conf
## blurb: Soothing pastel theme for the high-spirited!
# The basic colors
foreground #cad3f5
background #24273a
selection_foreground #24273a
selection_background #f4dbd6
# Cursor colors
cursor #f4dbd6
cursor_text_color #24273a
# URL underline color when hovering with mouse
url_color #f4dbd6
# Kitty window border colors
active_border_color #b7bdf8
inactive_border_color #6e738d
bell_border_color #eed49f
# OS Window titlebar colors
wayland_titlebar_color system
macos_titlebar_color system
# Tab bar colors
active_tab_foreground #181926
active_tab_background #c6a0f6
inactive_tab_foreground #cad3f5
inactive_tab_background #1e2030
tab_bar_background #181926
# Colors for marks (marked text in the terminal)
mark1_foreground #24273a
mark1_background #b7bdf8
mark2_foreground #24273a
mark2_background #c6a0f6
mark3_foreground #24273a
mark3_background #7dc4e4
# The 16 terminal colors
# black
color0 #494d64
color8 #5b6078
# red
color1 #ed8796
color9 #ed8796
# green
color2 #a6da95
color10 #a6da95
# yellow
color3 #eed49f
color11 #eed49f
# blue
color4 #8aadf4
color12 #8aadf4
# magenta
color5 #f5bde6
color13 #f5bde6
# cyan
color6 #8bd5ca
color14 #8bd5ca
# white
color7 #b8c0e0
color15 #a5adcb

View file

@ -0,0 +1,25 @@
# Zenburn by jnurmine, https://github.com/jnurmine/Zenburn
# This work is licensed under the terms of the GNU GPL license.
# For a copy, see http://www.gnu.org/licenses/gpl.html.
background #3f3f3f
foreground #dcdccc
cursor #73635a
selection_background #21322f
color0 #4d4d4d
color8 #709080
color1 #b05050
color9 #dca3a3
color2 #60b48a
color10 #c3bf9f
color3 #f0deae
color11 #dfcf9f
color4 #506f8f
color12 #94bff3
color5 #dc8cc3
color13 #ec93d3
color6 #8cd0d3
color14 #93e0e3
color7 #dcdccc
color15 #ffffff
selection_foreground #3f3f3f

View file

@ -20,4 +20,5 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup("plugins") require("lazy").setup("plugins")
vim.cmd("colorscheme catppuccin") vim.cmd("colorscheme everforest")

View file

@ -6,17 +6,6 @@ return {
dependencies = { "nvim-tree/nvim-web-devicons" } dependencies = { "nvim-tree/nvim-web-devicons" }
}, },
-- Theme -- Theme
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
config = function()
local macchiato = require("catppuccin.palettes").get_palette
end,
},
{ {
"neanias/everforest-nvim", "neanias/everforest-nvim",
version = false, version = false,