Merge pull request 'Added stow. alias' (#44) from stow-tweak into development

Reviewed-on: #44

.config/tmux/tmux.conf

@@ -1,11 +0,0 @@
-set -g prefix ^A
-
-set -g @plugin 'fabioluciano/tmux-tokyo-night'
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-
-set -g @theme_variation 'moon' 
-set -g @theme_disable_plugins 1
-#set -g @theme_plugin_datetime_format '%a %d %b %Y'
-
-run '~/.tmux/plugins/tpm/tpm'

.gitignore

@@ -0,0 +1,3 @@
+nvim/dot-config/nvim/lazy-lock.json
+nvim/dot-config/nvim/.luarc.json
+tmux/dot-config/tmux/plugins/

.zshrc

@@ -1,18 +0,0 @@
-# Our ZSH configuration
-
-############### ALIASES ####################
-
-# Load bottom with the proper color scheme
-alias btm="btm --color=gruvbox"
-
-# Remap ls to use lsd
-alias ls="lsd"
-
-# Replace cat with bat
-alias cat="bat"
-
-############### END ALIASES ###############
-
-# Finally we want to use starship for our prompt
-# (because rust that's why)
-eval "$(starship init zsh)"

README.md

@@ -0,0 +1,61 @@
+# Dotfiles
+
+Dotfiles is a repository to hold my collection of dotfiles. Each directory is it's own module if you will for enabling certain subsets of the dotfiles.
+
+## Installation
+
+To install dotfiles first you need to clone the repository. I highly recommend that you clone into your home directory so that you don't need to pass a `--target` every time we invoke stow.
+
+We can clone the repository with the following command:
+
+`git clone https://git.wesirvin.com/wesley/dotfiles.git ~/dotfiles`
+
+After cloning that is it. Just change into the directory and you can deploy or un-deploy following the below instructions.
+
+## Deploying
+
+From inside of our dotfiles directory we can deploy very easily with the following command:
+
+`stow --dotfiles --verbose zsh`
+
+If this command succeeds that is it. Stow creates symlinks to the files in this directory for where they need to go. If you already have configuration files in place then the command may fail. If that happens we have a couple of choices. First things first we need to adopt in the already existing file like so:
+
+`stow --dotfiles --adopt --verbose zsh`
+
+What adopt will do is it will pull your already existing files in and put it's contents in in place of our contents. You have 2 options from this point.
+
+### Keeping Your Changes
+
+If you want to keep your configuration instead of using the one provided in the repository you can just do a git commit. Highly recommend changing branches first. This can be done like so:
+
+```bash
+git checkout -b my-custom-config
+git add --all
+git commit -m "My custom configuration"
+```
+
+### Using the repository version
+
+If you instead want to use the version of the configuration provided from this repository that is easy as well. That can be accomplished with the following:
+
+`git restore zsh`
+
+In this instance that will revert all the changes to the zsh module (effectively erasing your changes and putting back the repository configuration) but the symlinks are still in place. Just replace `zsh` with the module that you want to restore back to the repository version.
+
+## Undeploying
+
+If you want to undeploy the stowed files that can be done with the following:
+
+`stow --delete --verbose zsh`
+
+This command will unstow the zsh changes. The symlinks are removed and now you manually have to take care of the changes. If instead you want to redeploy you can run the following:
+
+`stow --restow --verbose zsh`
+
+This will unstow and then stow the files again. This is great to run if you for instance have moved files and you need to update the symlinks.
+
+## Useful Hints
+
+### Simulating Changes
+
+If you are ever unsure of what is going to happen with a command you can always pass the `--simulate` flag. This combined with `--verbose` will show you exactly what would have changed without making any changes to any files on your system.

kitty/dot-config/kitty/current-theme.conf

@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b

kitty/dot-config/kitty/kitty.conf

@@ -0,0 +1,26 @@
+# BEGIN_KITTY_THEME
+# Tokyo Night Storm
+include current-theme.conf
+# END_KITTY_THEME
+
+cursor_shape block
+shell_integration no-cursor
+
+#background_opacity 0.85
+#background_blur 1
+
+background_image images/terminal-bg.png
+background_image_layout cscaled
+background_tint 0.95
+background_tint_gaps 0.10
+
+window_margin_width 3
+single_window_margin_width 0
+
+enabled_layouts fat:bias=70;full_size=1
+
+map ctrl+shift+enter new_window_with_cwd
+
+remember_window_size no
+initial_window_width 205c
+initial_window_height 45c

nvim/dot-config/nvim/lua/plugins/neorg.lua

@@ -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,
+}

starship/dot-config/starship.toml

@@ -13,11 +13,11 @@ $python\
 [](fg:#3d59a1 bg:#414868)\
 $cmd_duration\
 [ ](fg:#414868)\
-\n$character"""
+\n$sudo\
+$character"""
 
 right_format = """
-$status \
-$sudo\
+$status
 """
 
 [character]

tmux/dot-config/tmux/tmux.conf

@@ -0,0 +1,21 @@
+set -g prefix ^A
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'janoamaral/tokyo-night-tmux'
+
+# Tokyo Night config
+set -g @tokyo-night-tmux_theme 'storm'
+set -g @tokyo-night-tmux_show_netspeed 1
+set -g @tokyo-night-tmux_netspeed_iface "wlp4s0"
+set -g @tokyo-night-tmux_window_id_style fsquare
+
+# Set mouse on so that we can scroll with the mouse
+set -g mouse on
+
+# Set status bar to bottom
+set -g status-position bottom
+
+#set -g @theme_plugin_datetime_format '%a %d %b %Y'
+
+run '~/.tmux/plugins/tpm/tpm'

wezterm/dot-wezterm.lua

@@ -0,0 +1,15 @@
+-- Pull in the wezterm API
+local wezterm = require("wezterm")
+
+-- This will hold the configuration
+local config = wezterm.config_builder()
+
+config.color_scheme = "tokyonight_storm"
+config.window_background_opacity = 0.95
+config.enable_tab_bar = false
+config.initial_cols = 205
+config.initial_rows = 45
+config.font_size = 10
+config.default_prog = { "tmux", "new-session" }
+
+return config

zsh/dot-zshrc

@@ -0,0 +1,59 @@
+# Our ZSH configuration
+
+############### ALIASES ####################
+
+# Load bottom with the proper color scheme
+alias btm="btm --theme=gruvbox"
+
+# Remap ls to use lsd
+alias ls="lsd"
+
+# Add alias for la to call lsd -lah
+alias la="lsd -lah"
+
+# Replace cat with bat
+alias cat="bat"
+
+# Alias cd to z for zoxide
+alias cd="z"
+
+# Alias vim to nvim
+alias vim="nvim"
+
+# Alias for stow --dotfiles
+alias stow.="stow --dotfiles"
+
+############### END ALIASES ###############
+
+############### BEGIN EXPORTS #############
+
+# Exporting $HOME/.local/bin for Zed
+export PATH=$HOME/.local/bin:$PATH
+
+# Export my local-progs directory to find executables
+export PATH=$HOME/local-progs/:$PATH
+
+# Pre-configure settings for zsh-vi-mode
+function zvm_config() {
+	ZVM_CURSOR_STYLE_ENABLED=false
+	ZVM_VI_EDITOR=nvim
+}
+
+############### END EXPORTS ###############
+
+# Add in our fzf integrations for zsh
+# Comment if you don't want the fzf integration
+source <(fzf --zsh)
+
+# Enable vi mode for zsh
+source $HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+
+# We want to make sure that autocompletions are loaded
+autoload -Uz compinit && compinit
+
+# Initialize zoxide
+eval "$(zoxide init zsh)"
+
+# Finally we want to use starship for our prompt
+# (because rust that's why)
+eval "$(starship init zsh)"