mirror of
https://github.com/m-housh/dotfiles.git
synced 2026-02-17 15:42:31 +00:00
Compare commits
2 Commits
e10715940f
...
4624fa48d3
| Author | SHA1 | Date | |
|---|---|---|---|
|
4624fa48d3
|
|||
|
fa0cf72ae0
|
@@ -5,8 +5,8 @@
|
|||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[user]
|
[user]
|
||||||
name = Michael Housh
|
name = Michael Housh
|
||||||
email = mhoush@houshhomeenergy.com
|
email = michael@mhoush.com
|
||||||
signingkey = 14A20BF5!
|
signingkey = 0x90D3EB6274D5B7CF
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|||||||
@@ -8,3 +8,6 @@
|
|||||||
hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
|
hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
|
||||||
[mounts "homelab"]
|
[mounts "homelab"]
|
||||||
path = /Users/michael/.local/share/gopass/stores/homelab
|
path = /Users/michael/.local/share/gopass/stores/homelab
|
||||||
|
[recipients "new-test"]
|
||||||
|
hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
|
||||||
|
[mounts "new-test"]
|
||||||
|
|||||||
13
gpg/gpg-agent.conf
Normal file
13
gpg/gpg-agent.conf
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# https://github.com/drduh/config/blob/main/gpg-agent.conf
|
||||||
|
# https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html
|
||||||
|
enable-ssh-support
|
||||||
|
ttyname $GPG_TTY
|
||||||
|
default-cache-ttl 60
|
||||||
|
max-cache-ttl 120
|
||||||
|
#pinentry-program /usr/bin/pinentry-curses
|
||||||
|
#pinentry-program /usr/bin/pinentry-gnome3
|
||||||
|
#pinentry-program /usr/bin/pinentry-tty
|
||||||
|
#pinentry-program /usr/bin/pinentry-x11
|
||||||
|
#pinentry-program /usr/local/bin/pinentry-curses
|
||||||
|
|
||||||
|
#pinentry-program /opt/homebrew/bin/pinentry-mac
|
||||||
70
gpg/gpg.conf
Normal file
70
gpg/gpg.conf
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
# https://github.com/drduh/config/blob/main/gpg.conf
|
||||||
|
# https://www.gnupg.org/documentation/manuals/gnupg/GPG-Options.html
|
||||||
|
# 'gpg --version' to get capabilities
|
||||||
|
# Use AES256, 192, or 128 as cipher
|
||||||
|
personal-cipher-preferences AES256 AES192 AES
|
||||||
|
# Use SHA512, 384, or 256 as digest
|
||||||
|
personal-digest-preferences SHA512 SHA384 SHA256
|
||||||
|
# Use ZLIB, BZIP2, ZIP, or no compression
|
||||||
|
personal-compress-preferences ZLIB BZIP2 ZIP Uncompressed
|
||||||
|
# Default preferences for new keys
|
||||||
|
default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
|
||||||
|
# SHA512 as digest to sign keys
|
||||||
|
cert-digest-algo SHA512
|
||||||
|
# SHA512 as digest for symmetric ops
|
||||||
|
s2k-digest-algo SHA512
|
||||||
|
# AES256 as cipher for symmetric ops
|
||||||
|
s2k-cipher-algo AES256
|
||||||
|
# UTF-8 support for compatibility
|
||||||
|
charset utf-8
|
||||||
|
# No comments in messages
|
||||||
|
no-comments
|
||||||
|
# No version in output
|
||||||
|
no-emit-version
|
||||||
|
# Disable banner
|
||||||
|
no-greeting
|
||||||
|
# Long key id format
|
||||||
|
keyid-format 0xlong
|
||||||
|
# Display UID validity
|
||||||
|
list-options show-uid-validity
|
||||||
|
verify-options show-uid-validity
|
||||||
|
# Display all keys and their fingerprints
|
||||||
|
with-fingerprint
|
||||||
|
# Display key origins and updates
|
||||||
|
#with-key-origin
|
||||||
|
# Cross-certify subkeys are present and valid
|
||||||
|
require-cross-certification
|
||||||
|
# Enforce memory locking to avoid accidentally swapping GPG memory to disk
|
||||||
|
require-secmem
|
||||||
|
# Disable caching of passphrase for symmetrical ops
|
||||||
|
no-symkey-cache
|
||||||
|
# Output ASCII instead of binary
|
||||||
|
armor
|
||||||
|
# Enable smartcard
|
||||||
|
use-agent
|
||||||
|
# Disable recipient key ID in messages (breaks Mailvelope)
|
||||||
|
throw-keyids
|
||||||
|
# Default key ID to use (helpful with throw-keyids)
|
||||||
|
#default-key 0xFF00000000000001
|
||||||
|
#trusted-key 0xFF00000000000001
|
||||||
|
# Group recipient keys (preferred ID last)
|
||||||
|
#group keygroup = 0xFF00000000000003 0xFF00000000000002 0xFF00000000000001
|
||||||
|
# Keyserver URL
|
||||||
|
#keyserver hkps://keys.openpgp.org
|
||||||
|
#keyserver hkps://keys.mailvelope.com
|
||||||
|
#keyserver hkps://keyserver.ubuntu.com:443
|
||||||
|
#keyserver hkps://pgpkeys.eu
|
||||||
|
#keyserver hkps://pgp.circl.lu
|
||||||
|
#keyserver hkp://zkaan2xfbuxia2wpf7ofnkbz6r5zdbbvxbunvp5g2iebopbfc4iqmbad.onion
|
||||||
|
# Keyserver proxy
|
||||||
|
#keyserver-options http-proxy=http://127.0.0.1:8118
|
||||||
|
#keyserver-options http-proxy=socks5-hostname://127.0.0.1:9050
|
||||||
|
# Enable key retrieval using WKD and DANE
|
||||||
|
#auto-key-locate wkd,dane,local
|
||||||
|
#auto-key-retrieve
|
||||||
|
# Trust delegation mechanism
|
||||||
|
#trust-model tofu+pgp
|
||||||
|
# Show expired subkeys
|
||||||
|
#list-options show-unusable-subkeys
|
||||||
|
# Verbose output
|
||||||
|
#verbose
|
||||||
56
nvim/m-housh/lua/plugins/flash.lua
Normal file
56
nvim/m-housh/lua/plugins/flash.lua
Normal file
@@ -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",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<c-s>",
|
||||||
|
mode = { "c" },
|
||||||
|
function()
|
||||||
|
require("flash").toggle()
|
||||||
|
end,
|
||||||
|
desc = "Toggle Flash Search",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
24
nvim/m-housh/lua/plugins/markdown-preview.lua
Normal file
24
nvim/m-housh/lua/plugins/markdown-preview.lua
Normal file
@@ -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 = {
|
||||||
|
{
|
||||||
|
"<leader>mp",
|
||||||
|
ft = "markdown",
|
||||||
|
"<cmd>MarkdownPreviewToggle<cr>",
|
||||||
|
desc = "Markdown Preview",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
build = "cd app && yarn install",
|
||||||
|
init = function()
|
||||||
|
vim.g.mkdp_filetypes = { "markdown" }
|
||||||
|
end,
|
||||||
|
}
|
||||||
@@ -84,6 +84,7 @@ bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file
|
|||||||
######################################## Plugins ########################################
|
######################################## Plugins ########################################
|
||||||
set -g @plugin 'tmux-plugins/tpm'
|
set -g @plugin 'tmux-plugins/tpm'
|
||||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||||
|
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||||
set -g @plugin 'sainnhe/tmux-fzf'
|
set -g @plugin 'sainnhe/tmux-fzf'
|
||||||
set -g @plugin 'tmux-plugins/tmux-yank'
|
set -g @plugin 'tmux-plugins/tmux-yank'
|
||||||
#set -g @plugin 'erikw/tmux-powerline'
|
#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 'catppuccin/tmux'
|
||||||
set -g @plugin 'tmux-plugins/tmux-online-status'
|
set -g @plugin 'tmux-plugins/tmux-online-status'
|
||||||
set -g @plugin 'tmux-plugins/tmux-battery'
|
set -g @plugin 'tmux-plugins/tmux-battery'
|
||||||
|
set -g @plugin 'omerxx/tmux-floax'
|
||||||
|
|
||||||
# Configure Catppuccin
|
# Configure Catppuccin
|
||||||
set -g @catppuccin_flavor "macchiato"
|
set -g @catppuccin_flavor "macchiato"
|
||||||
|
|||||||
@@ -175,9 +175,10 @@ alias gs='git status' # git status quickly
|
|||||||
alias hn='hugo new' # generate a hugo site
|
alias hn='hugo new' # generate a hugo site
|
||||||
alias hnc='hugo new content' # generate new hugo site content quickly
|
alias hnc='hugo new content' # generate new hugo site content quickly
|
||||||
alias j='just' # run justfile's 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 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 pass='gopass'
|
||||||
alias p='gopass' # run the pass command quickly.
|
alias p='gopass' # run the pass command quickly.
|
||||||
alias pf='pass fzf' # fuzzy find a password quickly and copy selection to clipboard.
|
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
|
autoload -Uz compinit
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user