Skip to content

Commit

Permalink
Auto update
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleimp committed Nov 29, 2023
1 parent aad7f7b commit a8e66b7
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 41 deletions.
58 changes: 58 additions & 0 deletions .config/fish/abbr.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Misc
abbr bashrc 'nvim ~/.bashrc'
abbr zshconfig 'nvim ~/.zshrc'
abbr ohmyzsh 'nvim ~/.oh-my-zsh'
abbr vimrc "nvim ~/.vimrc"
abbr dotfiles "nvim $DOTFILES"
abbr nvimconfg "nvim ~/nvim"

abbr :q 'exit'
abbr tree "exa -T"
abbr todos "rg --column --line-number --ignore-case --color always -e '(TODO|FIXME)'"

abbr oss "~/OSS"
abbr workspace "~/workspace"

# git
abbr g "git";
abbr glg "git log --graph --decorate --oneline --abbrev-commit";
abbr ggpush "git push origin HEAD";
abbr gd "git diff";
abbr gc "git commit -s";
abbr gca "git commit -sa";
abbr gco "git checkout";
abbr gb "git branch -v";
abbr ga "git add";
abbr gaa "git add -A";
abbr gcm "git commit -sm";
abbr gcam "git commit -sam";
abbr gst "git status -sb";
abbr glnext "git log --oneline (git describe --tags --abbrev0 @^)..@";

# Kubernetes
abbr k "kubectl"
abbr kn "kubens"
abbr kx "kubectx"

# Elixir
abbr m "mix"
abbr mt "mix test"
abbr mc "mix compile"
abbr mf "mix format"
abbr md "mix deps.get"
abbr mdc "mix deps.compile"
abbr mps "mix phx.server"
abbr mpn "mix phx.new"
abbr mec "mix ecto.create"
abbr mec "mix ecto.migrate"
abbr megm "mix ecto.gen.migration"
abbr i "iex"
abbr ism "iex -S mix"
abbr ips "iex -S mix phx.server"

# Docker
abbr d "docker"
abbr dc "docker compose"

abbr h "history | fzf"
abbr tw "tmux-windowizer"
24 changes: 24 additions & 0 deletions .config/fish/config.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
set -U fish_greeting

set -gx EDITOR nvim
set -gx TERMINAL wezterm
set -gx BROWSER firefox
set -gx TERM xterm-256color

fish_add_path -p \
$HOME/.mix/escripts \
$HOME/.local/bin \
$GOPATH/bin \
$HOME/.mix \
$HOME/.cargo/bin

set -x GOPATH $HOME/go
set -x GO111MODULE on
set -x FZF_DEFAULT_COMMAND "fd --type f --hidden --follow --exclude .git"
set -x DOTFILES $HOME/.dotfiles
set -x NVIMCONF $HOME/nvim-config

# Aliases
source $HOME/.config/fish/abbr.fish

starship init fish | source
3 changes: 3 additions & 0 deletions .config/fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jorgebucaran/fisher
patrickf1/fzf.fish
jethrokuan/z
18 changes: 5 additions & 13 deletions .config/i3/config
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
exec_always --no-startup-id ~/.dotfiles/bin/monitor
# exec_always --no-startup-id ~/.dotfiles/bin/monitor
exec_always --no-startup-id nitrogen --restore
# exec_always --no-startup-id picom --config ~/.config/picom/picom.conf -b
exec_always --no-startup-id picom --config ~/.config/picom/picom.conf -b
# exec_always --no-startup-id xfce4-panel

for_window [class="^.*"] border pixel 2

set $mod Mod4
set $alt Mod1

# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
font pango:JetBrainsMono Nerd Font 8

for_window [urgent=latest] focus
for_window [class="^.*"] border pixel 2
for_window [class=".*"] title_format "%title"

# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
floating_minimum_size 75x50

# start a terminal
# bindsym $mod+Return exec i3-sensible-terminal
Expand Down Expand Up @@ -136,13 +134,7 @@ client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c

bar {
status_command i3blocks
output primary
tray_output primary
font pango:JetBrainsMono Nerd Font 9
colors {
focused_workspace #458588 #458588 #ebdbb2
urgent_workspace #cc241d #cc241d #ebdbb2
}
}

bindsym $mod+m bar mode toggle
Expand Down
3 changes: 2 additions & 1 deletion .config/kitty/kitty.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
include ./tokyonight.conf
shell /bin/zsh
shell /usr/bin/fish

font_family JetBrainsMono Nerd Font
bold_font auto
italic_font auto
bold_italic_font auto

font_size 12
background_opacity .9

enable_audio_bell no

Expand Down
6 changes: 3 additions & 3 deletions .config/starship.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
add_newline = false

[line_break]
disabled = true
disabled = false

[directory]
truncate_to_repo = false

[character]
success_symbol = '[󰧞](green) '
error_symbol = '[󰧞](bold red) '
success_symbol = '[](green) '
error_symbol = '[](bold red) '
22 changes: 0 additions & 22 deletions .config/wezterm/wezterm.lua

This file was deleted.

13 changes: 11 additions & 2 deletions .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 /usr/bin/fish

set -g @continuum-restore 'off'

Expand Down Expand Up @@ -65,4 +65,13 @@ set -g @plugin 'christoomey/vim-tmux-navigator'

run '~/.tmux/plugins/tpm/tpm'

# set -g status-style 'bg=#333333 fg=#5eacd3'
# Style status bar
set -g status-style fg=white,bg=black
set -g window-status-current-style fg=green,bg=black
set -g pane-active-border-style fg=green,bg=black
set -g window-status-format " #I:#W#F "
set -g window-status-current-format " #I:#W#F "
set -g window-status-current-style bg=green,fg=black
set -g window-status-activity-style bg=black,fg=yellow
set -g window-status-separator ""
set -g status-justify centre
Binary file added assets/wallpaper.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a8e66b7

Please sign in to comment.