Compare commits
15 Commits
v1.3.1
...
development
| Author | SHA1 | Date | |
|---|---|---|---|
| 6eec2cd028 | |||
| 80c8976c9d | |||
| 40de6cd46e | |||
| 11a748fac0 | |||
| eeb0247665 | |||
| b69f4a8240 | |||
| 0b3c4a72f0 | |||
| 57f15be7c5 | |||
| d7cafe13f9 | |||
| 83c2cc26ff | |||
| 2c994818e3 | |||
| 419a2cdc2c | |||
| 089fcab83b | |||
| bb6cd297c2 | |||
| 620574ea19 |
@@ -0,0 +1,21 @@
|
|||||||
|
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,9 +6,7 @@ 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_show_netspeed 1
|
set -g @tokyo-night-tmux_window_id_style fsquare
|
||||||
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
|
||||||
|
|||||||
+25
-1
@@ -3,22 +3,36 @@
|
|||||||
############### 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
|
# Alias vim to nvim
|
||||||
|
if command -v nvim &>/dev/null; then
|
||||||
alias vim="nvim"
|
alias vim="nvim"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Alias for stow --dotfiles
|
||||||
|
if command -v stow &>/dev/null; then
|
||||||
|
alias stow.="stow --dotfiles"
|
||||||
|
fi
|
||||||
|
|
||||||
############### END ALIASES ###############
|
############### END ALIASES ###############
|
||||||
|
|
||||||
@@ -28,7 +42,9 @@ alias vim="nvim"
|
|||||||
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() {
|
||||||
@@ -40,17 +56,25 @@ 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