From 2c1ccaffd1a8b35c8d0ab242d5369a34149ca932 Mon Sep 17 00:00:00 2001 From: foozzi Date: Sun, 14 Jan 2024 23:29:33 -0500 Subject: [PATCH] Refactoring - Added macos --- .DS_Store | Bin 0 -> 8196 bytes .gitmodules | 4 +-- .../.config/mutt/gruvbox/README.md | 0 .../colors-gruvbox-shuber-extended.muttrc | 0 .../mutt/gruvbox/colors-gruvbox-shuber.muttrc | 0 {linux => global}/.config/mutt/mailcap | 0 {linux => global}/.config/mutt/muttrc | 26 +----------------- global/.config/mutt/settings | Bin 98 -> 676 bytes {linux => global}/.config/nvim/init.lua | 0 {linux => global}/.config/nvim/lazy-lock.json | 0 .../.config/nvim/lua/core/autocmds.lua | 0 .../.config/nvim/lua/core/keymaps.lua | 0 .../.config/nvim/lua/core/lazy.lua | 0 .../.config/nvim/lua/core/options.lua | 0 .../.config/nvim/lua/plugins/comment.lua | 0 .../.config/nvim/lua/plugins/conform.lua | 0 .../nvim/lua/plugins/hardtime-nvim.lua | 0 .../nvim/lua/plugins/indent-blackline.lua | 0 .../.config/nvim/lua/plugins/init.lua | 0 .../.config/nvim/lua/plugins/lsp.lua | 0 .../.config/nvim/lua/plugins/lualine-nvim.lua | 0 .../.config/nvim/lua/plugins/mason.lua | 0 .../.config/nvim/lua/plugins/neoscroll.lua | 0 .../nvim/lua/plugins/nvim-autopairs.lua | 0 .../nvim/lua/plugins/nvim-bufferline.lua | 0 .../.config/nvim/lua/plugins/nvim-lint.lua | 0 .../.config/nvim/lua/plugins/nvim-tree.lua | 0 .../nvim/lua/plugins/nvim-treesitter.lua | 0 .../nvim/lua/plugins/nvim-ts-autotag.lua | 0 .../nvim/lua/plugins/nvim-web-devicons.lua | 0 .../.config/nvim/lua/plugins/tagbar.lua | 0 .../.config/nvim/lua/plugins/telescope.lua | 0 .../nvim/lua/plugins/tmux-navigator.lua | 0 .../.config/nvim/lua/plugins/tokyonight.lua | 0 .../.config/nvim/lua/plugins/trouble-nvim.lua | 0 .../nvim/lua/plugins/vim-illuminate.lua | 0 .../.config/nvim/lua/utils/icons.lua | 0 .../.config/nvim/lua/utils/init.lua | 0 .../.config/nvim/lua/utils/keymapper.lua | 0 {linux => global}/.tmux.conf | 0 {linux => global}/.zshrc | 8 ++---- linux/.config/mutt/paths | 10 +++++++ linux/.zshrc-additional | 7 +++++ macos/.config/alacritty/keybindings.toml | 17 ++++++++++++ macos/.config/keybindings.toml | 17 ++++++++++++ macos/.config/mutt/paths | 10 +++++++ macos/.zshrc-additional | 10 +++++++ 47 files changed, 76 insertions(+), 33 deletions(-) create mode 100644 .DS_Store rename {linux => global}/.config/mutt/gruvbox/README.md (100%) rename {linux => global}/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc (100%) rename {linux => global}/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc (100%) rename {linux => global}/.config/mutt/mailcap (100%) rename {linux => global}/.config/mutt/muttrc (78%) rename {linux => global}/.config/nvim/init.lua (100%) rename {linux => global}/.config/nvim/lazy-lock.json (100%) rename {linux => global}/.config/nvim/lua/core/autocmds.lua (100%) rename {linux => global}/.config/nvim/lua/core/keymaps.lua (100%) rename {linux => global}/.config/nvim/lua/core/lazy.lua (100%) rename {linux => global}/.config/nvim/lua/core/options.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/comment.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/conform.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/hardtime-nvim.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/indent-blackline.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/init.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/lsp.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/lualine-nvim.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/mason.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/neoscroll.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-autopairs.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-bufferline.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-lint.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-tree.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-treesitter.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-ts-autotag.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/nvim-web-devicons.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/tagbar.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/telescope.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/tmux-navigator.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/tokyonight.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/trouble-nvim.lua (100%) rename {linux => global}/.config/nvim/lua/plugins/vim-illuminate.lua (100%) rename {linux => global}/.config/nvim/lua/utils/icons.lua (100%) rename {linux => global}/.config/nvim/lua/utils/init.lua (100%) rename {linux => global}/.config/nvim/lua/utils/keymapper.lua (100%) rename {linux => global}/.tmux.conf (100%) rename {linux => global}/.zshrc (94%) create mode 100644 linux/.config/mutt/paths create mode 100644 linux/.zshrc-additional create mode 100644 macos/.config/alacritty/keybindings.toml create mode 100644 macos/.config/keybindings.toml create mode 100644 macos/.config/mutt/paths create mode 100644 macos/.zshrc-additional diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..83b68230f73c5191498bda000a1c727db70beb80 GIT binary patch literal 8196 zcmeHM&yUhT6n?|PQY3CTXtEwmns~*PCT7jX3*vh4Dn<`#um!T)SUQ9j(GZf}^>6TB z@a!L=|BEO6<_8V5yIxETS>Ge`zUj>SI-M`mXXx4_he)R{sssY%wm>EP1Oc*NAP=!q~gv}g;p`*WR<1>SXPC}22 z^VpGv%}|6*JcO&mNpuaeX9ZY+vH~i1uhJ2nQAlYae}9C&qhH!I@!C3$?$VHE^pU0| z&esCxAm{j$;y1%M0nJexQ?fmtxLx4ZbM849K_U86A-b7IPe{@TjOcZkLh=g(fLqvuja z!Mg4TFT(L+(7N$h#;G61VFQ^g7;2+dV$%tX2)@=AC;FpAFtclUOQ=V8ZU1bln{1{xfP@0=)0f;z-77;)+v) zG$F;1@)Aa%C%jTwKj-(n;%p#T5? literal 0 HcmV?d00001 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 93f0645df6dee7e1f0931e757d1533242ce7b798..917f1d8cce0c52bf3a4dc9920b78f83d4cc76cec 100644 GIT binary patch literal 676 zcmV;V0$cq6M@dveQdv+`01t}#xK?Cvf^RM>sCJ5d*wRwPvb90|K&E(Zsa~W{U|=m@ zy08h_GJmR#eYoaG!^BT8<>-qxhk-His+OQPZ5HOWi62BE*n9@*Y(EI7ID%mE$4KnG z*NTPZXtmkJJZXB4x=kzsh)VjK#n=GmWW4doc~&dru4GhHRHo7cAO)pEiof?k#iWL= z=?A?Vtc`ztvj>nEs8-~d%|8O8va8mNw}Sc=ak@us8w7eUhC z>$~??nP#i>1?rz84q$0+lc7FXru)RgVvA?5uD=QqhEgcD#)OSl3Cv(Ffca(?9JYvO z+q+(8z8yc{Ajb z5+O?zV)BqOoY0JF{|ad+6NE-b4nC7NH*)qOaM{TWgK#kXS+_4V+IpqhClAyL4^jO9 z6uNHc7^$c)7Mc+1 ~/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