diff --git a/git/git/config b/git/git/config index f139d36..66062b9 100644 --- a/git/git/config +++ b/git/git/config @@ -5,8 +5,8 @@ defaultBranch = main [user] name = Michael Housh - email = mhoush@houshhomeenergy.com - signingkey = 14A20BF5! + email = michael@mhoush.com + signingkey = 0x90D3EB6274D5B7CF [commit] gpgsign = true diff --git a/gopass/config b/gopass/config index e81f0fe..ea20d5a 100644 --- a/gopass/config +++ b/gopass/config @@ -8,3 +8,6 @@ hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3 [mounts "homelab"] path = /Users/michael/.local/share/gopass/stores/homelab +[recipients "new-test"] + hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3 +[mounts "new-test"] diff --git a/nvim/m-housh/lua/plugins/flash.lua b/nvim/m-housh/lua/plugins/flash.lua new file mode 100644 index 0000000..31f43b1 --- /dev/null +++ b/nvim/m-housh/lua/plugins/flash.lua @@ -0,0 +1,56 @@ +return { + "folke/flash.nvim", + event = "VeryLazy", + opts = { + search = { + mode = "normal", + }, + modes = { + char = { + enabled = false, + }, + }, + }, + keys = { + { + "s", + mode = { "n", "x", "o" }, + function() + require("flash").jump() + end, + desc = "Flash", + }, + { + "S", + mode = { "n", "x", "o" }, + function() + require("flash").treesitter() + end, + desc = "Flash Treesitter", + }, + { + "r", + mode = "o", + function() + require("flash").remote() + end, + desc = "Remote Flash", + }, + { + "R", + mode = { "o", "x" }, + function() + require("flash").treesitter_search() + end, + desc = "Treesitter Search", + }, + { + "", + mode = { "c" }, + function() + require("flash").toggle() + end, + desc = "Toggle Flash Search", + }, + }, +} diff --git a/nvim/m-housh/lua/plugins/markdown-preview.lua b/nvim/m-housh/lua/plugins/markdown-preview.lua new file mode 100644 index 0000000..6166bd5 --- /dev/null +++ b/nvim/m-housh/lua/plugins/markdown-preview.lua @@ -0,0 +1,24 @@ +-- This needs some work, as it's not working. May need to install a different browser?? +return { + "iamcco/markdown-preview.nvim", + enabled = false, + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + config = function() + return { + mkdp_browser = "Vivaldi", + } + end, + keys = { + { + "mp", + ft = "markdown", + "MarkdownPreviewToggle", + desc = "Markdown Preview", + }, + }, + build = "cd app && yarn install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, +} diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 1743036..efd044f 100755 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -84,6 +84,7 @@ bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file ######################################## Plugins ######################################## set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'sainnhe/tmux-fzf' set -g @plugin 'tmux-plugins/tmux-yank' #set -g @plugin 'erikw/tmux-powerline' @@ -91,6 +92,7 @@ set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'catppuccin/tmux' set -g @plugin 'tmux-plugins/tmux-online-status' set -g @plugin 'tmux-plugins/tmux-battery' +set -g @plugin 'omerxx/tmux-floax' # Configure Catppuccin set -g @catppuccin_flavor "macchiato" diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc index d8ce7a0..901221f 100755 --- a/zsh/config/.zshrc +++ b/zsh/config/.zshrc @@ -175,9 +175,10 @@ alias gs='git status' # git status quickly alias hn='hugo new' # generate a hugo site alias hnc='hugo new content' # generate new hugo site content quickly alias j='just' # run justfile's quickly. -alias l='ls -lahH --color=auto' # better ls command. +alias l='eza --long --git --group --links --icons' # better ls command. alias lfs='ls -lahH --color=auto "$ZDOTDIR/functions"' # List functions. -alias ls='ls --color' +alias ls='eza --long --git --group --links --icons' +alias lt='eza --long --git --group --links --icons --tree' alias pass='gopass' alias p='gopass' # run the pass command quickly. alias pf='pass fzf' # fuzzy find a password quickly and copy selection to clipboard. @@ -230,4 +231,20 @@ fpath=(/Users/michael/.docker/completions $fpath) autoload -Uz compinit compinit -eval "$(ssh-agent -s)" 1>/dev/null +#eval "$(ssh-agent -s)" 1>/dev/null + +######################################## +# Set things up for using gpg-agent + +export GPG_TTY=$(tty) + +function use-gpg-agent-for-ssh { + SOCK="$( gpgconf --list-dirs agent-ssh-socket )" + if [[ -n "${SOCK:-}" ]] + then + unset SSH_AGENT_PID + export SSH_AUTH_SOCK="$SOCK" + fi +} + +use-gpg-agent-for-ssh