Skip to content

F as mac #4

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.

Sign up for GitHub

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

Open
alexmk92 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

F as mac #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26b64a8
Updated mac config
alexmk92 May 3, 2021
01d75e0
Tweaked config file for mac
alexmk92 May 3, 2021
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
35 changes: 10 additions & 25 deletions .alacritty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,29 +112,26 @@ scrolling:

# Font configuration (changes require restart)
font:
# The normal (roman) font face to use.
# The normal (roman) font face to use.
normal:
family: SF Mono
style: Regular
family: CaskaydiaCove Nerd Font
style: Book

# The bold font face
bold:
family: SF Mono
style: Bold
family: CaskaydiaCove Nerd Font
style: Book

# The italic font face
italic:
family: SF Mono
style: Regular Italic

family: CaskaydiaCove Nerd Font
style: Book
# Point size of the font
size: 14.0

# Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing.
offset:
x: 0
y: 0
y: 16

# Glyph offset determines the locations of the glyphs within their cells with
# the default being at the bottom. Increase the x offset to move the glyph to
Expand Down Expand Up @@ -273,19 +270,6 @@ mouse:
# If this is `true`, the cursor is temporarily hidden when typing.
hide_when_typing: true

url:
# URL launcher
#
# This program is executed when clicking on a text which is recognized as a URL.
# The URL is always added to the command as the last parameter.
launcher: open

# URL modifiers
#
# These are the modifiers that need to be held down for opening URLs when clicking
# on them. The available modifiers are documented in the key binding section.
#modifiers: Control|Shift

selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>"

Expand Down Expand Up @@ -488,4 +472,5 @@ key_bindings:
- { key: Left, mods: Command, chars: "\x06\x48" }
- { key: Down, mods: Command, chars: "\x06\x4a" }
- { key: Up, mods: Command, chars: "\x06\x4b" }
- { key: Right, mods: Command, chars: "\x06\x4c" }n
- { key: Right, mods: Command, chars: "\x06\x4c" }

2 changes: 1 addition & 1 deletion .aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ alias spy="bro start posterspy"
alias spy-down="echo 'Killing posterspy tmux server...' && tmux kill-session -t posterspy && tmux ls"

alias ctags-generate="ctags -R --exclude={.git/*,.env/*,node_modules/*,vendor/*,.idea/*,.DS_STORE/*}"
alias nvim="~/dotfiles/nvim.appimage"
alias nvim="~/nvim-osx64/bin/nvim"

alias v='nvim'
alias vim='nvim'
Expand Down
38 changes: 3 additions & 35 deletions .bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ export HISTTIMEFORMAT="%Y/%m/%d %H:%M:%S: "
# Duplicate lines and lines starting with a space are not put into the history.
export HISTCONTROL=ignoreboth

# Append to the history file, don't overwrite it.
shopt -s histappend

# Ensure $LINES and $COLUMNS always get updated.
shopt -s checkwinsize
source "${HOME}"/.asdf/asdf.sh
source "${HOME}"/.asdf/completions/asdf.bash

# Enable bash completion.
[ -f /etc/bash_completion ] && source /etc/bash_completion
Expand Down Expand Up @@ -46,42 +43,12 @@ xterm*|rxvt*)
;;
esac

# Enable asdf to manage various programming runtime versions.
# Requires: https://asdf-vm.com/#/
source "${HOME}"/.asdf/asdf.sh
source "${HOME}"/.asdf/completions/asdf.bash

# Start SSH agent on session
source "${HOME}/.ssh/init.sh"

# Enable a better reverse search experience.
# Requires: https://github.com/junegunn/fzf (to use fzf in general)
# Requires: https://github.com/BurntSushi/ripgrep (for using rg below)
export FZF_DEFAULT_COMMAND="rg --files --hidden --follow --glob '!.git'"
export FZF_DEFAULT_OPTS="--color=dark"
[ -f "${HOME}/.fzf.bash" ] && source "${HOME}/.fzf.bash"

# WSL 2 specific settings.
if grep -q "microsoft" /proc/version &>/dev/null; then
# Requires: https://sourceforge.net/projects/vcxsrv/ (or alternative)
export DISPLAY="$(/sbin/ip route | awk '/default/ { print $3 }'):0"
# OpenGL
export LIBGL_ALWAYS_INDIRECT=1

# Allows your gpg passphrase prompt to spawn (useful for signing commits).
export GPG_TTY=$(tty)
fi

# WSL 1 specific settings.
if grep -qE "(Microsoft|WSL)" /proc/version &>/dev/null; then
if [ "$(umask)" = "0000" ]; then
umask 0022
fi

# Requires: https://sourceforge.net/projects/vcxsrv/ (or alternative)
export DISPLAY=:0
fi

[ -f ~/.fzf.bash ] && source ~/.fzf.bash

# checks to see if we are in a windows or linux dir
Expand Down Expand Up @@ -118,3 +85,4 @@ export BAT_THEME="gruvbox-dark"
export PATH="$HOME/local/.bin:$PATH"
export PATH="$HOME/go/bin:$PATH"
export PATH="$HOME/.config/composer/vendor/bin:$PATH"
. "$HOME/.cargo/env"
2 changes: 1 addition & 1 deletion .profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ export LESS_TERMCAP_ue="$(printf '%b' '')"; a="${a%_}"
# If bash is the login shell, then source ~/.bashrc if it exists.
echo "${0}" | grep "bash$" >/dev/null \
&& [ -f "${HOME}/.bashrc" ] && source "${HOME}/.bashrc"
source "$HOME/.cargo/env"
. "$HOME/.cargo/env"
31 changes: 9 additions & 22 deletions .tmux.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ bind-key -n M-Right select-pane -R
# Clear history
bind -n C-k send-keys -R \; clear-history

# Make the status bar look fancy!
set -g status-justify 'centre'
set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  #(gitmux "#{pane_current_path}")'
# #I:#(pwd="#{pane_current_path}"; echo ${pwd####*/})#F
setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #(pwd="#{pane_current_path}"; echo ${pwd####*/})#F #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #(pwd="#{pane_current_path}"; echo ${pwd####*/})#F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'

# # -----------------------------------------------------------------------------
# # Plugin Manager - https://github.com/tmux-plugins/tpm
# # In order to use the plugins below you need to install TPM and the plugins.
Expand Down Expand Up @@ -115,20 +123,6 @@ bind -n C-k clear-history
bind-key -n C-l send-keys 'C-l'
bind-key R switch-client -r

######### DISPLAY ##########
set -g renumber-windows on # renumber windows when a window is closed

set-option -g status-justify "left"
set-option -g status-left-style none
set-option -g status-left-length "80"
set-option -g status-right-style none
set-option -g status-right-length 126

set -g status-right '#(~/go/bin/gitmux #{pane_current_path})'
set-window-option -g window-status-separator " "
set-window-option -g window-status-current-format "#[fg=colour66]#W"
set-window-option -g window-status-format "#W"

# Allow us to reload our Tmux configuration while
# using Tmux
bind r source-file ~/.tmux.conf \; display "Reloaded!"
Expand All @@ -144,12 +138,5 @@ set -g @yank_selection_mouse 'clipboard'
set -g @logging-path "~/.tmux"

# Initialize TPM (keep this line at the very bottom of your tmux.conf).
set-environment -g PATH "~/go/bin:/usr/local/bin:/bin:/usr/bin"
run -b '~/.tmux/plugins/tpm/tpm'

# Make the status bar look fancy!
set -g status-justify 'centre'
set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  %a  %Y #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #H #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour154] #(rainbarf --battery --remaining --no-rgb) '
# #I:#(pwd="#{pane_current_path}"; echo ${pwd####*/})#F
setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #(pwd="#{pane_current_path}"; echo ${pwd####*/})#F #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #(pwd="#{pane_current_path}"; echo ${pwd####*/})#F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'