diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..83b6823 Binary files /dev/null and b/.DS_Store differ diff --git a/.gitmodules b/.gitmodules index 7fd1907..912e41d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "linux/.config/mutt/gruvbox"] - path = linux/.config/mutt/gruvbox +[submodule "global/.config/mutt/gruvbox"] + path = global/.config/mutt/gruvbox url = https://git.sthu.org/repos/mutt-gruvbox.git diff --git a/linux/.config/mutt/gruvbox/README.md b/global/.config/mutt/gruvbox/README.md similarity index 100% rename from linux/.config/mutt/gruvbox/README.md rename to global/.config/mutt/gruvbox/README.md diff --git a/linux/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc b/global/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc similarity index 100% rename from linux/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc rename to global/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc diff --git a/linux/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc b/global/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc similarity index 100% rename from linux/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc rename to global/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc diff --git a/linux/.config/mutt/mailcap b/global/.config/mutt/mailcap similarity index 100% rename from linux/.config/mutt/mailcap rename to global/.config/mutt/mailcap diff --git a/linux/.config/mutt/muttrc b/global/.config/mutt/muttrc similarity index 78% rename from linux/.config/mutt/muttrc rename to global/.config/mutt/muttrc index 79c7577..cab5c10 100644 --- a/linux/.config/mutt/muttrc +++ b/global/.config/mutt/muttrc @@ -1,30 +1,10 @@ -# User -set from = "foozzione@gmail.com" -set realname = "Ihor Tkachenko" - -# Gmail -set imap_user = "foozzione@gmail.com" -set smtp_url = "smtps://foozzione@gmail.com@smtp.gmail.com:465/" -set smtp_authenticators = 'gssapi:login' source ./settings +source ./paths # Ensure TLS is enforced set ssl_starttls = yes set ssl_force_tls = yes -# My mailboxes -set folder = "imaps://imap.gmail.com:993/[Gmail]" -set spoolfile = "+Вся почта" -set postponed = "+Черновики" -set record = "+Отправленные" -set trash = "+Корзина" - -mailboxes ="Вся почта" =Важное =Помеченные =Черновики =Отправленные =Спам =Корзина - -# Where to put the stuff -set header_cache = "~/.cache/mutt/headers" -set message_cachedir = "~/.cache/mutt/bodies" -set certificate_file = "~/.cache/mutt/certificates" unset record # settings @@ -96,12 +76,8 @@ bind pager G bottom bind attach,index g first-entry bind attach,index G last-entry -# link to mailcap file -set mailcap_path = "~/.config/mutt/mailcap" # open attachments with mailcap with bind attach view-mailcap -# save attachments to a folder -macro attach s ' ~/Documents/attachments/' 'save attachment' auto_view text/html # automatically show html (mailcap uses lynx) #urlscan diff --git a/global/.config/mutt/settings b/global/.config/mutt/settings index 93f0645..917f1d8 100644 Binary files a/global/.config/mutt/settings and b/global/.config/mutt/settings differ diff --git a/linux/.config/nvim/init.lua b/global/.config/nvim/init.lua similarity index 100% rename from linux/.config/nvim/init.lua rename to global/.config/nvim/init.lua diff --git a/linux/.config/nvim/lazy-lock.json b/global/.config/nvim/lazy-lock.json similarity index 100% rename from linux/.config/nvim/lazy-lock.json rename to global/.config/nvim/lazy-lock.json diff --git a/linux/.config/nvim/lua/core/autocmds.lua b/global/.config/nvim/lua/core/autocmds.lua similarity index 100% rename from linux/.config/nvim/lua/core/autocmds.lua rename to global/.config/nvim/lua/core/autocmds.lua diff --git a/linux/.config/nvim/lua/core/keymaps.lua b/global/.config/nvim/lua/core/keymaps.lua similarity index 100% rename from linux/.config/nvim/lua/core/keymaps.lua rename to global/.config/nvim/lua/core/keymaps.lua diff --git a/linux/.config/nvim/lua/core/lazy.lua b/global/.config/nvim/lua/core/lazy.lua similarity index 100% rename from linux/.config/nvim/lua/core/lazy.lua rename to global/.config/nvim/lua/core/lazy.lua diff --git a/linux/.config/nvim/lua/core/options.lua b/global/.config/nvim/lua/core/options.lua similarity index 100% rename from linux/.config/nvim/lua/core/options.lua rename to global/.config/nvim/lua/core/options.lua diff --git a/linux/.config/nvim/lua/plugins/comment.lua b/global/.config/nvim/lua/plugins/comment.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/comment.lua rename to global/.config/nvim/lua/plugins/comment.lua diff --git a/linux/.config/nvim/lua/plugins/conform.lua b/global/.config/nvim/lua/plugins/conform.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/conform.lua rename to global/.config/nvim/lua/plugins/conform.lua diff --git a/linux/.config/nvim/lua/plugins/hardtime-nvim.lua b/global/.config/nvim/lua/plugins/hardtime-nvim.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/hardtime-nvim.lua rename to global/.config/nvim/lua/plugins/hardtime-nvim.lua diff --git a/linux/.config/nvim/lua/plugins/indent-blackline.lua b/global/.config/nvim/lua/plugins/indent-blackline.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/indent-blackline.lua rename to global/.config/nvim/lua/plugins/indent-blackline.lua diff --git a/linux/.config/nvim/lua/plugins/init.lua b/global/.config/nvim/lua/plugins/init.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/init.lua rename to global/.config/nvim/lua/plugins/init.lua diff --git a/linux/.config/nvim/lua/plugins/lsp.lua b/global/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/lsp.lua rename to global/.config/nvim/lua/plugins/lsp.lua diff --git a/linux/.config/nvim/lua/plugins/lualine-nvim.lua b/global/.config/nvim/lua/plugins/lualine-nvim.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/lualine-nvim.lua rename to global/.config/nvim/lua/plugins/lualine-nvim.lua diff --git a/linux/.config/nvim/lua/plugins/mason.lua b/global/.config/nvim/lua/plugins/mason.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/mason.lua rename to global/.config/nvim/lua/plugins/mason.lua diff --git a/linux/.config/nvim/lua/plugins/neoscroll.lua b/global/.config/nvim/lua/plugins/neoscroll.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/neoscroll.lua rename to global/.config/nvim/lua/plugins/neoscroll.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-autopairs.lua b/global/.config/nvim/lua/plugins/nvim-autopairs.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-autopairs.lua rename to global/.config/nvim/lua/plugins/nvim-autopairs.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-bufferline.lua b/global/.config/nvim/lua/plugins/nvim-bufferline.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-bufferline.lua rename to global/.config/nvim/lua/plugins/nvim-bufferline.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-lint.lua b/global/.config/nvim/lua/plugins/nvim-lint.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-lint.lua rename to global/.config/nvim/lua/plugins/nvim-lint.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-tree.lua b/global/.config/nvim/lua/plugins/nvim-tree.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-tree.lua rename to global/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-treesitter.lua b/global/.config/nvim/lua/plugins/nvim-treesitter.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-treesitter.lua rename to global/.config/nvim/lua/plugins/nvim-treesitter.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-ts-autotag.lua b/global/.config/nvim/lua/plugins/nvim-ts-autotag.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-ts-autotag.lua rename to global/.config/nvim/lua/plugins/nvim-ts-autotag.lua diff --git a/linux/.config/nvim/lua/plugins/nvim-web-devicons.lua b/global/.config/nvim/lua/plugins/nvim-web-devicons.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/nvim-web-devicons.lua rename to global/.config/nvim/lua/plugins/nvim-web-devicons.lua diff --git a/linux/.config/nvim/lua/plugins/tagbar.lua b/global/.config/nvim/lua/plugins/tagbar.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/tagbar.lua rename to global/.config/nvim/lua/plugins/tagbar.lua diff --git a/linux/.config/nvim/lua/plugins/telescope.lua b/global/.config/nvim/lua/plugins/telescope.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/telescope.lua rename to global/.config/nvim/lua/plugins/telescope.lua diff --git a/linux/.config/nvim/lua/plugins/tmux-navigator.lua b/global/.config/nvim/lua/plugins/tmux-navigator.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/tmux-navigator.lua rename to global/.config/nvim/lua/plugins/tmux-navigator.lua diff --git a/linux/.config/nvim/lua/plugins/tokyonight.lua b/global/.config/nvim/lua/plugins/tokyonight.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/tokyonight.lua rename to global/.config/nvim/lua/plugins/tokyonight.lua diff --git a/linux/.config/nvim/lua/plugins/trouble-nvim.lua b/global/.config/nvim/lua/plugins/trouble-nvim.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/trouble-nvim.lua rename to global/.config/nvim/lua/plugins/trouble-nvim.lua diff --git a/linux/.config/nvim/lua/plugins/vim-illuminate.lua b/global/.config/nvim/lua/plugins/vim-illuminate.lua similarity index 100% rename from linux/.config/nvim/lua/plugins/vim-illuminate.lua rename to global/.config/nvim/lua/plugins/vim-illuminate.lua diff --git a/linux/.config/nvim/lua/utils/icons.lua b/global/.config/nvim/lua/utils/icons.lua similarity index 100% rename from linux/.config/nvim/lua/utils/icons.lua rename to global/.config/nvim/lua/utils/icons.lua diff --git a/linux/.config/nvim/lua/utils/init.lua b/global/.config/nvim/lua/utils/init.lua similarity index 100% rename from linux/.config/nvim/lua/utils/init.lua rename to global/.config/nvim/lua/utils/init.lua diff --git a/linux/.config/nvim/lua/utils/keymapper.lua b/global/.config/nvim/lua/utils/keymapper.lua similarity index 100% rename from linux/.config/nvim/lua/utils/keymapper.lua rename to global/.config/nvim/lua/utils/keymapper.lua diff --git a/linux/.tmux.conf b/global/.tmux.conf similarity index 100% rename from linux/.tmux.conf rename to global/.tmux.conf diff --git a/linux/.zshrc b/global/.zshrc similarity index 94% rename from linux/.zshrc rename to global/.zshrc index 7d6100d..7058966 100644 --- a/linux/.zshrc +++ b/global/.zshrc @@ -69,10 +69,6 @@ alias wr='curl wttr.in' ## python alias python='python3' alias py='python' -## Open Suse -alias zup='sudo zypper dup' -alias zin='sudo zypper in' -alias rbf='sudo systemctl reboot --firmware-setup' # Preferred editor for local and remote sessions export EDITOR='vim' @@ -104,10 +100,10 @@ export PATH=$PATH:$GOPATH/bin export PATH=$PATH:/usr/local/go/bin ## color export TERM=tmux-256color -## docker -export DOCKER_HOST=unix:///run/user/1000/docker.sock [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh export VOLTA_HOME="$HOME/.volta" export PATH="$VOLTA_HOME/bin:$PATH" +source ./.zshrc-additional + diff --git a/linux/.config/mutt/paths b/linux/.config/mutt/paths new file mode 100644 index 0000000..19539af --- /dev/null +++ b/linux/.config/mutt/paths @@ -0,0 +1,10 @@ +# Where to put the stuff +set header_cache = "~/.cache/mutt/headers" +set message_cachedir = "~/.cache/mutt/bodies" +set certificate_file = "~/.cache/mutt/certificates" + +# link to mailcap file +set mailcap_path = "~/.config/mutt/mailcap" + +# save attachments to a folder +macro attach s ' ~/Documents/attachments/' 'save attachment' diff --git a/linux/.zshrc-additional b/linux/.zshrc-additional new file mode 100644 index 0000000..a28814f --- /dev/null +++ b/linux/.zshrc-additional @@ -0,0 +1,7 @@ +## Open Suse +alias zup='sudo zypper dup' +alias zin='sudo zypper in' +alias rbf='sudo systemctl reboot --firmware-setup' + +## docker +export DOCKER_HOST=unix:///run/user/1000/docker.sock diff --git a/macos/.config/alacritty/keybindings.toml b/macos/.config/alacritty/keybindings.toml new file mode 100644 index 0000000..22ed925 --- /dev/null +++ b/macos/.config/alacritty/keybindings.toml @@ -0,0 +1,17 @@ +[keyboard] +bindings = [ + {key = "W", mods = "Command", chars = "\u001BW" }, + {key = "X", mods = "Command", chars = "\u001BX" }, + {key = 30, mods = "Command|Shift", chars = "\u001Bn" }, + {key = 33, mods = "Command|Shift", chars = "\u001Bp" }, + {key = "Z", mods = "Command", chars = "\u0001w" }, + {key = "T", mods = "Command", chars = "\u001Bt" }, + {key = "E", mods = "Command", chars = "\u001Be" }, + {key = "D", mods = "Command", chars = "\u001Bd" }, + # tmux resurrect plugin + {key = "R", mods = "Command", chars = "\u0001\u0012" }, + {key = "S", mods = "Command", chars = "\u0001\u0013" }, + # move cursor per word + {key = "Right", mods = "Command", chars = "\u001BF" }, + {key = "Left", mods = "Command", chars = "\u001BB" }, +] diff --git a/macos/.config/keybindings.toml b/macos/.config/keybindings.toml new file mode 100644 index 0000000..a41b5ab --- /dev/null +++ b/macos/.config/keybindings.toml @@ -0,0 +1,17 @@ +[keyboard] +bindings = [ + {key = "W", mods = "Command", chars = "\u001BW" }, + {key = "X", mods = "Command", chars = "\u001BX" }, + {key = 30, mods = "Command|Shift", chars = "\u001Bn" }, + {key = 33, mods = "Command|Shift", chars = "\u001Bp" }, + {key = "Z", mods = "Command", chars = "\u0001w" }, + {key = "T", mods = "Command", chars = "\u001Bt"}, + {key = "E", mods = "Command", chars = "\u001Be"}, + {key = "D", mods = "Command", chars = "\u001Bd"}, + # tmux resurrect plugin + {key = "R", mods = "Command", chars = "\u0001\u0012" }, + {key = "S", mods = "Command", chars = "\u0001\u0013" }, + # move cursor per word + {key = "Right", mods = "Alt", chars = "\u001BF"}, + {key = "Left", mods = "Alt", chars = "\u001BB"}, +] diff --git a/macos/.config/mutt/paths b/macos/.config/mutt/paths new file mode 100644 index 0000000..fa152d7 --- /dev/null +++ b/macos/.config/mutt/paths @@ -0,0 +1,10 @@ +# Where to put the stuff +set header_cache = "$HOME/Library/Caches/mutt/headers" +set message_cachedir = "$HOME/Library/Caches/mutt/bodies" +set certificate_file = "$HOME/Library/Caches/mutt/certificates" + +# link to mailcap file +set mailcap_path = "$HOME/.config/mutt/mailcap" + +# save attachments to a folder +macro attach s ' $HOME/Documents/attachments/' 'save attachment' \ No newline at end of file diff --git a/macos/.zshrc-additional b/macos/.zshrc-additional new file mode 100644 index 0000000..faf2544 --- /dev/null +++ b/macos/.zshrc-additional @@ -0,0 +1,10 @@ +## brew +if [[ "$OSTYPE" == "darwin"* ]]; then + alias bu='brew update' + alias bug='brew upgrade' +fi + +## python 3.12 +#export PATH=/opt/homebrew/opt/python@3.12/libexec/bin:$PATH +## python 3.11 +export PATH=/opt/homebrew/opt/python@3.11/libexec/bin:$PATH