Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| caf75eb73d |
@@ -1,21 +0,0 @@
|
|||||||
return {
|
|
||||||
"nvim-neorg/neorg",
|
|
||||||
lazy = false,
|
|
||||||
version = "*",
|
|
||||||
config = function()
|
|
||||||
require("neorg").setup({
|
|
||||||
load = {
|
|
||||||
["core.defaults"] = {},
|
|
||||||
["core.concealer"] = {},
|
|
||||||
["core.dirman"] = {
|
|
||||||
config = {
|
|
||||||
workspaces = {
|
|
||||||
notes = "~/notes",
|
|
||||||
},
|
|
||||||
default_workspace = "notes",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,9 @@ set -g @plugin 'janoamaral/tokyo-night-tmux'
|
|||||||
|
|
||||||
# Tokyo Night config
|
# Tokyo Night config
|
||||||
set -g @tokyo-night-tmux_theme 'storm'
|
set -g @tokyo-night-tmux_theme 'storm'
|
||||||
set -g @tokyo-night-tmux_window_id_style fsquare
|
set -g @tokyo-night-tmux_show_netspeed 1
|
||||||
|
set -g @tokyo-night-tmux_netspeed_iface "wlp4s0"
|
||||||
|
set -g @tokyo-night-tmux_window_id_style dsquare
|
||||||
|
|
||||||
# Set mouse on so that we can scroll with the mouse
|
# Set mouse on so that we can scroll with the mouse
|
||||||
set -g mouse on
|
set -g mouse on
|
||||||
|
|||||||
@@ -10,6 +10,6 @@ config.enable_tab_bar = false
|
|||||||
config.initial_cols = 205
|
config.initial_cols = 205
|
||||||
config.initial_rows = 45
|
config.initial_rows = 45
|
||||||
config.font_size = 10
|
config.font_size = 10
|
||||||
config.default_prog = { "tmux", "new-session" }
|
config.default_prog = { "tmux", "new-session", "-A", "-s", "main" }
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|||||||
+1
-28
@@ -3,36 +3,19 @@
|
|||||||
############### ALIASES ####################
|
############### ALIASES ####################
|
||||||
|
|
||||||
# Load bottom with the proper color scheme
|
# Load bottom with the proper color scheme
|
||||||
if command -v btm &>/dev/null; then
|
|
||||||
alias btm="btm --theme=gruvbox"
|
alias btm="btm --theme=gruvbox"
|
||||||
fi
|
|
||||||
|
|
||||||
# Remap ls to use lsd
|
# Remap ls to use lsd
|
||||||
if command -v lsd &>/dev/null; then
|
|
||||||
alias ls="lsd"
|
alias ls="lsd"
|
||||||
|
|
||||||
# Add alias for la to call lsd -lah
|
# Add alias for la to call lsd -lah
|
||||||
alias la="lsd -lah"
|
alias la="lsd -lah"
|
||||||
fi
|
|
||||||
|
|
||||||
# Replace cat with bat
|
# Replace cat with bat
|
||||||
if command -v bat &>/dev/null; then
|
|
||||||
alias cat="bat"
|
alias cat="bat"
|
||||||
fi
|
|
||||||
|
|
||||||
# Alias cd to z for zoxide
|
# Alias cd to z for zoxide
|
||||||
if command -v zoxide &>/dev/null; then
|
|
||||||
alias cd="z"
|
alias cd="z"
|
||||||
fi
|
|
||||||
|
|
||||||
# Alias vim to nvim
|
|
||||||
if command -v nvim &>/dev/null; then
|
|
||||||
alias vim="nvim"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Alias for stow --dotfiles
|
|
||||||
if command -v stow &>/dev/null; then
|
|
||||||
alias stow.="stow --dotfiles"
|
|
||||||
fi
|
|
||||||
|
|
||||||
############### END ALIASES ###############
|
############### END ALIASES ###############
|
||||||
|
|
||||||
@@ -42,9 +25,7 @@ fi
|
|||||||
export PATH=$HOME/.local/bin:$PATH
|
export PATH=$HOME/.local/bin:$PATH
|
||||||
|
|
||||||
# Export my local-progs directory to find executables
|
# Export my local-progs directory to find executables
|
||||||
if [[ -d "$HOME/local-progs" ]]; then
|
|
||||||
export PATH=$HOME/local-progs/:$PATH
|
export PATH=$HOME/local-progs/:$PATH
|
||||||
fi
|
|
||||||
|
|
||||||
# Pre-configure settings for zsh-vi-mode
|
# Pre-configure settings for zsh-vi-mode
|
||||||
function zvm_config() {
|
function zvm_config() {
|
||||||
@@ -56,25 +37,17 @@ function zvm_config() {
|
|||||||
|
|
||||||
# Add in our fzf integrations for zsh
|
# Add in our fzf integrations for zsh
|
||||||
# Comment if you don't want the fzf integration
|
# Comment if you don't want the fzf integration
|
||||||
if command -v fzf &>/dev/null; then
|
|
||||||
source <(fzf --zsh)
|
source <(fzf --zsh)
|
||||||
fi
|
|
||||||
|
|
||||||
# Enable vi mode for zsh
|
# Enable vi mode for zsh
|
||||||
if [[ -f "$HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh" ]]; then
|
|
||||||
source $HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh
|
source $HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh
|
||||||
fi
|
|
||||||
|
|
||||||
# We want to make sure that autocompletions are loaded
|
# We want to make sure that autocompletions are loaded
|
||||||
autoload -Uz compinit && compinit
|
autoload -Uz compinit && compinit
|
||||||
|
|
||||||
# Initialize zoxide
|
# Initialize zoxide
|
||||||
if command -v zoxide &>/dev/null; then
|
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
fi
|
|
||||||
|
|
||||||
# Finally we want to use starship for our prompt
|
# Finally we want to use starship for our prompt
|
||||||
# (because rust that's why)
|
# (because rust that's why)
|
||||||
if command -v starship &>/dev/null; then
|
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
fi
|
|
||||||
|
|||||||
Reference in New Issue
Block a user