diff --git a/.gitattributes b/.gitattributes index 6cebb96..03e1999 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,5 @@ global/.config/mutt/gmail_isync.gpg filter=git-crypt diff=git-crypt linux/.gnupg/gpg-agent.conf filter=git-crypt diff=git-crypt global/scripts/vimwiki_diary_template filter=git-crypt diff=git-crypt global/.zshrc-secrets filter=git-crypt diff=git-crypt +global/.borgmatic/sensitive.yaml filter=git-crypt diff=git-crypt +global/.borgmatic/pass.gpg filter=git-crypt diff=git-crypt diff --git a/global/.borgmatic/bootstrap/manifest.json b/global/.borgmatic/bootstrap/manifest.json new file mode 100644 index 0000000..f53643f --- /dev/null +++ b/global/.borgmatic/bootstrap/manifest.json @@ -0,0 +1 @@ +{"borgmatic_version": "1.8.14", "config_paths": ["/Users/fz0x1/.borgmatic/sensitive.yaml"]} \ No newline at end of file diff --git a/global/.borgmatic/pass.gpg b/global/.borgmatic/pass.gpg new file mode 100644 index 0000000..2344af1 Binary files /dev/null and b/global/.borgmatic/pass.gpg differ diff --git a/global/.borgmatic/sensitive.yaml b/global/.borgmatic/sensitive.yaml new file mode 100644 index 0000000..27e4a91 Binary files /dev/null and b/global/.borgmatic/sensitive.yaml differ diff --git a/global/.config/mutt/accounts/account.com.fz0x1_posteo b/global/.config/mutt/accounts/account.com.fz0x1_posteo index f2dc264..fda9c72 100644 --- a/global/.config/mutt/accounts/account.com.fz0x1_posteo +++ b/global/.config/mutt/accounts/account.com.fz0x1_posteo @@ -8,4 +8,4 @@ set postponed = "+Drafts" set record = "+Sent" set trash = "+Trash" -mailboxes =INBOX =Sent =Service =Hosting =Keys =Drafts =Trash ='Receiving guarantee notifications' =Spam +mailboxes =INBOX =Sent =Service =Hosting =Service =Keys =Drafts =Trash ='Receiving guarantee notifications' =Spam diff --git a/global/.config/nvim/lazy-lock.json b/global/.config/nvim/lazy-lock.json index 0f62e8e..22f4ce7 100644 --- a/global/.config/nvim/lazy-lock.json +++ b/global/.config/nvim/lazy-lock.json @@ -16,6 +16,7 @@ "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, @@ -24,18 +25,17 @@ "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "99cab0b885aaa2f59736c047d23e9a7835d4f9a9" }, - "nvim-lspconfig": { "branch": "master", "commit": "eb36e0185ad4b92b0999fb698428f2966334d2c1" }, + "nvim-lint": { "branch": "master", "commit": "c823e2d0621b5c15aa6b46be4d69b1379bcb8fa6" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4fef355efa3c5d0813512480ee7b2c050b09fe4" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-tree.lua": { "branch": "master", "commit": "45a93d99794fff3064141d5b3a50db98ce352697" }, - "nvim-treesitter": { "branch": "master", "commit": "3c6af36794b26e1bcac3f126b43e0f646154725d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "7f7eeaa99e5a9beab518f502292871ae5f20de6f" }, + "nvim-tree.lua": { "branch": "master", "commit": "8405ecfbd6bb08a94ffc9c68fef211eea56e8a3b" }, + "nvim-treesitter": { "branch": "master", "commit": "929ca9c76ee20bb27cffbde4ee90583b6c54d616" }, + "nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, - "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, - "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, + "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "5ff191f0c7457ede2fd30ecf76ab16c65118b4ee" }, + "render-markdown.nvim": { "branch": "main", "commit": "edd919c88c5c9edf63ce0778ce18c5a41cfd4f1b" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, @@ -44,9 +44,9 @@ "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" }, + "vim-markdown": { "branch": "master", "commit": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51" }, "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, "wrapping.nvim": { "branch": "master", "commit": "a5210c29be19ed736eb3333677e08a57efebce78" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/global/.config/nvim/lua/plugins/conform.lua b/global/.config/nvim/lua/plugins/conform.lua index 2c74a6c..a27a41b 100644 --- a/global/.config/nvim/lua/plugins/conform.lua +++ b/global/.config/nvim/lua/plugins/conform.lua @@ -36,7 +36,7 @@ return { ["*"] = { "trim_whitespace", "codespell" }, }, format_on_save = { - timeout_ms = 500, + timeout_ms = 1000, lsp_fallback = true, }, }, diff --git a/global/.config/nvim/lua/plugins/markdown-preview.lua b/global/.config/nvim/lua/plugins/markdown-preview.lua new file mode 100644 index 0000000..2ef3254 --- /dev/null +++ b/global/.config/nvim/lua/plugins/markdown-preview.lua @@ -0,0 +1,10 @@ +return { + lazy = false, + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + build = "cd app && yarn install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, +} diff --git a/global/.config/nvim/lua/plugins/peek.lua b/global/.config/nvim/lua/plugins/peek.lua deleted file mode 100644 index 2bdc3c7..0000000 --- a/global/.config/nvim/lua/plugins/peek.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "toppair/peek.nvim", - event = { "VeryLazy" }, - build = "deno task --quiet build:fast", - config = function() - require("peek").setup() - -- refer to `configuration to change defaults` - vim.api.nvim_create_user_command("PeekOpen", require("peek").open, {}) - vim.api.nvim_create_user_command("PeekClose", require("peek").close, {}) - end, - lazy = false, -} diff --git a/global/.ssh/config b/global/.ssh/config index 6537b0e..40944bb 100644 Binary files a/global/.ssh/config and b/global/.ssh/config differ diff --git a/global/.zshrc b/global/.zshrc index 24e44d6..0d1e3a9 100644 --- a/global/.zshrc +++ b/global/.zshrc @@ -95,7 +95,7 @@ alias jvim='nvim ~/PKM/02\ -\ journal/$(date "+%Y-%m-%d").md' alias vi='nvim' alias v='nvim' ## string -alias gen8='LC_CTYPE=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 8 | pbcopy' +alias gen8='LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 8 | pbcopy' ## wttr.in alias wr='curl wttr.in' ## python @@ -166,6 +166,12 @@ export TERM=tmux-256color export VOLTA_HOME="$HOME/.volta" export PATH="$VOLTA_HOME/bin:$PATH" +export DENO_INSTALL="$HOME/.deno" +export PATH="$DENO_INSTALL/bin:$PATH" + +export CUSTOM_SCRIPTS="$HOME/scripts" +export PATH="$CUSTOM_SCRIPTS/bin:$PATH" + GPG_TTY=$(tty) export GPG_TTY