Skip to content

Commit f7bb459

Browse files
kirylkiryl
committed
Convert to dotbot
Signed-off-by: Kirill A. Shutemov <[email protected]>
1 parent f99337d commit f7bb459

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+159
-2088
lines changed

Diff for: ‎.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
vim/vim/.*
2-
vim/vim/plugged/
3-
vim/vim/autoload/plug.vim.old
41
proxy/resolve
2+
nvim/plugin

Diff for: ‎.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "dotbot"]
2+
path = dotbot
3+
url = git://github.com/anishathalye/dotbot
4+
ignore = dirty

Diff for: ‎Makefile

-12
This file was deleted.

Diff for: ‎xsession/Xresources renamed to ‎Xresources

File renamed without changes.

Diff for: ‎dotbot

Submodule dotbot added at ac5793c

Diff for: ‎mail/dovecot.sieve renamed to ‎dovecot.sieve

File renamed without changes.

Diff for: ‎fontconfig/Makefile

-2
This file was deleted.

Diff for: ‎fontconfig/fonts.conf renamed to ‎fonts.conf

File renamed without changes.

Diff for: ‎git/Makefile

-1
This file was deleted.

Diff for: ‎git/gitconfig renamed to ‎gitconfig

File renamed without changes.

Diff for: ‎hg/Makefile

-1
This file was deleted.

Diff for: ‎hg/hgrc renamed to ‎hgrc

File renamed without changes.

Diff for: ‎install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
CONFIG="install.conf.yaml"
6+
DOTBOT_DIR="dotbot"
7+
8+
DOTBOT_BIN="bin/dotbot"
9+
BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
10+
11+
cd "${BASEDIR}"
12+
git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive
13+
git submodule update --init --recursive "${DOTBOT_DIR}"
14+
15+
"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"

Diff for: ‎install.conf.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
- link:
2+
~/.Xresources:
3+
~/.config/fontconfig/fonts.conf:
4+
~/.config/nvim:
5+
~/.dovecot.sieve:
6+
~/.gitconfig:
7+
~/.hgrc:
8+
~/.mutt.colors:
9+
~/.muttrc:
10+
~/.notmuch-config:
11+
~/.signature:
12+
~/.tmux.conf:
13+
~/.toprc:
14+
~/.zshrc: zsh/zshrc
15+
~/.zshenv: zsh/zshenv
16+
~/.zsh: zsh/zsh
17+
~/bin/proxy:
18+
19+
- clean:
20+
~/:
21+
~/.config:
22+
recursive: true

Diff for: ‎mail/Makefile

-6
This file was deleted.

Diff for: ‎mail/muttrc

-120
This file was deleted.

Diff for: ‎mail/mutt.colors renamed to ‎mutt.colors

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ color index brightcyan default '~G' # PGP
7676
color index green default '~Q' # replied
7777
color index brightred default '~F' # flagged
7878
#color index brightred default '~h "Importance: High"'
79-
color index white default '~N' # new
79+
color index brightwhite default '~N' # new
8080
color index red default '~D' # deleted

Diff for: ‎muttrc

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
set edit_headers
2+
set mbox_type=Maildir
3+
set folder="~/mail"
4+
set from="Kirill A. Shutemov <[email protected]>"
5+
set include=yes
6+
set index_format='%4C %Z %[%y.%m.%d] %-18.18n %s%>'
7+
set mime_forward
8+
set nm_default_uri="notmuch:///home/kas/mail"
9+
set hidden_tags="unread,flagged"
10+
set nm_query_type="threads"
11+
set pager_format="-%Z- %C/%m: %-20.20n %s%* -- %?g?(%g)? - (%P)"
12+
set pager_index_lines=15
13+
set record="+sent"
14+
set sort_browser=unsorted
15+
set sort=threads
16+
set vfolder_format="%?N?*& ?%20f %6N %10n"
17+
set folder_format="%20i %10n"
18+
set virtual_spoolfile=yes
19+
20+
alternative_order text/plain text/html
21+
auto_view text/html
22+
23+
set rfc2047_parameters=yes
24+
25+
bind browser <right> select-entry
26+
bind browser <left> noop
27+
28+
bind index <right> display-message
29+
macro index <left> "<sync-mailbox><change-vfolder>?"
30+
bind index X vfolder-from-query
31+
macro index I "<shell-escape>notmuch new<enter><sync-mailbox>"
32+
macro index F "<modify-labels>+followed<enter><sync-mailbox>"
33+
bind index + entire-thread
34+
35+
bind pager <up> previous-line
36+
bind pager <down> next-line
37+
bind pager <left> exit
38+
bind pager <right> view-attachments
39+
bind pager X vfolder-from-query
40+
macro pager I "<shell-escape>notmuch new<enter><sync-mailbox>"
41+
bind pager + entire-thread
42+
43+
bind attach <left> exit
44+
bind attach <right> view-attach
45+
46+
source ~/.mutt.colors
47+
48+
ignore *
49+
unignore from date subject to cc
50+
unignore list-id message-id in-reply-to
51+
52+
tag-transforms \
53+
"replied" "⮮" \
54+
"sent" "⮭" \
55+
"attachment" "⎘" \
56+
"signed" "✓" \
57+
#
58+
59+
tag-formats \
60+
"unread" "GU" \
61+
"replied" "GR" \
62+
"sent" "GS" \
63+
#
64+
65+
virtual-mailboxes \
66+
"inbox" "notmuch://?query=query:inbox" \
67+
"followed" "notmuch://?query=query:followed" \
68+
"linux/mm" "notmuch://?query=query:linux/mm" \
69+
"linux/thp" "notmuch://?query=query:linux/thp" \
70+
"people/akpm" "notmuch://?query=query:people/akpm" \
71+
"people/hugh" "notmuch://?query=query:people/hugh" \
72+
"people/linus" "notmuch://?query=query:people/linus" \
73+
"people/viro" "notmuch://?query=query:people/viro" \
74+
"linux/mm/commits" "notmuch://?query=query:linux/mm/commits" \
75+
"linux/coco" "notmuch://?query=query:linux/coco" \
76+
"linux/fs" "notmuch://?query=query:linux/fs" \
77+
"linux/api" "notmuch://?query=query:linux/api" \
78+
"linuxfoundation" "notmuch://?query=query:linuxfoundation" \
79+
"kernel.org" "notmuch://?query=query:kernel.org" \
80+
"alt" "notmuch://?query=query:alt" \
81+
"unread" "notmuch://?query=query:unread" \
82+
#

Diff for: ‎mail/notmuch-config renamed to ‎notmuch-config

File renamed without changes.

Diff for: ‎vim/vim/ftplugin/c.lua renamed to ‎nvim/ftplugin/c.lua

File renamed without changes.

Diff for: ‎vim/vim/ftplugin/lua.lua renamed to ‎nvim/ftplugin/lua.lua

File renamed without changes.

Diff for: ‎vim/vim/ftplugin/mail.lua renamed to ‎nvim/ftplugin/mail.lua

File renamed without changes.

Diff for: ‎vim/vim/init.lua renamed to ‎nvim/init.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/better-whitespace.lua renamed to ‎nvim/lua/user/better-whitespace.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/cmp.lua renamed to ‎nvim/lua/user/cmp.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/keymaps.lua renamed to ‎nvim/lua/user/keymaps.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/lsp.lua renamed to ‎nvim/lua/user/lsp.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/lualine.lua renamed to ‎nvim/lua/user/lualine.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/nord.lua renamed to ‎nvim/lua/user/nord.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/options.lua renamed to ‎nvim/lua/user/options.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/tabline.lua renamed to ‎nvim/lua/user/tabline.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/telescope.lua renamed to ‎nvim/lua/user/telescope.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/treesitter.lua renamed to ‎nvim/lua/user/treesitter.lua

File renamed without changes.

Diff for: ‎vim/vim/lua/user/trouble.lua renamed to ‎nvim/lua/user/trouble.lua

File renamed without changes.

Diff for: ‎proxy

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/bin/env ruby
2+
3+
require 'ipaddr'
4+
require 'resolv'
5+
6+
socks_proxy="proxy-ir.intel.com"
7+
socks_proxy_port="1080"
8+
9+
addr = ARGV.shift
10+
port = ARGV.shift
11+
12+
def noproxy(addr, port)
13+
exec "socat", "STDIO", "TCP:#{addr}:#{port}"
14+
end
15+
16+
begin
17+
Resolv.getaddress socks_proxy
18+
rescue Resolv::ResolvError
19+
noproxy(addr, port)
20+
end
21+
22+
ip = nil
23+
24+
Resolv::DNS.open do |dns|
25+
ress = dns.getresources(addr, Resolv::DNS::Resource::IN::A)
26+
ip = IPAddr.new(ress.first.address.to_s)
27+
end
28+
29+
["127.0.0.0/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"].each { |s|
30+
noproxy(addr, port) if IPAddr.new(s).include?(ip)
31+
}
32+
33+
exec "socat", "-t", "10", "STDIO", "SOCKS:#{socks_proxy}:#{addr}:#{port},socksport=#{socks_proxy_port}"

Diff for: ‎proxy/Makefile

-7
This file was deleted.

Diff for: ‎proxy/proxy

-30
This file was deleted.

0 commit comments

Comments
 (0)