diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..9da8318 Binary files /dev/null and b/.DS_Store differ diff --git a/glow/.config/glow/glow.yml b/glow/.config/glow/glow.yml new file mode 100644 index 0000000..271e9a1 --- /dev/null +++ b/glow/.config/glow/glow.yml @@ -0,0 +1,8 @@ +# style name or JSON path (default "auto") +style: "auto" +# mouse support (TUI-mode only) +mouse: false +# use pager to display markdown +pager: false +# word-wrap at width +width: 80 diff --git a/micro/.config/micro/bindings.json b/micro/.config/micro/bindings.json new file mode 100644 index 0000000..83659cb --- /dev/null +++ b/micro/.config/micro/bindings.json @@ -0,0 +1,4 @@ +{ + "Alt-/": "lua:comment.comment", + "CtrlUnderscore": "lua:comment.comment" +} diff --git a/micro/.config/micro/settings.json b/micro/.config/micro/settings.json new file mode 100644 index 0000000..fcf0ca5 --- /dev/null +++ b/micro/.config/micro/settings.json @@ -0,0 +1,5 @@ +{ + //"colorscheme": "one-dark", + "softwrap": true, + "wordwrap": true +} diff --git a/nvim/init.lua b/nvim/init.lua deleted file mode 100644 index 71c4a60..0000000 --- a/nvim/init.lua +++ /dev/null @@ -1,8 +0,0 @@ --- setup lazy -require("config.lazy") - -vim.opt.number = true - --- default color scheme --- vim.cmd([[colorscheme habamax]]) -vim.cmd([[colorscheme gruvbox]]) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index 72841d2..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" } -} diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua deleted file mode 100644 index a294d8b..0000000 --- a/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - --- Make sure to setup `mapleader` and `maplocalleader` before --- loading lazy.nvim so that mappings are correct. --- This is also a good place to setup other settings (vim.opt) -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - --- Setup lazy.nvim -require("lazy").setup({ - spec = { - -- import your plugins - { import = "plugins" }, - }, - -- Configure any other settings here. See the documentation for more details. - -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "habamax" } }, - -- automatically check for plugin updates - checker = { enabled = true }, -}) \ No newline at end of file diff --git a/nvim/lua/plugins/gruvbox.lua b/nvim/lua/plugins/gruvbox.lua deleted file mode 100644 index 5a105db..0000000 --- a/nvim/lua/plugins/gruvbox.lua +++ /dev/null @@ -1 +0,0 @@ -return { "ellisonleao/gruvbox.nvim", priority = 1000 , config = true } diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua deleted file mode 100644 index c7640f2..0000000 --- a/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - 'nvim-telescope/telescope.nvim', - tag = '0.1.8', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local builtin = require("telescope.builtin") - vim.keymap.set("n", "", builtin.find_files, { desc = "Find files" }) - end, -} diff --git a/nvim/lua/plugins/toggleterm.lua b/nvim/lua/plugins/toggleterm.lua deleted file mode 100644 index e357594..0000000 --- a/nvim/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'akinsho/toggleterm.nvim', - version = "*", - config = function() - require("toggleterm").setup({}) - -- Map to toggle terminal - vim.keymap.set("n", "", "ToggleTerm", { desc = "Toggle terminal" }) - vim.keymap.set("t", "", "ToggleTerm", { desc = "Toggle terminal" }) - end, -} diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf new file mode 100644 index 0000000..9490397 --- /dev/null +++ b/tmux/.tmux.conf @@ -0,0 +1,19 @@ +# ─── General settings ──────────────────────────────────────────── +set -g default-terminal "tmux-256color" +set -g base-index 1 +setw -g pane-base-index 1 + +# ─── Plugins (managed by TPM) ──────────────────────────────────── +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-resurrect' +set -g @plugin 'tmux-plugins/tmux-continuum' + +# ─── Resurrect settings ───────────────────────────────────────── +set -g @resurrect-capture-pane-contents 'on' +set -g @resurrect-strategy-vim 'session' + +# ─── Continuum settings (auto-save & restore) ─────────────────── +set -g @continuum-restore 'on' + +# ─── Initialize TPM (keep this at the very bottom) ────────────── +run '~/.tmux/plugins/tpm/tpm' diff --git a/vim/.vimrc b/vim/.vimrc old mode 100644 new mode 100755 diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..b96746e --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,12 @@ +# Auto-launch tmux +if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then + # If no tmux server running, start one (continuum will auto-restore) + # Otherwise attach to existing session + if ! tmux has-session 2>/dev/null; then + exec tmux new-session + else + exec tmux attach-session + fi +fi + +