diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 185d073..6d4233e 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,4 +1,5 @@ -include themes/carbonfox.conf +include themes/Catppuccin_Mocha.conf +# include themes/carbonfox.conf font_family MesloLGS Nerd Font Mono @@ -6,7 +7,7 @@ font_size 14.0 cursor_shape beam -background_opacity 0.9 +background_opacity 0.95 background_blur 10 diff --git a/.config/nvim/lua/lilJ/plugins/carbonfox.lua b/.config/nvim/lua/lilJ/plugins/carbonfox.lua index a41c704..fddb173 100644 --- a/.config/nvim/lua/lilJ/plugins/carbonfox.lua +++ b/.config/nvim/lua/lilJ/plugins/carbonfox.lua @@ -1,28 +1,28 @@ return { - "EdenEast/nightfox.nvim", - lazy = false, - priority = 1000, - init = function() - require("nightfox").setup { - transparent_background = true, - } - vim.cmd.colorscheme "carbonfox" - - vim.cmd.hi "Comment gui=none" - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) - - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - border = "rounded", - }) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = "rounded", - }) - - vim.diagnostic.config { - float = { border = "rounded" }, - } - end, + -- "EdenEast/nightfox.nvim", + -- lazy = false, + -- priority = 1000, + -- init = function() + -- require("nightfox").setup { + -- transparent_background = true, + -- } + -- vim.cmd.colorscheme "carbonfox" + -- + -- vim.cmd.hi "Comment gui=none" + -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + -- vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) + -- + -- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { + -- border = "rounded", + -- }) + -- + -- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { + -- border = "rounded", + -- }) + -- + -- vim.diagnostic.config { + -- float = { border = "rounded" }, + -- } + -- end, } diff --git a/.config/nvim/lua/lilJ/plugins/catppuccin.lua b/.config/nvim/lua/lilJ/plugins/catppuccin.lua index 8018c17..5e6493f 100644 --- a/.config/nvim/lua/lilJ/plugins/catppuccin.lua +++ b/.config/nvim/lua/lilJ/plugins/catppuccin.lua @@ -1,28 +1,29 @@ return { - -- "catppuccin/nvim", - -- name = "catpuccin", - -- priority = 1000, - -- lazy = false, - -- init = function() - -- require("catppuccin").setup { - -- transparent_background = true, - -- } - -- vim.cmd.colorscheme "catppuccin" - -- - -- vim.cmd.hi "Comment gui=none" - -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - -- - -- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - -- border = "rounded", - -- }) - -- - -- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - -- border = "rounded", - -- }) - -- - -- vim.diagnostic.config { - -- float = { border = "rounded" }, - -- } - -- end, + "catppuccin/nvim", + name = "catpuccin", + priority = 1000, + lazy = false, + init = function() + require("catppuccin").setup { + transparent_background = true, + } + vim.cmd.colorscheme "catppuccin" + + vim.cmd.hi "Comment gui=none" + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) + + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { + border = "rounded", + }) + + vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { + border = "rounded", + }) + + vim.diagnostic.config { + float = { border = "rounded" }, + } + end, } diff --git a/.config/starship.toml b/.config/starship.toml index e55d071..e2c543c 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -3,7 +3,7 @@ add_newline = true continuation_prompt = '▶▶ ' format = """$directory$all$character""" -palette = "carbonfox" +palette = "catppuccin_mocha" [aws] symbol = "" @@ -91,33 +91,33 @@ git_fg = "#252525" lang_bg = "#78a9ff" lang_fg = "#353535" -# [palettes.catppuccin_mocha] -# rosewater = "#f5e0dc" -# flamingo = "#f2cdcd" -# pink = "#f5c2e7" -# mauve = "#cba6f7" -# red = "#f38ba8" -# maroon = "#eba0ac" -# peach = "#fab387" -# yellow = "#f9e2af" -# green = "#a6e3a1" -# teal = "#94e2d5" -# sky = "#89dceb" -# sapphire = "#74c7ec" -# blue = "#89b4fa" -# lavender = "#b4befe" -# text = "#cdd6f4" -# subtext1 = "#bac2de" -# subtext0 = "#a6adc8" -# overlay2 = "#9399b2" -# overlay1 = "#7f849c" -# overlay0 = "#6c7086" -# surface2 = "#585b70" -# surface1 = "#45475a" -# surface0 = "#313244" -# base = "#1e1e2e" -# mantle = "#181825" -# crust = "#11111b" +[palettes.catppuccin_mocha] +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" [python] symbol = " " diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index c5137d6..04238b5 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -13,7 +13,7 @@ set -g pane-base-index 1 set-window-option -g pane-base-index 1 set-option -g renumber-windows on -# set -g @plugin 'catppuccin/tmux' +set -g @plugin 'catppuccin/tmux' set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' @@ -33,25 +33,25 @@ bind -r l select-pane -R # Nightfox colors for Tmux # Style: carbonfox # Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/carbonfox.tmux -set -g mode-style "fg=#0c0c0c,bg=#b6b8bb" -set -g message-style "fg=#0c0c0c,bg=#b6b8bb" -set -g message-command-style "fg=#0c0c0c,bg=#b6b8bb" -set -g pane-border-style "fg=#b6b8bb" -set -g pane-active-border-style "fg=#78a9ff" -set -g status "on" -set -g status-justify "left" -set -g status-style "fg=#b5b8bb,bg=#0c0c0c" -set -g status-left-length "100" -set -g status-right-length "100" -set -g status-left-style NONE -set -g status-right-style NONE -set -g status-left "" -set -g status-right "#[fg=#0c0c0c,bg=#b6b8bb,,nobold,nounderscore,noitalics] #W #[fg=#0c0c0c,bg=#78a9ff,bold] #S " -setw -g window-status-activity-style "underscore,fg=#7b7c7e,bg=#0c0c0c" -setw -g window-status-separator "" -setw -g window-status-style "NONE,fg=#7b7c7e,bg=#0c0c0c" -setw -g window-status-format "#[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]#[default] #I #{b:pane_current_path} " -setw -g window-status-current-format "#[fg=#0c0c0c,bg=#b6b8bb,bold] #I #{b:pane_current_path} " +# set -g mode-style "fg=#0c0c0c,bg=#b6b8bb" +# set -g message-style "fg=#0c0c0c,bg=#b6b8bb" +# set -g message-command-style "fg=#0c0c0c,bg=#b6b8bb" +# set -g pane-border-style "fg=#b6b8bb" +# set -g pane-active-border-style "fg=#78a9ff" +# set -g status "on" +# set -g status-justify "left" +# set -g status-style "fg=#b5b8bb,bg=#0c0c0c" +# set -g status-left-length "100" +# set -g status-right-length "100" +# set -g status-left-style NONE +# set -g status-right-style NONE +# set -g status-left "" +# set -g status-right "#[fg=#0c0c0c,bg=#b6b8bb,,nobold,nounderscore,noitalics] #W #[fg=#0c0c0c,bg=#78a9ff,bold] #S " +# setw -g window-status-activity-style "underscore,fg=#7b7c7e,bg=#0c0c0c" +# setw -g window-status-separator "" +# setw -g window-status-style "NONE,fg=#7b7c7e,bg=#0c0c0c" +# setw -g window-status-format "#[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]#[default] #I #{b:pane_current_path} " +# setw -g window-status-current-format "#[fg=#0c0c0c,bg=#b6b8bb,bold] #I #{b:pane_current_path} " run '~/.config/tmux/plugins/tpm/tpm' diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 811022f..7db4a99 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -6,24 +6,24 @@ local config = { window_close_confirmation = "NeverPrompt", font = wezterm.font("MesloLGS Nerd Font Mono"), font_size = 14.0, - -- color_scheme = "Catppuccin Mocha", - color_scheme = "Carbon Fox", - window_background_opacity = 0.85, + color_scheme = "Catppuccin Mocha", + -- color_scheme = "Carbon Fox", + window_background_opacity = 0.95, window_padding = { - left = 2, - right = 2, - top = 2, - bottom = 2, + left = 0, + right = 0, + top = 0, + bottom = 0, }, macos_window_background_blur = 10, } -- uncomment this if not using with some wm --- local mux = wezterm.mux --- --- wezterm.on("gui-startup", function() --- local _, _, window = mux.spawn_window({}) --- window:gui_window():maximize() --- end) +local mux = wezterm.mux + +wezterm.on("gui-startup", function() + local _, _, window = mux.spawn_window({}) + window:gui_window():maximize() +end) return config diff --git a/assets/home.png b/assets/home.png new file mode 100644 index 0000000..bb59e0f Binary files /dev/null and b/assets/home.png differ diff --git a/assets/kitty-cat.png b/assets/kitty-cat.png new file mode 100644 index 0000000..6ebce7e Binary files /dev/null and b/assets/kitty-cat.png differ diff --git a/assets/kitty-fox.png b/assets/kitty-fox.png new file mode 100644 index 0000000..24cf473 Binary files /dev/null and b/assets/kitty-fox.png differ diff --git a/assets/nvim-cat.png b/assets/nvim-cat.png new file mode 100644 index 0000000..42561b4 Binary files /dev/null and b/assets/nvim-cat.png differ diff --git a/assets/nvim-wez-fox.png b/assets/nvim-wez-fox.png new file mode 100644 index 0000000..012e1ad Binary files /dev/null and b/assets/nvim-wez-fox.png differ diff --git a/assets/nvim.png b/assets/nvim.png deleted file mode 100644 index 36116b0..0000000 Binary files a/assets/nvim.png and /dev/null differ diff --git a/assets/telescope-cat.png b/assets/telescope-cat.png new file mode 100644 index 0000000..f0438bb Binary files /dev/null and b/assets/telescope-cat.png differ diff --git a/assets/yabai.png b/assets/yabai-fox.png similarity index 100% rename from assets/yabai.png rename to assets/yabai-fox.png diff --git a/install.sh b/install.sh index 7ce0179..c570c63 100755 --- a/install.sh +++ b/install.sh @@ -24,6 +24,9 @@ brew install zsh-fast-syntax-highlighting echo "Creating symlinks using GNU STOW" stow . +echo "Sourcing zsh config It should work now atleast" +source ~/.zshrc + echo "Installing tmux package manager...." git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm @@ -52,11 +55,12 @@ yabai() { brew install koekeishiya/formulae/yabai brew install koekeishiya/formulae/skhd brew install FelixKratz/formulae/borders - brew install sketchybar + brew install FelixKratz/formulae/sketchybar - yabai --restart-service - skhd --restart-service + yabai --start-service + skhd --start-service brew services start borders + brew services start sketchybar } install_yabai=false diff --git a/readme.md b/readme.md index 01879e5..78ea76d 100644 --- a/readme.md +++ b/readme.md @@ -4,19 +4,28 @@ -### Screenshots +![](./assets/kitty-cat.png) -![](./assets/yabai.png) +![](./assets/nvim-cat.png) -![](./assets/nvim.png) +![](./assets/telescope-cat.png) + +![](./assets/home.png)
- Catpuccin Theme Setup + Yabai tiling wm (expand) -![](./assets/nvim.png) + +![](./assets/yabai.png) + +![](./assets/nvim-wez-fox.png) + + #### Bonus Kitty Becasue somehow even this theme looks better on Kitty than wezterm + +![](./assets/kitty-fox.png)