diff --git a/.config/cosmic/com.system76.CosmicFiles/v1/dialog b/.config/cosmic/com.system76.CosmicFiles/v1/dialog index 2121a8f..d0ef0c0 100644 --- a/.config/cosmic/com.system76.CosmicFiles/v1/dialog +++ b/.config/cosmic/com.system76.CosmicFiles/v1/dialog @@ -1,7 +1,7 @@ ( folders_first: false, icon_sizes: ( - list: 500, + list: 50, grid: 100, ), show_details: false, diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 5b11ea0..8b8ba26 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -2,18 +2,15 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "auto-save.nvim": { "branch": "main", "commit": "4b59610e1318f8a89501cee9d47a0e8650f0a4d5" }, "b64.nvim": { "branch": "main", "commit": "a7570a62405296b693addc61e8f1485f717edbdf" }, - "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, - "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "7df55b20b5b653941f0bcff87e559cabb6fafeb0" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "fzy-lua-native": { "branch": "master", "commit": "9d720745d5c2fb563c0d86c17d77612a3519c506" }, "git-blame.nvim": { "branch": "main", "commit": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7" }, "gitsigns.nvim": { "branch": "main", "commit": "2038c666bd9d8a0b7349a0b6ee00dc83104b9ecf" }, "go.nvim": { "branch": "master", "commit": "0768d79bbebdb1a112a845f9cd6293bfbd544dab" }, - "grug-far.nvim": { "branch": "main", "commit": "c995bbacf8229dc096ec1c3d60f8531059c86c1b" }, + "grug-far.nvim": { "branch": "main", "commit": "c69859c1d5427ab5fc7ed12380ab521b4e336691" }, "guihua.lua": { "branch": "master", "commit": "f8e06bd8a26dee3377d63c2adf1e57cdb58ac474" }, "karen-yank.nvim": { "branch": "main", "commit": "817f50c9464ce557c8f7f8f4d4c8d2f7b81fc40c" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, @@ -22,7 +19,7 @@ "lspsaga.nvim": { "branch": "main", "commit": "3e33a6a6c5d379f3d4fae77fae6b53b762a0a30f" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "50bf3871b539896bd0650b882f6e6b467cc1c1eb" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "mini.comment": { "branch": "main", "commit": "4677392f091e8b5c18d4b535130220a6d1da4aca" }, "mini.pairs": { "branch": "main", "commit": "4a014143fcb4e9df26198ccb3ecff3b9e77a048c" }, @@ -35,12 +32,12 @@ "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "none-ls.nvim": { "branch": "main", "commit": "01f8e62ea11603e59ad9ff7afcfa94fd183f76d6" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lspconfig": { "branch": "master", "commit": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e" }, + "nvim-lspconfig": { "branch": "master", "commit": "3371bf298c1f56efc26771ee961f461176958fb5" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6141a40173c6efa98242dc951ed4b6f892c97027" }, "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" }, "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, - "opencode.nvim": { "branch": "main", "commit": "c3271dee53af4ccb5c072dd807972d4b1e76e7d3" }, + "opencode.nvim": { "branch": "main", "commit": "e43a41f7278680b1b362e8e07609803bf9d01684" }, "outline.nvim": { "branch": "main", "commit": "2a132953b944561d45b52e4541ebfff71934a742" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, diff --git a/.config/nvim/lua/core/lazy.lua b/.config/nvim/lua/core/lazy.lua index 5d07985..7aa4a56 100644 --- a/.config/nvim/lua/core/lazy.lua +++ b/.config/nvim/lua/core/lazy.lua @@ -125,9 +125,6 @@ require("lazy").setup({ { "saghen/blink.cmp", version = "*", - -- dependencies = { - -- "fang2hou/blink-copilot", - -- }, }, -- LSP @@ -217,12 +214,6 @@ require("lazy").setup({ { "mzlogin/vim-markdown-toc" }, -- AI - -- { - -- "zbirenbaum/copilot.lua", - -- cmd = "Copilot", - -- event = "InsertEnter", - -- }, - -- { "AndreM222/copilot-lualine" }, { "nickjvandyke/opencode.nvim", version = "*", -- Latest stable release diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua deleted file mode 100644 index 11c0921..0000000 --- a/.config/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,30 +0,0 @@ -require("copilot").setup({ - suggestion = { enabled = false }, - panel = { enabled = false }, - -- copilot_model = "claude-4", - server_opts_overrides = { - settings = { - telemetry = { - telemetryLevel = "NotAuthorized", - }, - }, - }, - filetypes = { - dockerfile = true, - go = true, - gothtmltmpl = true, - gotexttmpl = true, - hcl = true, - helm = true, - javascript = true, - json = true, - lua = true, - make = true, - markdown = true, - python = true, - sh = true, - typescript = true, - yaml = true, - ["*"] = false, - }, -}) diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index 7986922..c6f13ed 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -1,6 +1,5 @@ require("plugins.snacks") require("plugins.blink") --- require("plugins.copilot") require("plugins.telescope") require("plugins.mini-comment") require("plugins.mini-pairs") diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 8249cb3..5f50e3c 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,67 +1,67 @@ local hide_in_width = function() - return vim.fn.winwidth(0) > 80 + return vim.fn.winwidth(0) > 80 end local diagnostics = { - "diagnostics", - sources = { "nvim_diagnostic" }, - sections = { "error", "warn" }, - symbols = { error = " ", warn = " " }, - colored = false, - always_visible = true, + "diagnostics", + sources = { "nvim_diagnostic" }, + sections = { "error", "warn" }, + symbols = { error = " ", warn = " " }, + colored = false, + always_visible = true, } local diff = { - "diff", - colored = false, - symbols = { added = "+", modified = "", removed = "" }, - cond = hide_in_width, + "diff", + colored = false, + symbols = { added = "+", modified = "", removed = "" }, + cond = hide_in_width, } local lsp_progress = { - "lsp_progress", - display_components = { "spinner" }, - spinner_symbols = { "⣷", "⣯", "⣟", "⡿", "⢿", "⣻", "⣽", "⣾" }, + "lsp_progress", + display_components = { "spinner" }, + spinner_symbols = { "⣷", "⣯", "⣟", "⡿", "⢿", "⣻", "⣽", "⣾" }, } local spaces = function() - local expandtab = vim.api.nvim_get_option_value("expandtab", { buf = 0 }) + local expandtab = vim.api.nvim_get_option_value("expandtab", { buf = 0 }) - local title = "spaces: " - if not expandtab then - title = "tab: " - end + local title = "spaces: " + if not expandtab then + title = "tab: " + end - return title .. vim.api.nvim_get_option_value("shiftwidth", { buf = 0 }) + return title .. vim.api.nvim_get_option_value("shiftwidth", { buf = 0 }) end local venv = function() - local venv = os.getenv("VIRTUAL_ENV") - if venv then - return string.format(" %s", string.match(venv, "[^/]+$")) - end + local venv = os.getenv("VIRTUAL_ENV") + if venv then + return string.format(" %s", string.match(venv, "[^/]+$")) + end - venv = require("venv-selector").get_active_venv() - if venv then - return string.format(" %s", string.match(venv, "[^/]+$")) - end + venv = require("venv-selector").get_active_venv() + if venv then + return string.format(" %s", string.match(venv, "[^/]+$")) + end - return "" + return "" end local get_filetype = function() - local ft = vim.bo.filetype or "" + local ft = vim.bo.filetype or "" - if ft == "yaml" then - local schema = require("schema-companion").get_current_schemas() or "" - if schema == "" then - return ft - end + if ft == "yaml" then + local schema = require("schema-companion").get_current_schemas() or "" + if schema == "" then + return ft + end - return ft .. " (" .. schema:sub(0, 50) .. ")" - else - return ft - end + return ft .. " (" .. schema:sub(0, 50) .. ")" + else + return ft + end end local gitblame = require("gitblame") @@ -71,69 +71,54 @@ vim.g.gitblame_display_virtual_text = 0 vim.g.gitblame_message_template = ", " require("lualine").setup({ - options = { - globalstatus = true, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", venv }, - lualine_c = { - diagnostics, - { - "filename", - path = 1, - cond = function() - if - vim.bo.filetype == "snacks_picker_list" - or vim.bo.filetype == "mason" - or vim.bo.filetype == "lazy" - or vim.bo.filetype == "help" - or vim.bo.filetype == "starter" - or vim.bo.filetype == "TelescopePrompt" - or vim.bo.filetype == "noice" - then - return false - end + options = { + globalstatus = true, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", venv }, + lualine_c = { + diagnostics, + { + "filename", + path = 1, + cond = function() + if + vim.bo.filetype == "snacks_picker_list" + or vim.bo.filetype == "mason" + or vim.bo.filetype == "lazy" + or vim.bo.filetype == "help" + or vim.bo.filetype == "starter" + or vim.bo.filetype == "TelescopePrompt" + or vim.bo.filetype == "noice" + then + return false + end - return true - end, - }, - -- { - -- "copilot", - -- symbols = { - -- status = { - -- icons = { - -- enabled = " ", - -- sleep = " ", - -- disabled = " ", - -- warning = " ", - -- unknown = " ", - -- }, - -- }, - -- spinners = require("copilot-lualine.spinners").dots, - -- }, - -- }, - lsp_progress, - { - require("noice").api.statusline.mode.get, - cond = require("noice").api.statusline.mode.has, - color = { fg = "#ff9e64" }, - }, - { - require("noice").api.status.search.get, - cond = require("noice").api.status.search.has, - color = { fg = "#c69026" }, - }, - }, - lualine_x = { - { gitblame.get_current_blame_text, cond = gitblame.is_blame_text_available }, - diff, - spaces, - "encoding", - { get_filetype, separator = "" }, - }, - lualine_y = { "progress" }, - lualine_z = { "location" }, - }, - extensions = { "lazy", "mason", "trouble" }, + return true + end, + }, + lsp_progress, + { + require("noice").api.statusline.mode.get, + cond = require("noice").api.statusline.mode.has, + color = { fg = "#ff9e64" }, + }, + { + require("noice").api.status.search.get, + cond = require("noice").api.status.search.has, + color = { fg = "#c69026" }, + }, + }, + lualine_x = { + { gitblame.get_current_blame_text, cond = gitblame.is_blame_text_available }, + diff, + spaces, + "encoding", + { get_filetype, separator = "" }, + }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + extensions = { "lazy", "mason", "trouble" }, }) diff --git a/.config/nvim/lua/plugins/neovim-project.lua b/.config/nvim/lua/plugins/neovim-project.lua index 09f1eb8..cac990a 100644 --- a/.config/nvim/lua/plugins/neovim-project.lua +++ b/.config/nvim/lua/plugins/neovim-project.lua @@ -1,27 +1,26 @@ local projects = function() - local projects_path = vim.fn.expand("~/.config/nvim/neovim-projects.json") - local data = require("util.files").read(projects_path) + local projects_path = vim.fn.expand("~/.config/nvim/neovim-projects.json") + local data = require("util.files").read(projects_path) - if data then - local ok, decoded = pcall(vim.json.decode, data) - return ok and decoded or {} - end + if data then + local ok, decoded = pcall(vim.json.decode, data) + return ok and decoded or {} + end - return {} + return {} end require("neovim-project").setup({ - projects = projects(), - last_session_on_startup = false, - dashboard_mode = false, - filetype_autocmd_timeout = 0, - session_manager_opts = { - autosave_ignore_filetypes = { - "snacks_picker_list", - "trouble", - "grug-far", - -- "copilot-chat", - "trouble", - }, - }, + projects = projects(), + last_session_on_startup = false, + dashboard_mode = false, + filetype_autocmd_timeout = 0, + session_manager_opts = { + autosave_ignore_filetypes = { + "snacks_picker_list", + "trouble", + "grug-far", + "trouble", + }, + }, })