diff options
-rw-r--r--[l---------] | %APPDATA%/Sublime Text 3/Packages/User/Default.sublime-theme | 12 | ||||
-rw-r--r--[l---------] | %APPDATA%/Sublime Text 3/Packages/User/Preferences.sublime-settings | 42 | ||||
-rw-r--r--[l---------] | %APPDATA%/ghc/ghci.conf | 10 | ||||
-rw-r--r--[l---------] | %STACK_ROOT%/config.yaml | 10 | ||||
-rw-r--r--[l---------] | %USERPROFILE%/.gitconfig | 85 | ||||
-rw-r--r--[l---------] | %USERPROFILE%/.gnupg/gpg.conf | 9 | ||||
-rw-r--r--[l---------] | %USERPROFILE%/.minttyrc | 24 | ||||
-rw-r--r-- | %USERPROFILE%/.ssh/authorized_keys | 7 | ||||
-rw-r--r--[l---------] | %USERPROFILE%/.ssh/config | 47 | ||||
-rw-r--r-- | .gitattributes | 6 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
m--------- | linux-home | 0 |
12 files changed, 241 insertions, 14 deletions
diff --git a/%APPDATA%/Sublime Text 3/Packages/User/Default.sublime-theme b/%APPDATA%/Sublime Text 3/Packages/User/Default.sublime-theme index 6e821ab..d212123 120000..100644 --- a/%APPDATA%/Sublime Text 3/Packages/User/Default.sublime-theme +++ b/%APPDATA%/Sublime Text 3/Packages/User/Default.sublime-theme @@ -1 +1,11 @@ -../../../../linux-home/%HOME%/.config/sublime-text-3/Packages/User/Default.sublime-theme
\ No newline at end of file +[ + { + "class": "sidebar_label", + "font.bold": false, + "font.size": 13, + }, + { + "class": "tab_label", + "font.size": 13, + }, +] diff --git a/%APPDATA%/Sublime Text 3/Packages/User/Preferences.sublime-settings b/%APPDATA%/Sublime Text 3/Packages/User/Preferences.sublime-settings index 18a25dd..5b6e471 120000..100644 --- a/%APPDATA%/Sublime Text 3/Packages/User/Preferences.sublime-settings +++ b/%APPDATA%/Sublime Text 3/Packages/User/Preferences.sublime-settings @@ -1 +1,41 @@ -../../../../linux-home/%HOME%/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
\ No newline at end of file +{ + "always_show_minimap_viewport": true, + "auto_complete_commit_on_tab": true, + "auto_match_enabled": false, + "color_scheme": "Packages/Color Scheme - Default/Dawn.tmTheme", + "detect_indentation": false, + "draw_indent_guides": false, + "draw_minimap_border": true, + "ensure_newline_at_eof_on_save": true, + "fallback_encoding": "Cyrillic (Windows 1251)", + "folder_exclude_patterns": + [ + ".git", + "__pycache__" + ], + "font_options": + [ + "no_bold", + "no_italic" + ], + "font_size": 11, + "highlight_line": true, + "highlight_modified_tabs": true, + "hot_exit": false, + "remember_open_files": false, + "rulers": + [ + 79, + 99 + ], + "scroll_speed": 0, + "show_definitions": false, + "show_encoding": true, + "show_line_endings": true, + "smart_indent": false, + "theme": "Default.sublime-theme", + "translate_tabs_to_spaces": true, + "trim_trailing_white_space_on_save": true, + "update_check": false, + "word_wrap": false +} diff --git a/%APPDATA%/ghc/ghci.conf b/%APPDATA%/ghc/ghci.conf index a71f301..0cb900e 120000..100644 --- a/%APPDATA%/ghc/ghci.conf +++ b/%APPDATA%/ghc/ghci.conf @@ -1 +1,9 @@ -../../linux-home/%HOME%/.ghci
\ No newline at end of file +:set prompt "> " +:set prompt2 "" + +:seti -w + +:def hoogle \x -> return $ ":!hoogle \"" ++ x ++ "\"" + +:set -XOverloadedStrings +:set -XTupleSections diff --git a/%STACK_ROOT%/config.yaml b/%STACK_ROOT%/config.yaml index 5f42b8c..c65d477 120000..100644 --- a/%STACK_ROOT%/config.yaml +++ b/%STACK_ROOT%/config.yaml @@ -1 +1,9 @@ -../linux-home/%HOME%/.stack/config.yaml
\ No newline at end of file +# This file contains default non-project-specific settings for 'stack', used +# in all projects. For more information about stack's configuration, see +# http://docs.haskellstack.org/en/stable/yaml_configuration/ +templates: + params: + author-name: Egor Tensin + author-email: Egor.Tensin@gmail.com + copyright: '(c) 2020 Egor Tensin <Egor.Tensin@gmail.com>' + github-username: egor-tensin diff --git a/%USERPROFILE%/.gitconfig b/%USERPROFILE%/.gitconfig index 983e82f..5369d34 120000..100644 --- a/%USERPROFILE%/.gitconfig +++ b/%USERPROFILE%/.gitconfig @@ -1 +1,84 @@ -../linux-home/%HOME%/.gitconfig
\ No newline at end of file +[user] + name = Egor Tensin + email = Egor.Tensin@gmail.com + +[core] + # Don't touch line endings (I hate the fact that this is an option). + # My go-to approach now is to store everything w/ LF line endings in + # index (using '* text=auto' in root .gitattributes), and checkout with + # specific line endings as required (using additional records in + # .gitattributes, like '*.sh text eol=lf', '*.bat text eol=crlf', + # etc.). + autocrlf = false + +[push] + # If no refspec is given, push to the branch with the same name. + default = upstream + +# Git submodules suck, but they suck less if you read +# https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407. + +# Show submodule changes in a more verbose way. +[diff] + submodule = log +[status] + submoduleSummary = true +[alias] + # Pull and sync submodules. + pulll = !git pull && git submodule sync --recursive && git submodule update --init --recursive + +# Automatically remove obsolete things/publish new things. +[fetch] + # Prune old branches: + prune = true + # Prune old tags (since Git 2.17.0): + pruneTags = true +[push] + # Push new tags: + followTags = true + +[log] + # Follow renames: + follow = true + +[mergetool] + # I don't even know why those are necessary, since we can abort and + # retry merges. + keepBackup = false + +[pull] + # Don't create a merge commit when pulling, fast-forward only. + ff = only + +[alias] + clean-all = clean -fdx + clean-ignored = clean -fdX + clean-unknown = clean -fd + + l = log --oneline + # This is awesome: http://stackoverflow.com/a/1838938/514684 + ll = log --graph --full-history --all --pretty=format:"%h%x09%d%x20%s" + lll = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m" + + # I think this is only usable on Cygwin, given all the file permission + # madness there: + xx = update-index --add --chmod=+x + + hide = update-index --skip-worktree + unhide = update-index --no-skip-worktree + hidden = !git ls-files -v | grep --basic-regexp \"^\\([[:lower:]]\\|S\\)\" + + # Squash the staging area with the latest commit. + # Pass "-a" to skip using `git add`. + fixup = !GIT_EDITOR=true git commit --amend + +[filter "lfs"] + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + clean = git-lfs clean -- %f + required = true + +[include] + # Include a file with computer-specific settings (like a different + # [user] section under a specific directory, etc.). + path = ~/.gitconfig_local diff --git a/%USERPROFILE%/.gnupg/gpg.conf b/%USERPROFILE%/.gnupg/gpg.conf index c9bf3fd..10887e0 120000..100644 --- a/%USERPROFILE%/.gnupg/gpg.conf +++ b/%USERPROFILE%/.gnupg/gpg.conf @@ -1 +1,8 @@ -../../linux-home/%HOME%/.gnupg/gpg.conf
\ No newline at end of file +no-greeting +force-mdc +keyserver hkp://keys.gnupg.net +personal-cipher-preferences AES256 AES192 AES CAST5 +personal-digest-preferences SHA512 SHA384 SHA256 SHA224 +cert-digest-algo SHA512 +personal-compress-preferences ZLIB BZIP2 ZIP Uncompressed +default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed diff --git a/%USERPROFILE%/.minttyrc b/%USERPROFILE%/.minttyrc index 877508a..43fd612 120000..100644 --- a/%USERPROFILE%/.minttyrc +++ b/%USERPROFILE%/.minttyrc @@ -1 +1,23 @@ -../linux-home/%HOME%/.minttyrc
\ No newline at end of file +BoldAsFont=no +Font=Consolas +FontHeight=11 +Rows=25 +ScrollbackLines=9000 +BackgroundColour=30,30,30 +CursorColour=210,210,210 +Black=30,30,30 +BoldBlack=30,30,30 +Red=210,120,120 +BoldRed=210,120,120 +Green=120,210,120 +BoldGreen=120,210,120 +Yellow=210,210,120 +BoldYellow=210,210,120 +Blue=120,165,210 +BoldBlue=120,165,210 +Magenta=240,90,165 +BoldMagenta=240,90,165 +Cyan=90,210,210 +BoldCyan=90,210,210 +White=210,210,210 +BoldWhite=210,210,210 diff --git a/%USERPROFILE%/.ssh/authorized_keys b/%USERPROFILE%/.ssh/authorized_keys new file mode 100644 index 0000000..1ffcd0e --- /dev/null +++ b/%USERPROFILE%/.ssh/authorized_keys @@ -0,0 +1,7 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQkayDZIKK6nT/PPjLJyiDvAfJcefMRwLqwUXop9ztW9LGTRtYNvmCrMs+WG+taj68jgTnRYIuxh8qvvUi3XmevjDtI3tc5fGKs8P7lVD0k6XBAuP0U3cKw/Gq7Hg8kzHQZpW0CrRkzbZPRiXiAFG2yIYtBbodTEXA6N198EKCHK19godANaR/ysfuOHvherwfIt/ph0nR4axK2A+nrCdI+rM4xnY7j73x3qgrv91V4xY/uUPgpnfDuirnIz3j79zY/T+Kmm+8uzk42Cwv6vdqlGiMEiAtELRe0ThyBlK4tRjdiR47kQNoGy+dKV4Fb7wy9Hh0vcWwXJYZej9Ai8sE0nOcrIieynq9BZhMQsWtp4hDsAG6fy2mZDJXiCTeaX6SggD9EJS+bFb7dfV35JX94AnT+OamaOX7d5K2t9f4s39xafGCmWJgiQ1RIl6I4LKpPoMwb4qheQ2xxK+YoEGsLjf8NaB/RdCPzIFLHmNLTljXW2dQGbJri2XHmZBVBid6pTKqjMhRoTsG1hqMxNcASZEFogdI6odRqMYJAye1QoRfVV+KhkA5wMzNPXXIHrHt5XwHQA6VuqMreDSyBNkgsD8nZh4IGfjM/EsnB5EdxLdWsMVo7JxntOakvCCN4FpJ6N+qoZmWTiObsxCui69b6CwvlvOcoSgHmRbMIiV+Jw== egor@tensin-laptop1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDef0aKhYscQaICHO3wPGminzoqSltHx1U5E9A5PFF+Vs76GAVlkp8HOwHuOn2SIUj1C5a1x+6/IiFj9DenRqXLUJUgwn6WafW002WJCpw+Ax5CERYZLc3yhBFvZN25dDbneLlYbmN2w3Nb15jSwj3dQOzu+875pqeYOpmCqCTfCHiLAw+mo0GyVYABX4IBpe3pVV1SUgj3hJ2KuaCfV/jU5OE3otyUePAzofbKNVLGZGnbhxLhrJL4wC23bRBvQz2OXG5wEu6CDTlUZh2wE/WUEaaXUtMVid8/TQNXP6JjGo0zrIXuuUVKTnx3C92FJFh+MyerTxo9vi9l/XncVNtareo9FVANzArcLXJU/jCyT0NBlXMdi5J7Q0ys+39HS0STXkUgKgKC52qWQzdmZgdtm5zjBqQyqyjA8VpcgshL5/i04Z14ugqP0Q85Sf/oVwfgQi2dxEur583Qe9I3sr3zoJjGVad42dJnW8Ftv3lGkmabk84GABUDm3PsMWpNVde6EopNMHT6K06EFbsZTIvipOGia/UsoBMDYnPljFPJpch1Uk/1oTpzHhEmFcyaZbIKeaMQBsYU7akmY5qc5PF/SkXQSGtEuV4H3NTpZVvvJwAPsfh9R/8pO18RA0AlMW+t+sn64JYjqDui86vJPhMQ0d5OJ4BK8q34OjuV4k/Pnw== egor@tensin-raspi1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMGT8BxTyJHJALHF7vFPoRvkbRqhG1tbf+nJTfrom+7ZefvNNgIDwCxJ7EeAqVz8SwV55EuVMaFGs84tPEAuqpckvkNYcQC8SOHG6LjiFZO/sEgrxo00ik6yFAcUgaYsKMk7hmX4QdQ2kkwrW2geLIR0ai3HTXDG1xOzEmMcqk9WpoI1VmYG00T8riTNcvh/jBr+1GLvOyIlFOWa/j/Jm7z0HCAxVtEAEDixwK4mJXNeohpunT7osG8iwa/va5+hSqI+MyhHiffsQ6fuswLtBT8Nz07k9Kv7rlmmrWDQZftEYDdrjKncgXHbpGqBY6Hd7hn3UqqP9Tj4u4RA1ac63iEpDae/PQMO6cK6G/z27XaasibsDSCVoHQN+WLPNGE4YZMVTrFWleh8VzIQpggV128no1cx97VFpYNv6/L/qbMrQT/Sp47z8vWAp8dGrLwnyDAGY7MFYBFiHXZN6s++dEdue6ob7r/XG07sZxl3Zuyb+RRiA9JT2VDvjHFCWEqK094a8cWA7jAne4i95a0HjwgYqV/9IEebAFojr/8402eDwVNIR3Rvvx95/eWiTpuy/2/AtU0SFlTBUBYEclFrFLRAF9NYI7//wx9HmVhyiD0QutLQH7UIrHI7D8s/yYdqksHojmYhUgGF2rGnCpsQpBb/p8KDzWg7u5E6VEHBDQJw== egor@tensin-laptop2 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDLuXmm+OjwnujPxf7BTYXva5d7Yaru5wfQDCe3R1n0/NRpo9V48YztJ7N2ltDHXLb/vgz8YshLKqWW3thyNQtK/DR/bY4pRcUUUcrslx4xq4Yn7sVnOkD9X7lU4peZATYxwUwabJJutrKq3xca8H8dPhWHSR0kEyj4pfZccaNLY/rKi5kCbj4cLS4owe3XcFnRUt5QbUZKQJIKE9kHGtQpLrR9X3LL7ucTMkzGZFtzAX9BLg1K9U2Ike/yGBDfAmDIxkh3qZzqnzQZnD6h5voDOh9i73CAs7tCtS9enPqsYsgkq7njnbJj0NpwBAI5kPK8+/BduJgcC13G34/CE4mwZ85k/EUwy+igv28z1Z2l9QhuxowgVk8Zwx4MqxOa7W6FhMZLISXe9ev1FpnrQG1wRdI8Hl5XrBFHsWfpjo4Ytt3sw7fne6SYS++3tUBwhnzuU14P7FdUuKwSLxSs+ct+9TnAbE1tyYU5C1+lv67M/UNJ5vj1hSPgo9h27ZkwFndUymAIl3Ca0zScbRP218MkD6zuI4TpRMGIsyxYTXPhHRLCR+yNv3MEjy20BnRfqo32X6zCr7IbPWpAcSs8s1cAhNgh7IxECj1I1DUT3BV5pEKJqBmFxzvFvIBFqtgxde7I65u11NKZ1q+rzLKHdMU5mLUaDhyDb2B4m/umQb3H8Q== egor@tensin-pc1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCrxt3KFvFnLHTUztylO2GtuOkF425/6duCbb99YOun4c3zN6MeXbBnW47iONj8kYWpHnUZozK3TG19oPK6eOap7yA/BYH22aYttCdrAWs/X5p2jutHN/0HTOGh9l/dtazTQQu+2FhQ4+saAQGxiGCEh3vH4DmufpeuKK/6O2lNXk1Nd6BvRr2z0LSASYBTa7GhZZsNgrVdNEucZ5Disr2rRu6UwXAscyp/e2klEy6Mi6oYTByTzK7pC9F7jvrayF9axk/HIfO9JDc3oacvF0sQn4HjO93doLpK9hOTjduBbdE92cZuscvBgE7dJyuSqxDtnGON7yq/i0Pbcy5W8QwjwF+8t/8Ekj3M/ND3FiYC9rYVBz8cHXqTgLMx0M3G9053cwuyo13OLsFzQSFpvvyT9XQ7XGiKrfyF60SzS5QTPe+PIjkBY2UYKZ+cS/N6p6dHgWztbnmMV2DKW9TvmgD7gi8E76FFFDXtx1ydq8TA9dKiZZe850vajL+b5rpYvWaqAvMz6b1HZAFCaG/Dmp6W3UYoY5faZruWrf49QDcvC/43PAT/xM2mQ3IkHdSqMQzqY4EueYFvRxGMPbg/j7BSBvZc7Pja3oZXY0jm7oC2jpAnRT7QheARaTI3UMkWyFJGxeZZ7cF40owQxI+2c918ojSztnFUpcQTHxyAePG5hQ== egor@tensin-raspi2 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGm6EmJVE2VipVeZywk//4+M9T2hKZ9YZNDHZ+WUADL3niwa1muWLSxcUmw3QwzUCA+fiHizfqi4/+3LrwrZyu6typ8p/7ZqtwEgmt2Mn5cAXffx0b09PeFQr9MBpnBKKU8BjIUdGINCtqmAodb3p6fzU3ltR8rGSTNQB4FgdWuBMbOp43DsSy+k8KV1MOuZl0Rlp9paCL9wzX2CwezoxPvkGLPhXht3kv5T+I43wMtO6utafE30g8AYkR3KB3vvaRn+76BRKOphRIDrR/N21/ukpPMG625O/LC2SYZnMqec2d/Ybsb1Gg55PfNyArVTFDMKuMpRLqTmLx28LzXKAABbXW9k5YF6hSOqgaonW9DzjUpiwyDiHGTbEzGXLXbrFKDVqFTHljxtyxJ7Br8B/iAmpIjvKKcXyjceTF4TzLq7S10+2OMWvsJrJZntdDr5cRyOKJz87iRs9HFJG9M/G8kCU8cB7m8irGDnbwea6FJe8Zfg6jM96JzA5zWAhUTMQ28iqXOKb72xLduTQ8YFj97ODL5NMiRmiYrvMhNDGArBICx3vmKq9mHCPiRUjPM+0EuhN3Hn3quAP/TaX2snY8nSYSovT5dH7eQiJeE7JNVjMIYdlSC8VqFdLWTQRQpz/xCqR10mMhwtTuye4Uv7vih6xZ4FMI15AKapNSrpmWNw== Egor@tensin-dev1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5eSp3Ej9CUV6uwec7JFWigJw7jMcs9m912toA8NMUyGz978EXpVqByPpy6w4vRDPUKG2mrJfRtA6z52HaxKQxSVHL0ofepNM+SppqFEoTdaj0HaDxfsnkPBCtx8TawezSblodf7FWzjwUNPvQ71t+LLMWUe31onR2qOJCRLvsgu9XdUeJoE6oCvBXXeyhHWs03U9YCVHUC9Ce+M5aQAo8hkaLp7t/fZwdo9l5S8c5Awi4ygGHbFpzw+hUNBMWAKgCDk89chepfeXXswKKmyWfggUHZKXRxjYElmi7S0GAyJvpz+Z96GkGRyMGqRs/tOJHo98te7fA6lY+cNxMGsX3udik6HHAzbJ8Y/BcgLSVV6EmaCT9i9OWLbnM6rJWqjbAetpK4diajmF9YQwce52rFWmoR4o2wepxvAeJyikwTx5iL+Fn9JeqbWfXxEK0hjbrLPK9ULGs33jenmVOgY27zwnr1zfwR/Xtmw9+2FeBpGiQbxHAv2Mil/gABszKHyb8NyrixbEpgg6ezP7L5c3KNg9tThiTscOiUb/NaO81ibsIkatcOoHrTm4qJIEf6My7LVgZFeDGg3I0IM2odCcQcIedwvVf9vOWyXNi8D2gSb0hDmuPOFAySScPM+6rsItcylYGMhIUOGkSLXJprBcgV1Yc5EhkOWvJ70e1eOnTJw== algo@tensin.vpn diff --git a/%USERPROFILE%/.ssh/config b/%USERPROFILE%/.ssh/config index e8c3b23..6cf0196 120000..100644 --- a/%USERPROFILE%/.ssh/config +++ b/%USERPROFILE%/.ssh/config @@ -1 +1,46 @@ -../../linux-home/%HOME%/.ssh/config
\ No newline at end of file +AddKeysToAgent yes + +# Make known_hosts actually readable. +HashKnownHosts no + +# Don't verify localhost, duh. +NoHostAuthenticationForLocalhost yes + +# Add server keys to known_hosts silently, I never bother to verify them +# anyway. +StrictHostKeyChecking no + +# Keep ssh connections alive. +# Wonder why this isn't default. +ServerAliveCountMax 3 +ServerAliveInterval 15 + +# Actually, scratch that. Don't use known_hosts at all, what is this even for? +# Kappa implied. +UserKnownHostsFile /dev/null + +Include ~/.ssh/config_local + +Host bitbucket.org + User git +Host github.com + User git + +Host alt-bitbucket + User git + Hostname altssh.bitbucket.org + Port 443 +Host alt-github + User git + Hostname ssh.github.com + Port 443 + +Host 64.225.107.220 tensin-vpn vpn + HostName 64.225.107.220 + User algo + Port 110 + +Host 188.134.75.74 tensin-ext ext + HostName 188.134.75.74 + User egor + Port 110 diff --git a/.gitattributes b/.gitattributes index fc9dd24..f52a5a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -/%APPDATA%/**/* text=auto eol=crlf -/%STACK_ROOT%/**/* text=auto eol=crlf -/%USERPROFILE%/**/* text=auto eol=crlf +* text=auto + +/%USERPROFILE%/.kdiff3rc text eol=crlf diff --git a/.gitmodules b/.gitmodules index 85e8ad4..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "linux-home"] - path = linux-home - url = https://github.com/egor-tensin/linux-home.git diff --git a/linux-home b/linux-home deleted file mode 160000 -Subproject cb37e23abc17497b3ca8f97a5a24b3091e5ddb2 |