diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index f353b168..fc35e1fa 100644 --- a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json +++ b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json @@ -2,12 +2,12 @@ "settings": { "tabs": [ { - "name": "#noticias_gd", - "url": "/channels/674984102860161025/888017395195736116", + "name": "#general", + "url": "/channels/674984102860161025/674985827121758208", "selected": true, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", - "channelId": "888017395195736116" + "channelId": "674985827121758208" }, { "name": "#feedback-and-suggestions", diff --git a/.config/fish/functions/allrepos.fish b/.config/fish/functions/allrepos.fish deleted file mode 100644 index 2b8d89ff..00000000 --- a/.config/fish/functions/allrepos.fish +++ /dev/null @@ -1,13 +0,0 @@ -function allrepos --description 'Git directories in the indicated directories with fzf' - set -l search_directories ~/Descargas/ /docs/Documentos/ ~/.config/ ~/.local/share/ - set -l excluded_directory /docs/Documentos/Repos/ - set -l selected_dir (find $search_directories -type d -name '.git' -not -path "$excluded_directory/*" -exec dirname '{}' \; | fzf) - - if test -n "$selected_dir" - cd "$selected_dir" - else - echo "No directory selected" - return - end - -end diff --git a/.config/fish/functions/rc.fish b/.config/fish/functions/rc.fish new file mode 100644 index 00000000..0c4776a6 --- /dev/null +++ b/.config/fish/functions/rc.fish @@ -0,0 +1,9 @@ +function rc --description 'Git directories in ~/Repos/Class/ with fzf' + set selected_dir (fd --type d --base-directory ~/Repos/Class/ -H '^\.git$' | sed 's/\/\.git\/$//' | fzf) + if test -n "$selected_dir" + cd ~/Repos/Class/"$selected_dir" + else + echo "No directory selected" + return + end +end diff --git a/.config/fish/functions/rcm.fish b/.config/fish/functions/rcm.fish new file mode 100644 index 00000000..0828ffb3 --- /dev/null +++ b/.config/fish/functions/rcm.fish @@ -0,0 +1,9 @@ +function rcm --description 'Git directories in ~/Repos/Community/ with fzf' + set selected_dir (fd --type d --base-directory ~/Repos/Community/ -H '^\.git$' | sed 's/\/\.git\/$//' | fzf) + if test -n "$selected_dir" + cd ~/Repos/Community/"$selected_dir" + else + echo "No directory selected" + return + end +end diff --git a/.config/fish/functions/rp.fish b/.config/fish/functions/rp.fish new file mode 100644 index 00000000..a3064e96 --- /dev/null +++ b/.config/fish/functions/rp.fish @@ -0,0 +1,9 @@ +function rp --description 'Git directories in ~/Repos/Personal/ with fzf' + set selected_dir (fd --type d --base-directory ~/Repos/Personal/ -H '^\.git$' | sed 's/\/\.git\/$//' | fzf) + if test -n "$selected_dir" + cd ~/Repos/Personal/"$selected_dir" + else + echo "No directory selected" + return + end +end diff --git a/.config/fish/functions/rw.fish b/.config/fish/functions/rw.fish new file mode 100644 index 00000000..0985df86 --- /dev/null +++ b/.config/fish/functions/rw.fish @@ -0,0 +1,9 @@ +function rw --description 'Git directories in ~/Repos/Work with fzf' + set selected_dir (fd --type d --base-directory ~/Repos/Work/ -H '^\.git$' | sed 's/\/\.git\/$//' | fzf) + if test -n "$selected_dir" + cd ~/Repos/Work/"$selected_dir" + else + echo "No directory selected" + return + end +end diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf index acee72a7..a5daa4e1 100644 --- a/.config/hypr/themes/luna/rules.conf +++ b/.config/hypr/themes/luna/rules.conf @@ -1,6 +1,6 @@ ## Workspaces windowrulev2 = workspace 22 silent,class:^(discord)$ -windowrulev2 = workspace 21,class:^(Spotify)$ +windowrulev2 = workspace 21,silent,class:^(Spotify)$ windowrulev2 = workspace 21,class:^(YouTube Music)$ windowrulev2 = workspace 18,class:^(steam)$ windowrulev2 = workspace 16,class:^(pavucontrol)$ diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 32172e8d..faadb278 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -11,14 +11,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, - "compiler.nvim": { "branch": "main", "commit": "df9eaba5458f10941b5a3037eb8d423139ac92d3" }, - "copilot-cmp": { "branch": "master", "commit": "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1" }, + "compiler.nvim": { "branch": "main", "commit": "b970e27cfb1cda094182219126ede213ad1b1401" }, + "copilot-cmp": { "branch": "master", "commit": "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd" }, "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" }, "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8b52fc95e3d424e5c09b287ee2c293dcb4e26fb" }, + "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" }, "import-cost.nvim": { "branch": "main", "commit": "d2c93deee35fa4042fde28719ddcbad664544fcf" }, @@ -48,7 +48,7 @@ "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" }, + "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" }, "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, @@ -60,16 +60,18 @@ "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, "nvim-scrollview": { "branch": "main", "commit": "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "7f6ff292e3f53e7b12554ee92264c23762dc7906" }, + "nvim-treesitter": { "branch": "master", "commit": "f0f115e926df05d2f1363eb9aa93714056f29827" }, "nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, "overseer.nvim": { "branch": "master", "commit": "3047ede61cc1308069ad1184c0d447ebee92d749" }, + "package-info.nvim": { "branch": "master", "commit": "4d98c8cc90d970d87c472c04bf7ca712336cc753" }, "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "refactoring.nvim": { "branch": "master", "commit": "2cfd6ddb0acece95d9658560ae9740b98ef70dbb" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, @@ -77,7 +79,7 @@ "telescope-all-recent.nvim": { "branch": "main", "commit": "dee20f810aec14c31287988b3baa8c371900cf06" }, "telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "32e6792f865221dfaf2a3751fd3cfeac96557433" }, + "telescope.nvim": { "branch": "master", "commit": "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index d6d5caeb..b9505636 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -104,3 +104,42 @@ vim.keymap.set( "CompilerToggleResults", { noremap = true, silent = true, desc = "Toggle Compiler Results" } ) + +vim.api.nvim_set_keymap( + "n", + "cps", + "lua require('package-info').show({ force = true })", + { silent = true, noremap = true, desc = "Show Package Versions" } +) + +vim.api.nvim_set_keymap( + "n", + "cpu", + "lua require('package-info').update()", + { silent = true, noremap = true, desc = "Update Package" } +) + +vim.api.nvim_set_keymap( + "n", + "cpr", + "lua require('package-info').delete()", + { silent = true, noremap = true, desc = "Remove Package" } +) + +vim.api.nvim_set_keymap( + "n", + "cpv", + "lua require('package-info').change_version()", + { silent = true, noremap = true, desc = "Change Package Version" } +) + +vim.api.nvim_set_keymap( + "n", + "cpn", + "lua require('package-info').install()", + { silent = true, noremap = true, desc = "Install New Dependency" } +) + +vim.keymap.set({ "n", "x" }, "cR", function() + require("telescope").extensions.refactoring.refactors() +end, { noremap = true, silent = true, desc = "Refactor" }) diff --git a/.config/nvim/lua/plugins/package-info.lua b/.config/nvim/lua/plugins/package-info.lua new file mode 100644 index 00000000..b97892e5 --- /dev/null +++ b/.config/nvim/lua/plugins/package-info.lua @@ -0,0 +1,30 @@ +return { + { + "vuki656/package-info.nvim", + requires = "MunifTanjim/nui.nvim", + event = "BufRead", + config = function() + require("package-info").setup({ + colors = { + up_to_date = "#3C4048", -- Text color for up to date dependency virtual text + outdated = "#d19a66", -- Text color for outdated dependency virtual text + }, + icons = { + enable = true, -- Whether to display icons + style = { + up_to_date = "|  ", -- Icon for up to date dependencies + outdated = "|  ", -- Icon for outdated dependencies + }, + }, + autostart = true, -- Whether to autostart when `package.json` is opened + hide_up_to_date = false, -- It hides up to date versions when displaying virtual text + hide_unstable_versions = false, -- It hides unstable versions from version list e.g next-11.1.3-canary3 + -- Can be `npm`, `yarn`, or `pnpm`. Used for `delete`, `install` etc... + -- The plugin will try to auto-detect the package manager based on + -- `yarn.lock` or `package-lock.json`. If none are found it will use the + -- provided one, if nothing is provided it will use `yarn` + package_manager = "npm", + }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/refactor.lua b/.config/nvim/lua/plugins/refactor.lua new file mode 100644 index 00000000..b7edef42 --- /dev/null +++ b/.config/nvim/lua/plugins/refactor.lua @@ -0,0 +1,13 @@ +return { + { + "ThePrimeagen/refactoring.nvim", + event = "BufRead", + requires = { + { "nvim-lua/plenary.nvim" }, + { "nvim-treesitter/nvim-treesitter" }, + }, + config = function() + require("refactoring").setup() + end, + }, +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 4b580ed0..062c76bf 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -172,33 +172,36 @@ return { desc = "Treesitter Symbols", }, }, - opts = { - defaults = { - file_ignore_patterns = { - ".gitignore", - "node_modules", - "build", - "dist", - "yarn.lock", - "*.git/*", - "*/tmp/*", - "Juegos/", - }, - }, - pickers = { - find_files = { - hidden = true, - }, - }, - extensions = { - undo = { - side_by_side = true, - layout_strategy = "vertical", - layout_config = { - preview_height = 0.65, + config = function() + require("telescope").setup({ + defaults = { + file_ignore_patterns = { + ".gitignore", + "node_modules", + "build", + "dist", + "yarn.lock", + "*.git/*", + "*/tmp/*", + "Juegos/", }, }, - }, - }, + pickers = { + find_files = { + hidden = true, + }, + }, + extensions = { + undo = { + side_by_side = true, + layout_strategy = "vertical", + layout_config = { + preview_height = 0.65, + }, + }, + }, + }) + require("telescope").load_extension("refactoring") + end, }, } diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua index 517b8404..5cae4025 100644 --- a/.config/nvim/lua/plugins/which-key.lua +++ b/.config/nvim/lua/plugins/which-key.lua @@ -23,6 +23,7 @@ return { ["w"] = { name = "+windows" }, ["x"] = { name = "+diagnostics/quickfix" }, ["cc"] = { name = "+compile" }, + ["cp"] = { name = "+packages" }, }, }, config = function(_, opts) diff --git a/.config/spicetify/config-xpui.ini b/.config/spicetify/config-xpui.ini index 99014664..17a85c5e 100644 --- a/.config/spicetify/config-xpui.ini +++ b/.config/spicetify/config-xpui.ini @@ -9,7 +9,7 @@ disable_sentry = 1 sidebar_config = 1 home_config = 1 experimental_features = 1 -extensions = adblock.js|hidePodcasts.js|historyShortcut.js|copyPlaylist.js|wikify.js|fullScreen.js|volumePercentage.js|bookmark.js|loopyLoop.js|keyboardShortcutMy.js|genre.js|playlistIcons.js|catppuccin-macchiato.js +extensions = adblock.js|hidePodcasts.js|historyShortcut.js|copyPlaylist.js|wikify.js|fullScreen.js|volumePercentage.js|bookmark.js|loopyLoop.js|keyboardShortcutMy.js|genre.js|playlistIcons.js custom_apps = lyrics-plus|marketplace|stats [Patch] @@ -28,5 +28,5 @@ inject_theme_js = 1 ; DO NOT CHANGE! [Backup] -version = 1.2.13.661.ga588f749 +version = 1.2.18.999.g9b38fc27 with = Dev