diff --git a/.config/ghostty/config b/.config/ghostty/config new file mode 100644 index 0000000..26f38ed --- /dev/null +++ b/.config/ghostty/config @@ -0,0 +1,2 @@ +font-size = 16.0 +quit-after-last-window-closed = true diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 5239016..c70865f 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -24,7 +24,7 @@ #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic - font_size 13.0 + font_size 16.0 #: Font size (in pts). diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index d987ac0..ba481a2 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,12 +1,14 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, + "catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, "cheatsheet.nvim": { "branch": "master", "commit": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codeium.nvim": { "branch": "main", "commit": "aa06fa21dd518a81b84aa468e2f52051cbd45f12" }, "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, + "feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, @@ -40,7 +42,6 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index b0479b4..0dc8bc1 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -25,6 +25,9 @@ vim.keymap.set("t", "", "", { desc = "Exit terminal mode" } -- vim.keymap.set('n', '', 'echo "Use k to move!!"') -- vim.keymap.set('n', '', 'echo "Use j to move!!"') +vim.keymap.set("n", "", ":m .+1==", { desc = "Move line up" }) -- move line up(n) +vim.keymap.set("n", "", ":m .-2==", { desc = "Move line down" }) -- move line down(n) + vim.keymap.set("n", "", ":FloatermNew", { desc = "New terminal" }) vim.keymap.set("n", "", ":FloatermToggle", { desc = "Toggle terminal" }) vim.keymap.set("n", "gr", "") diff --git a/.config/nvim/lua/kickstart/plugins/conform.lua b/.config/nvim/lua/kickstart/plugins/conform.lua index 5057737..10d8ab3 100644 --- a/.config/nvim/lua/kickstart/plugins/conform.lua +++ b/.config/nvim/lua/kickstart/plugins/conform.lua @@ -1,39 +1,39 @@ return { - { -- Autoformat - 'stevearc/conform.nvim', - lazy = false, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_fallback = true } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - return { - timeout_ms = 500, - lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use a sub-list to tell conform to run *until* a formatter - -- is found. - -- javascript = { { "prettierd", "prettier" } }, - }, - }, - }, + { -- Autoformat + "stevearc/conform.nvim", + lazy = false, + keys = { + { + "f", + function() + require("conform").format({ async = true, lsp_fallback = true }) + end, + mode = "", + desc = "[F]ormat buffer", + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true, go = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + lua = { "stylua" }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use a sub-list to tell conform to run *until* a formatter + -- is found. + -- javascript = { { "prettierd", "prettier" } }, + }, + }, + }, } -- vim: ts=2 sts=2 sw=2 et diff --git a/.config/nvim/lua/kickstart/plugins/tokyonight.lua b/.config/nvim/lua/kickstart/plugins/tokyonight.lua index 3e5e74d..fcf01e0 100644 --- a/.config/nvim/lua/kickstart/plugins/tokyonight.lua +++ b/.config/nvim/lua/kickstart/plugins/tokyonight.lua @@ -1,20 +1,22 @@ return { - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.o.termguicolors = true + vim.cmd.colorscheme("catppuccin-mocha") - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' - end, - }, + -- You can configure highlights by doing something like: + -- vim.cmd.hi 'Comment gui=none' + end, + }, } -- vim: ts=2 sts=2 sw=2 et diff --git a/.config/nvim/lua/lazy-bootstrap.lua b/.config/nvim/lua/lazy-bootstrap.lua index fd041b4..3a25e87 100644 --- a/.config/nvim/lua/lazy-bootstrap.lua +++ b/.config/nvim/lua/lazy-bootstrap.lua @@ -10,10 +10,10 @@ if not vim.loop.fs_stat(lazypath) then end ---@diagnostic disable-next-line: undefined-field vim.opt.rtp:prepend(lazypath) -local gdproject = io.open(vim.fn.getcwd() .. "/project.godot", "r") -if gdproject then - io.close(gdproject) - vim.fn.serverstart("./godothost") -end +--local gdproject = io.open(vim.fn.getcwd() .. "/project.godot", "r") +--if gdproject then +-- io.close(gdproject) +-- vim.fn.serverstart("./godothost") +--end -- vim: ts=2 sts=2 sw=2 et diff --git a/.config/tmux/plugins/tmux b/.config/tmux/plugins/tmux new file mode 160000 index 0000000..c4c60b5 --- /dev/null +++ b/.config/tmux/plugins/tmux @@ -0,0 +1 @@ +Subproject commit c4c60b5807b179f2955e272bf1aad868cc815e0f diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index ef96d37..7b9bac8 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -31,14 +31,19 @@ bind -n S-Right next-window bind -n M-H previous-window bind -n M-L next-window -set -g @catppuccin_flavour 'mocha' - # List of plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'dreamsofcode-io/catppuccin-tmux' +set -g @plugin 'catppuccin/tmux' set -g @plugin 'tmux-plugins/tmux-yank' +set -g @catppuccin_flavour 'mocha' + +set -g @catppuccin_window_tabs_enabled on +set -g @catppuccin_date_time "%H:%M %dd-%mm-%yyyy" +set -g @catppuccin_user "on" +set -g @catppuccin_host "off" + # Other examples: # set -g @plugin 'github_username/plugin_name' # set -g @plugin 'github_username/plugin_name#branch' @@ -64,12 +69,7 @@ bind-key -T copy-mode-vi 'C-h' select-pane -L bind-key -T copy-mode-vi 'C-j' select-pane -D bind-key -T copy-mode-vi 'C-k' select-pane -U bind-key -T copy-mode-vi 'C-l' select-pane -R -bind-key -T copy-mode-vi 'C-\' select-pane -l - - - -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' +bind-key -T copy-mode-vi "C-\\" select-pane -l # set vi-mode set-window-option -g mode-keys vi @@ -80,3 +80,8 @@ bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel bind '"' split-window -v -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}" + +set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run "~/.config/tmux/plugins/tpm/tpm" diff --git a/.zshrc b/.zshrc index 8c8c2c4..b5d355c 100644 --- a/.zshrc +++ b/.zshrc @@ -55,6 +55,8 @@ zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' export GOPATH="$HOME/go" export GOBIN="$HOME/go/bin" +export EDITOR='nvim' + export PATH="/usr/local/bin:/opt/homebrew/bin:$HOME/Library/Python/3.8/bin:/Library/Frameworks/Python.framework/Versions/2.7/bin:/opt/homebrew/sbin:$HOME/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/Library/Application:Support/JetBrains/Toolbox/scripts:/usr/local/go/bin:$GOPATH:$GOBIN" # Path to your Oh My Zsh installation. diff --git a/lathund.txt b/lathund.txt index e57e300..b0dc225 100644 --- a/lathund.txt +++ b/lathund.txt @@ -6,6 +6,13 @@ Split vertically: % Split horizontally: " Close pane: x +Create window: c +Close window: & +List windows: w +Previous window: p +Next window: n +Switch/select window by number: 1-9 + tmux attach