diff --git a/.config/ghostty/config b/.config/ghostty/config index 4360f27..586bbfb 100644 --- a/.config/ghostty/config +++ b/.config/ghostty/config @@ -2,10 +2,13 @@ config-file = ?"~/.config/omarchy/current/theme/ghostty.conf" # Font -font-family = "JetBrainsMono Nerd Font" -font-style = Regular -font-size = 9 - +#font-family = "JetBrainsMono Nerd Font" +#font-style = Regular +font-size = 10 +#font-thicken-amount = 128 # 0-255, alap 128 (világos háttérnél kisebbet próbálj) +font-family = "Droid Sans Mono" # A tieddel +font-thicken = true +#font-weight = 500 # Window window-theme = ghostty window-padding-x = 14 diff --git a/.config/mc/ini b/.config/mc/ini index cedeb77..7992d5f 100644 --- a/.config/mc/ini +++ b/.config/mc/ini @@ -90,7 +90,7 @@ shell_directory_timeout=900 [Layout] output_lines=0 -left_panel_size=66 +left_panel_size=170 top_panel_size=0 message_visible=true keybar_visible=true @@ -121,6 +121,7 @@ color_terminals= xterm-ghostty= tmux-256color= screen-256color= +xterm-kitty= [Panels] show_mini_info=true diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7ce9235..6f4a5d7 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -3,3 +3,5 @@ require("config.lazy") require("config.lsp-semantic-off") vim.opt.swapfile = false vim.g.copilot_assume_mapped = true +vim.opt.number = true +vim.opt.relativenumber = true diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 7eb2d40..6ecef03 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,7 +5,7 @@ "beacon.nvim": { "branch": "master", "commit": "098ff96c33874339d5e61656f3050dbd587d6bd5" }, "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, - "catppuccin": { "branch": "main", "commit": "6efc53e42cfc97700f19043105bf73ba83c4ae7d" }, + "catppuccin": { "branch": "main", "commit": "ce8d176faa4643e026e597ae3c31db59b63cef09" }, "claudecode.nvim": { "branch": "main", "commit": "93f8e48b1f6cbf2469b378c20b3df4115252d379" }, "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, @@ -25,6 +25,7 @@ "litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" }, @@ -32,15 +33,20 @@ "neo-tree.nvim": { "branch": "main", "commit": "38c8e49bf6731a27eb612834ec88c606532b7fea" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-dap": { "branch": "master", "commit": "7bb46cc612bb127d7b0e3e9ed695267d830824ec" }, + "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-lint": { "branch": "master", "commit": "1f19dacd945a7b1a57f29f32b2d7168384df3d36" }, "nvim-lspconfig": { "branch": "master", "commit": "ac04ec3c2af08e9821b4eb64ede86072b9b213bf" }, - "nvim-treesitter": { "branch": "main", "commit": "300b906a9514d5e0ce02911d371445382fe35a31" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "28a3494c075ef0f353314f627546537e43c09592" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-treesitter": { "branch": "main", "commit": "737088f8571293f6a1ef8cd6c858d5daf9a38162" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "ecd03f5811eb5c66d2fa420b79121b866feecd82" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" }, + "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-npm.nvim": { "branch": "master", "commit": "60eee38b34f577104475a592dd3716a7afa2aef1" }, @@ -56,6 +62,7 @@ "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, + "vscode.nvim": { "branch": "main", "commit": "aa1102a7e15195c9cca22730b09224a7f7745ba8" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, "yazi.nvim": { "branch": "main", "commit": "e0394785918dc391e9d2e863a15f3b5caf033747" } } diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 25e7a0e..8e74c88 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -3,6 +3,7 @@ "lazyvim.plugins.extras.ai.claudecode", "lazyvim.plugins.extras.ai.copilot", "lazyvim.plugins.extras.coding.luasnip", + "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.editor.dial", "lazyvim.plugins.extras.editor.inc-rename", "lazyvim.plugins.extras.editor.neo-tree", diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 2c134f7..92c639f 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -1,3 +1,22 @@ +--vim.keymap.set("n", "dd", [["_ggdG]], { desc = "Delete buffer content" }) + -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here +-- Ha Rust fájlban vagyunk, a Rust saját debug indítóját használjuk +vim.keymap.set("n", "dc", function() + if vim.bo.filetype == "rust" then + vim.cmd.RustLsp("debuggables") + else + require("dap").continue() + end +end, { desc = "Debug indítása" }) + +-- A biztonság kedvéért a breakpoint gombot is javítjuk +vim.keymap.set("n", "db", function() + if vim.bo.filetype == "rust" then + vim.cmd.RustLsp("!toggleBreakpoint") + else + require("dap").toggle_breakpoint() + end +end, { desc = "Breakpoint" }) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 3e1fab4..238f077 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -10,7 +10,8 @@ vim.api.nvim_create_autocmd({ "VimEnter", "ColorScheme" }, { vim.api.nvim_set_hl(0, "CursorInsert", { fg = "#000000", bg = "#FFFF00" }) end, }) - +--vim.opt.guifont = "Fira Code:h12" +vim.opt.guifont = "Droid Sans Mono:h14" -- 2. LÉPÉS: A configod, kiegészítve a "-CursorInsert" hivatkozással -- Figyeld meg: "block-CursorInsert-blink..." vim.opt.guicursor = "n-v-c:block,i-ci-ve:block-CursorInsert-blinkwait700-blinkon400-blinkoff250,r-cr:hor20,o:hor50" diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index a06b657..402211c 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -1,5 +1,22 @@ return { { + { + "Mofiqul/vscode.nvim", + config = function() + require('vscode').setup({ style = 'light' }) + vim.cmd("colorscheme vscode") + end + } + -- "folke/tokyonight.nvim", + -- opts = { + -- transparent = true, -- Ez átengedi a Kitty háttérszínét/képét + -- styles = { + -- sidebars = "transparent", + -- floats = "transparent", + -- }, + -- }, + -- { "dylanaraps/wal.vim", lazy = false }, + -- "Mofiqul/vscode.nvim", -- lazy = false, -- priority = 1000, diff --git a/.config/nvim/lua/plugins/rust.lua b/.config/nvim/lua/plugins/rust.lua index 03cb444..5a07f66 100644 --- a/.config/nvim/lua/plugins/rust.lua +++ b/.config/nvim/lua/plugins/rust.lua @@ -1,20 +1,39 @@ return { { "mrcjkb/rustaceanvim", - version = "^6", + version = "^5", ft = { "rust" }, opts = { server = { settings = { ["rust-analyzer"] = { - check = { - command = "check", -- Valós idejű type check Normal módban - extraArgs = { "--target-dir", "target/nvim-check" }, - }, - diagnostics = { disabled = false }, -- Hibák azonnal + check = { command = "check" }, }, }, }, }, + config = function(_, opts) + -- Megkeressük a Mason-ös codelldb útvonalát + local mason_path = vim.fn.stdpath("data") .. "/mason/packages/codelldb/extension/" + local codelldb_path = mason_path .. "adapter/codelldb" + local liblldb_path = mason_path .. "lsp/lib/liblldb.so" + + -- Definiáljuk az adaptert a DAP számára + local dap = require("dap") + + -- EZ A LÉNYEG: Regisztráljuk az "lldb" nevet is! + dap.adapters.lldb = { + type = "executable", + command = codelldb_path, + name = "lldb", + } + + -- Beállítjuk a rustaceanvim-et is + opts.dap = { + adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb_path, liblldb_path), + } + + vim.g.rustaceanvim = vim.tbl_deep_extend("force", vim.g.rustaceanvim or {}, opts) + end, }, } diff --git a/.config/vifm/vifminfo.json b/.config/vifm/vifminfo.json index c62fb2f..dab7cc3 100644 --- a/.config/vifm/vifminfo.json +++ b/.config/vifm/vifminfo.json @@ -1 +1 @@ -{"gtabs":[{"panes":[{"ptabs":[{"history":[{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"src","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"models","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src/models","file":"..","relpos":0,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"..","relpos":0,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"..","relpos":0,"ts":1766678379},{"dir":"/","file":"home","relpos":4,"ts":1767210883},{"dir":"/home","file":"feco","relpos":1,"ts":1767210883},{"dir":"/home/feco","file":"Music","relpos":4,"ts":1767210883},{"dir":"/home/feco/Music","file":"..","relpos":0,"ts":1767210883},{"dir":"/home/feco","file":"tmp","relpos":19,"ts":1767210883},{"dir":"/home/feco/tmp","file":"mc","relpos":2,"ts":1767210883},{"dir":"/home/feco/tmp/mc","file":"..","relpos":0,"ts":1767210883},{"dir":"/home/feco/tmp","file":"tmux","relpos":4,"ts":1767210883}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/home/feco/tmp","sorting":[2],"preview":false}]},{"ptabs":[{"history":[{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"src","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"main.rs","relpos":3,"ts":1766678379},{"dir":"/","file":"bin","relpos":0,"ts":1767210883}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/","sorting":[2],"preview":false}]}],"active-pane":0,"preview":false,"splitter":{"pos":-1,"ratio":0.5,"orientation":"v","expanded":false}}],"active-gtab":0,"trash":[{"trashed":"/Users/ferencsagi/.local/share/vifm/Trash/000_config.json","original":"/Users/ferencsagi/work/rust/cloudbackup/src/config.json"}],"marks":{"H":{"dir":"/Users/ferencsagi/","file":"..","ts":1766678211},"b":{"dir":"/home/feco/bin/","file":"..","ts":1767184288},"h":{"dir":"/home/feco/","file":"..","ts":1767184288},"z":{"dir":"/Users/ferencsagi/.config/vifm","file":"..","ts":1766678211}},"bmarks":{},"cmd-hist":[{"text":"set o","ts":1767210883},{"text":"q","ts":1767210883}],"regs":{"\"":["/Users/ferencsagi/.local/share/vifm/Trash/000_config.json"]},"dir-stack":[],"use-term-multiplexer":false} \ No newline at end of file +{"gtabs":[{"panes":[{"ptabs":[{"history":[{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"src","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"models","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src/models","file":"..","relpos":0,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"..","relpos":0,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"..","relpos":0,"ts":1766678379},{"dir":"/","file":"home","relpos":4,"ts":1767210883},{"dir":"/home","file":"feco","relpos":1,"ts":1767210883},{"dir":"/home/feco","file":"Music","relpos":4,"ts":1767210883},{"dir":"/home/feco/Music","file":"..","relpos":0,"ts":1767210883},{"dir":"/home/feco","file":"tmp","relpos":19,"ts":1767210883},{"dir":"/home/feco/tmp","file":"mc","relpos":2,"ts":1767210883},{"dir":"/home/feco/tmp/mc","file":"..","relpos":0,"ts":1767210883},{"dir":"/home/feco/tmp","file":"..","relpos":0,"ts":1767210883},{"dir":"/home/feco","file":"Work","relpos":10,"ts":1767376410},{"dir":"/home/feco/Work","file":"cloudbackup","relpos":1,"ts":1767376410},{"dir":"/home/feco/Work/cloudbackup","file":"src","relpos":1,"ts":1767376410},{"dir":"/home/feco/Work/cloudbackup/src","file":"utils","relpos":2,"ts":1767376410},{"dir":"/home/feco/Work/cloudbackup/src/utils","file":"s3_utils.rs","relpos":4,"ts":1767376410}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/home/feco/Work/cloudbackup/src/utils","sorting":[2],"preview":false}]},{"ptabs":[{"history":[{"dir":"/Users/ferencsagi/work/rust/cloudbackup","file":"src","relpos":1,"ts":1766678379},{"dir":"/Users/ferencsagi/work/rust/cloudbackup/src","file":"main.rs","relpos":3,"ts":1766678379},{"dir":"/","file":"bin","relpos":0,"ts":1767210883}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/","sorting":[2],"preview":false}]}],"active-pane":0,"preview":false,"splitter":{"pos":-1,"ratio":0.5,"orientation":"v","expanded":false}}],"active-gtab":0,"trash":[{"trashed":"/Users/ferencsagi/.local/share/vifm/Trash/000_config.json","original":"/Users/ferencsagi/work/rust/cloudbackup/src/config.json"}],"marks":{"H":{"dir":"/Users/ferencsagi/","file":"..","ts":1766678211},"b":{"dir":"/home/feco/bin/","file":"..","ts":1767184288},"h":{"dir":"/home/feco/","file":"..","ts":1767184288},"z":{"dir":"/Users/ferencsagi/.config/vifm","file":"..","ts":1766678211}},"bmarks":{},"cmd-hist":[{"text":"set o","ts":1767210883},{"text":"q","ts":1767210883}],"regs":{"\"":["/Users/ferencsagi/.local/share/vifm/Trash/000_config.json"]},"dir-stack":[],"use-term-multiplexer":false} \ No newline at end of file diff --git a/.tmux.conf b/.tmux.conf index 416f614..abdebf8 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -95,6 +95,7 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-floax' set -g @plugin 'tmux-plugins/tmux-yank' +set -g @plugin 'odedlaz/tmux-onedark-theme' # Automatikus mentés 15 percenként set -g @continuum-restore 'on'