Skip to content

Commit

Permalink
fixed ctrl+l to only clear screen and not delete history mac/linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Phillip Miller committed May 14, 2022
1 parent bea51ba commit 984f5e4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 16 deletions.
20 changes: 7 additions & 13 deletions MakeFile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ RICHGO := $(shell command -v richgo 2>/dev/null)
GOTESTFMT := $(shell command -v gotestfmt 2>/dev/null)
MIN_GOLANGCI_LINT_VERSION := 001043000

.PHONY: fmt lint build test clean compile chmodX compress
.PHONY: fmt lint build test clean compile compress

default: all

all: fmt lint build test release

release: clean build compile chmodX compress
release: clean build compile compress

fmt:
$(info ******************** checking formatting ********************)
Expand Down Expand Up @@ -60,19 +60,13 @@ clean:
build:
go env -w GOFLAGS=-mod=mod
go mod tidy
go build -v .
go build -v -trimpath -ldflags="-s -w" .

compile:
GOOS=linux GOARCH=amd64 go build -o bin/linux/amd64/pimp-my-shell-$(CURRENT_TAG)-linux-amd64 main.go
GOOS=linux GOARCH=arm64 go build -o bin/linux/arm64/pimp-my-shell-$(CURRENT_TAG)-linux-arm64 main.go
GOOS=darwin GOARCH=amd64 go build -o bin/darwin/amd64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_amd64 main.go
GOOS=darwin GOARCH=arm64 go build -o bin/darwin/arm64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_arm64 main.go

chmodX:
chmod +x bin/linux/amd64/pimp-my-shell-$(CURRENT_TAG)-linux-amd64
chmod +x bin/linux/arm64/pimp-my-shell-$(CURRENT_TAG)-linux-arm64
chmod +x bin/darwin/amd64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_amd64
chmod +x bin/darwin/arm64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_arm64
GOOS=linux GOARCH=amd64 go build -o bin/linux/amd64/pimp-my-shell-$(CURRENT_TAG)-linux-amd64 -trimpath -ldflags="-s -w" main.go
GOOS=linux GOARCH=arm64 go build -o bin/linux/arm64/pimp-my-shell-$(CURRENT_TAG)-linux-arm64 -trimpath -ldflags="-s -w" main.go
GOOS=darwin GOARCH=amd64 go build -o bin/darwin/amd64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_amd64 -trimpath -ldflags="-s -w" main.go
GOOS=darwin GOARCH=arm64 go build -o bin/darwin/arm64/pimp-my-shell-$(CURRENT_TAG)-x86_64-apple-darwin_arm64 -trimpath -ldflags="-s -w" main.go

compress:
gzip -9 bin/linux/amd64/pimp-my-shell-$(CURRENT_TAG)-linux-amd64
Expand Down
3 changes: 3 additions & 0 deletions tmux/templates/darwin/tmux.conf.local
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,9 @@ unbind C-a
# bind C-a send-prefix
# move status line to top
#set -g status-position top
#
# clear screen but not history so you can still scroll back
bind -n C-l send-keys 'C-l'

# Extra Customizations
# Mouse Settings
Expand Down
4 changes: 2 additions & 2 deletions tmux/templates/linux/tmux.conf.local
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ unbind C-a
bind-key j command-prompt -p "join pane from:" "join-pane -s ':%%'"
bind-key s command-prompt -p "send pane to:" "join-pane -t ':%%'"
# clear screen but not history so you can still scroll back
bind C-l send-keys 'C-l'
bind -n C-l send-keys 'C-l'
# MOUSE SETTINGS
set -g mouse on
bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
Expand Down Expand Up @@ -318,4 +318,4 @@ set -g @tpm_plugins ' \
'tmux-plugins/tmux-logging' \
'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run -b '~/.tmux/plugins/tpm/tpm'
run -b '~/.tmux/plugins/tpm/tpm'
2 changes: 1 addition & 1 deletion zsh/templates/.p10k.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@
# Current time color.
typeset -g POWERLEVEL9K_TIME_FOREGROUND=66
# Format for the current time: 09:51:02. See `man 3 strftime`.
typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%I:%M:%S %p}'
typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%Y-%m-%d %I:%M:%S %p}'
# If set to true, time will update when you hit enter. This way prompts for the past
# commands will contain the start times of their commands as opposed to the default
# behavior where they contain the end times of their preceding commands.
Expand Down

0 comments on commit 984f5e4

Please sign in to comment.