Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleimp committed Sep 3, 2024
1 parent 97bea7e commit 675c4b8
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 144 deletions.
3 changes: 0 additions & 3 deletions .aliases
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ alias grep='rg'
alias :q='exit'
alias v="nvim ."
alias nv="nvim"
alias cat="bat --plain"
alias ls="exa"
alias tree="exa -T"
alias todos="rg --column --line-number --ignore-case --color=always -e '(TODO|FIXME)'"

alias oss="~/OSS"
Expand Down
13 changes: 10 additions & 3 deletions .config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
local wezterm = require("wezterm")

local theme = "dark"

local config = {}

if wezterm.config_builder then
config = wezterm.config_builder()
end

config.color_scheme = "Tokyo Night (Gogh)"
config.font = wezterm.font("JetBrainsMono Nerd Font")
config.font_size = 14
if theme == "light" then
config.color_scheme = "One Light (Gogh)"
else
config.color_scheme = "Gruvbox Dark (Gogh)"
end

config.font = wezterm.font("IosevkaTerm Nerd Font")
config.font_size = 16
config.hide_tab_bar_if_only_one_tab = true

config.keys = {
Expand Down
7 changes: 4 additions & 3 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
[core]
editor = vim
excludesfile = ~/.globalgitignore
pager = delta
pager = delta

[delta]
dark = false
navigate = true
features = line-numbers decorations

file-modified-label = modified:

[delta "decorations"]
Expand All @@ -33,7 +33,7 @@

[diff]
tool = vimdiff
colorMoved = default
colorMoved = default

[github]
user = wesleimp
Expand All @@ -46,6 +46,7 @@
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true

[pull]
rebase = false
[init]
Expand Down
2 changes: 1 addition & 1 deletion .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set-option -g bell-action none
set-window-option -g monitor-activity on
set-window-option -g automatic-rename on

set-option -g default-shell /usr/bin/zsh
set-option -g default-shell /bin/zsh

set -g @continuum-restore 'off'

Expand Down
64 changes: 0 additions & 64 deletions .tmux/themes/catppuccin.conf.theme

This file was deleted.

51 changes: 0 additions & 51 deletions .tmux/themes/gruvbox.conf.theme

This file was deleted.

20 changes: 1 addition & 19 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
export ZSH=$HOME/.oh-my-zsh

ZSH_THEME="spaceship"
ZSH_DISABLE_COMPFIX="true"
SPACESHIP_PROMPT_ORDER=(
user # Username section
dir # Current directory section
host # Hostname section
git # Git section (git_branch + git_status)
exec_time # Execution time
line_sep # Line break
vi_mode # Vi-mode indicator
jobs # Background jobs indicator
exit_code # Exit code section
char # Prompt character
)
SPACESHIP_USER_SHOW=always
SPACESHIP_DIR_TRUNC_REPO=false
SPACESHIP_DIR_TRUNC=0
SPACESHIP_PROMPT_ADD_NEWLINE=false
SPACESHIP_PROMPT_SEPARATE_LINE=false
ZSH_THEME="muse"

plugins=(
git
Expand Down

0 comments on commit 675c4b8

Please sign in to comment.