- commit
- 225039b
- parent
- 0c313a1
- author
- Eric Bower
- date
- 2025-04-02 15:26:01 -0400 EDT
chore: changes
6 files changed,
+185,
-125
+13,
-7
1@@ -1,10 +1,16 @@
2 #!/bin/sh
3+w3m \
4+ -T text/html \
5+ -cols $(tput cols) \
6+ -o display_image=false \
7+ -o display_link_number=true \
8+ -o confirm_qq=false
9 # aerc filter which runs w3m using socksify (from the dante package) to prevent
10 # any phoning home by rendered emails
11-export SOCKS_SERVER="127.0.0.1:1"
12-exec socksify w3m \
13- -T text/html \
14- -cols $(tput cols) \
15- -o display_image=false \
16- -o display_link_number=true \
17- -o confirm_qq=false
18+#export SOCKS_SERVER="127.0.0.1:1"
19+#exec socksify w3m \
20+# -T text/html \
21+# -cols $(tput cols) \
22+# -o display_image=false \
23+# -o display_link_number=true \
24+# -o confirm_qq=false
A
bin/tuns
+53,
-0
1@@ -0,0 +1,53 @@
2+#!/usr/bin/env bash
3+
4+TUNNEL_TYPE=""
5+TUNNEL_ENDPOINT=""
6+TUNNEL_ARGS=""
7+
8+case $1 in
9+ http|https)
10+ TUNNEL_TYPE="-R"
11+ TUNNEL_ENDPOINT="$([[ $1 == "http" ]] && echo "80" || echo "443"):"
12+
13+ if [ -z $2 ]; then
14+ echo "Tunnel provided incorrect port. Usage: tunnel $1 <port>"
15+ return
16+ fi
17+
18+ if [ ! -z $3 ]; then
19+ TUNNEL_ENDPOINT="$3:${TUNNEL_ENDPOINT}"
20+ fi
21+
22+ LOCAL_PORT=$2
23+ if [[ $LOCAL_PORT != *":"* ]]; then
24+ LOCAL_PORT="localhost:$2"
25+ fi
26+
27+ TUNNEL_ENDPOINT+="$LOCAL_PORT"
28+ echo "Starting ${1^^} tunnel to $LOCAL_PORT"
29+ ;;
30+
31+ tcp)
32+ TUNNEL_TYPE="-R"
33+ TUNNEL_ENDPOINT="${3:-0}:"
34+
35+ if [ -z $2 ]; then
36+ echo "Tunnel provided incorrect port. Usage: tunnel $1 <port>"
37+ return
38+ fi
39+
40+ LOCAL_PORT=$2
41+ if [[ $LOCAL_PORT != *":"* ]]; then
42+ LOCAL_PORT="localhost:$2"
43+ fi
44+
45+ TUNNEL_ENDPOINT+="$LOCAL_PORT"
46+ echo "Starting ${1^^} tunnel to $LOCAL_PORT"
47+ ;;
48+ *)
49+ echo "unknown tunnel"
50+ return
51+ ;;
52+esac
53+
54+ssh $TUNNEL_TYPE $TUNNEL_ENDPOINT tuns.sh $TUNNEL_ARGS
+1,
-1
1@@ -1,5 +1,5 @@
2 [Personal]
3-source = maildir:///home/erock/mail
4+source = maildir:///mnt/nas/archive/mail
5 exclude-tags = Trash
6 outgoing = smtps+plain://me%40erock.io@smtp.fastmail.com
7 outgoing-cred-cmd = "pass logins/local-mail"
+1,
-1
1@@ -1,6 +1,6 @@
2 fish_config theme choose "dracula"
3
4-fish_add_path ~/.deno/bin ~/.yarn/bin ~/go/bin ~/.npm-packages/bin ~/bin
5+fish_add_path ~/.deno/bin ~/.yarn/bin ~/go/bin ~/.npm-packages/bin ~/bin /usr/local/go/bin
6
7 switch (uname)
8 case Darwin
+115,
-114
1@@ -14,120 +14,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
2 end
3 vim.opt.rtp:prepend(lazypath)
4
5-require("lazy").setup({
6- rocks = {
7- enabled = false,
8- },
9- spec = {
10- {
11- 'neovim/nvim-lspconfig',
12- config = setup_lsp,
13- },
14- {
15- 'nvim-treesitter/nvim-treesitter',
16- build = ':TSUpdate',
17- config = setup_treesitter
18- },
19- {
20- "hrsh7th/nvim-cmp",
21- dependencies = {
22- "hrsh7th/cmp-buffer",
23- "hrsh7th/cmp-vsnip",
24- "hrsh7th/vim-vsnip"
25- },
26- config = setup_comp,
27- },
28- "hrsh7th/cmp-nvim-lsp",
29- {
30- 'lukas-reineke/indent-blankline.nvim',
31- config = function()
32- require("ibl").setup({
33- scope = { enabled = false },
34- })
35- end
36- },
37- {
38- 'ruifm/gitlinker.nvim',
39- dependencies = 'nvim-lua/plenary.nvim',
40- config = function()
41- require"gitlinker".setup()
42- end,
43- },
44- {
45- "christoomey/vim-tmux-navigator",
46- cmd = {
47- "TmuxNavigateLeft",
48- "TmuxNavigateDown",
49- "TmuxNavigateUp",
50- "TmuxNavigateRight",
51- "TmuxNavigatePrevious",
52- "TmuxNavigatorProcessList",
53- },
54- keys = {
55- { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
56- { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
57- { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
58- { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
59- { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
60- },
61- },
62- {
63- 'Mofiqul/dracula.nvim',
64- lazy = false,
65- priority = 1000,
66- config = function()
67- require('dracula').setup({})
68- vim.cmd[[colorscheme dracula]]
69- end
70- },
71- {
72- "karb94/neoscroll.nvim",
73- config = function()
74- require('neoscroll').setup({})
75- end
76- },
77- {
78- "ibhagwan/fzf-lua",
79- config = function()
80- local fzf = require('fzf-lua')
81- local fzfFiles = function()
82- fzf.files({
83- winopts = {
84- preview = { hidden = "hidden" },
85- },
86- })
87- end
88- vim.keymap.set("n", "<leader>s", fzfFiles, { desc = "Fzf Files", noremap=true, silent=true })
89- vim.keymap.set("n", "<leader>f", fzf.buffers, { desc = "Fzf Buffers", noremap=true, silent=true })
90- vim.keymap.set("n", "<leader>S", fzf.live_grep, { desc = "Fzf Grep", noremap=true, silent=true })
91- fzf.setup({'max-perf'})
92- end
93- },
94- {
95- "nvim-treesitter/nvim-treesitter-context",
96- config = function()
97- require'treesitter-context'.setup({
98- max_lines = 1,
99- })
100- end,
101- },
102- {
103- "chentoast/marks.nvim",
104- config = function()
105- require'marks'.setup({})
106- end,
107- },
108- {
109- 'nvim-lualine/lualine.nvim',
110- config = function()
111- require'lualine'.setup({})
112- end
113- },
114- -- vim plugins
115- 'rhysd/git-messenger.vim'
116- },
117-})
118-
119 function setup_treesitter()
120 require'nvim-treesitter.configs'.setup {
121 ensure_installed = {
122@@ -164,6 +50,7 @@ function setup_treesitter()
123 "toml",
124 "tsx",
125 "typescript",
126+ "typst",
127 "vim",
128 "vimdoc",
129 "yaml",
130@@ -269,3 +156,117 @@ function setup_lsp()
131 handler("ts_ls")
132 handler("zls")
133 end
134+
135+require("lazy").setup({
136+ rocks = {
137+ enabled = false,
138+ },
139+ spec = {
140+ {
141+ 'neovim/nvim-lspconfig',
142+ config = setup_lsp,
143+ },
144+ {
145+ 'nvim-treesitter/nvim-treesitter',
146+ build = ':TSUpdate',
147+ config = setup_treesitter
148+ },
149+ {
150+ "hrsh7th/nvim-cmp",
151+ dependencies = {
152+ "hrsh7th/cmp-buffer",
153+ "hrsh7th/cmp-vsnip",
154+ "hrsh7th/vim-vsnip"
155+ },
156+ config = setup_comp,
157+ },
158+ "hrsh7th/cmp-nvim-lsp",
159+ {
160+ 'lukas-reineke/indent-blankline.nvim',
161+ config = function()
162+ require("ibl").setup({
163+ scope = { enabled = false },
164+ })
165+ end
166+ },
167+ {
168+ 'ruifm/gitlinker.nvim',
169+ dependencies = 'nvim-lua/plenary.nvim',
170+ config = function()
171+ require"gitlinker".setup()
172+ end,
173+ },
174+ {
175+ "christoomey/vim-tmux-navigator",
176+ cmd = {
177+ "TmuxNavigateLeft",
178+ "TmuxNavigateDown",
179+ "TmuxNavigateUp",
180+ "TmuxNavigateRight",
181+ "TmuxNavigatePrevious",
182+ "TmuxNavigatorProcessList",
183+ },
184+ keys = {
185+ { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
186+ { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
187+ { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
188+ { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
189+ { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
190+ },
191+ },
192+ {
193+ 'Mofiqul/dracula.nvim',
194+ lazy = false,
195+ priority = 1000,
196+ config = function()
197+ require('dracula').setup({})
198+ vim.cmd[[colorscheme dracula]]
199+ end
200+ },
201+ {
202+ "karb94/neoscroll.nvim",
203+ config = function()
204+ require('neoscroll').setup({})
205+ end
206+ },
207+ {
208+ "ibhagwan/fzf-lua",
209+ config = function()
210+ local fzf = require('fzf-lua')
211+ local fzfFiles = function()
212+ fzf.files({
213+ winopts = {
214+ preview = { hidden = "hidden" },
215+ },
216+ })
217+ end
218+ vim.keymap.set("n", "<leader>s", fzfFiles, { desc = "Fzf Files", noremap=true, silent=true })
219+ vim.keymap.set("n", "<leader>f", fzf.buffers, { desc = "Fzf Buffers", noremap=true, silent=true })
220+ vim.keymap.set("n", "<leader>S", fzf.live_grep, { desc = "Fzf Grep", noremap=true, silent=true })
221+ fzf.setup({'max-perf'})
222+ end
223+ },
224+ {
225+ "nvim-treesitter/nvim-treesitter-context",
226+ config = function()
227+ require'treesitter-context'.setup({
228+ max_lines = 1,
229+ })
230+ end,
231+ },
232+ {
233+ "chentoast/marks.nvim",
234+ config = function()
235+ require'marks'.setup({})
236+ end,
237+ },
238+ {
239+ 'nvim-lualine/lualine.nvim',
240+ config = function()
241+ require'lualine'.setup({})
242+ end
243+ },
244+ -- vim plugins
245+ 'rhysd/git-messenger.vim'
246+ },
247+})
+2,
-2
1@@ -18,7 +18,7 @@ fileext = ".vcf"
2 type = "carddav"
3 url = "https://carddav.fastmail.com/"
4 username = "me@erock.io"
5-password = "5cgeapsmpxwre55r"
6+password = ""
7
8 # CALDAV
9 [pair fastmail]
10@@ -36,7 +36,7 @@ fileext = ".ics"
11 type = "caldav"
12 url = "https://caldav.fastmail.com/"
13 username = "me@erock.io"
14-password = "5cgeapsmpxwre55r"
15+password = ""
16
17 [pair shijing]
18 a = "shijing_local"