Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Syncing local changes #55

Merged
merged 2 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dotfiles.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-
# Remove branches that have already been merged with master
# a.k.a. ‘delete merged’
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d; git remote -v update -p"
empty = commit --allow-empty -m "Empty-Commit"
empty = commit --allow-empty -n -m "Empty-Commit"
g = grep --break --heading --line-number
# View abbreviated SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
Expand Down
8 changes: 5 additions & 3 deletions .wezterm.lua
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
-- https://wezfurlong.org/wezterm/config/files.html

-- Pull in the wezterm API
local wezterm = require("wezterm")
local wezterm = require 'wezterm'

-- This will hold the configuration.
local config = wezterm.config_builder()

config.font = wezterm.font("SpaceMono Nerd Font")
config.color_scheme = "GitHub Dark"
config.font = wezterm.font 'SpaceMono Nerd Font'
-- config.color_scheme = "GitHub Dark"
config.color_scheme = 'tokyonight'

config.max_fps = 120
config.hide_tab_bar_if_only_one_tab = true

-- and finally, return the configuration to wezterm
return config
6 changes: 6 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ if type "devcontainer" >/dev/null; then
alias devexec="devcontainer exec --workspace-folder . zsh"
fi

#################################### LazyGit ###################################

if type "lazygit" >/dev/null; then
alias lg="lazygit"
fi

#################################### GitHub ####################################

if type "gh" >/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion dotfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ install_dependencies() {
elif [ "${ADJUSTED_ID}" = "darwin" ]; then
brew tap homebrew/cask-fonts
brew install --casks dbeaver-community devtoys font-space-mono-nerd-font wezterm
check_packages ack atuin derailed/k9s/k9s dive fzf gh gnupg hadolint helm \
check_packages ack act atuin derailed/k9s/k9s dive fzf gh gnupg hadolint helm \
jordanbaird-ice jq k6 kind jesseduffield/lazygit/lazygit neovim node \
ripgrep shellcheck sslscan step terraform-ls tmux tree-sitter yq \
yt-dlp
Expand Down
Loading