diff --git a/flake.lock b/flake.lock index 460f13d..12c7a23 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1700261686, - "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=", + "lastModified": 1700847865, + "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee", + "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700252687, - "narHash": "sha256-oyjA6uYNotms3rCDjksYcbcf8Utx/9TzNYGU5OXlahQ=", + "lastModified": 1700415469, + "narHash": "sha256-uRdcRPnOkaL/rk3c/u2zUV6hPDoaplWAbJ6ajlhHdaw=", "owner": "neovim", "repo": "neovim", - "rev": "abac33605fb50d55fc796229f0812c246bf635d2", + "rev": "7ca2d64e8bbfb73f33cf82a2f9c03808bfea3d95", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1700265958, - "narHash": "sha256-iARSd74kSmyC8EgSKOBIOTbJe/affJqXqpcAtshj0v8=", + "lastModified": 1700438595, + "narHash": "sha256-3Kr57JalUnLCJ4EpencaE+Dh7orKF7VBcU/YyrjSWYM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "2b00ef60f29f3e301326df85d09eba61bc00d086", + "rev": "d811ebe5a826ccdc0c27f89b1e41314828d652aa", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700416016, + "narHash": "sha256-Qp8Of0BUYGjqodmE912h+/uGknB7J11ypcQMKnEDUrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bf3f5cf6a98b5d077cdcdb00a6d4b3d92bc78b5", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { diff --git a/modules/dwl/ags/modules/audio.js b/modules/dwl/ags/modules/audio.js index 556c86d..595ed50 100644 --- a/modules/dwl/ags/modules/audio.js +++ b/modules/dwl/ags/modules/audio.js @@ -2,6 +2,7 @@ import { Separator, FontIcon, addElipsis } from "../misc.js"; import { ArrowToggle, opened } from "../services/quicksettings.js"; import App from 'resource:///com/github/Aylur/ags/app.js' +import * as Utils from 'resource:///com/github/Aylur/ags/utils.js' import Service from 'resource:///com/github/Aylur/ags/service.js' import Audio from 'resource:///com/github/Aylur/ags/service/audio.js' import { Label, Box, Icon, Stack, Button, Slider } from 'resource:///com/github/Aylur/ags/widget.js'; @@ -177,7 +178,9 @@ export const AppMixer = (props) => { }, }); const sync = () => { - icon.icon = stream.iconName; + icon.icon = Utils.lookUpIcon(stream.name || '') + ? (stream.name || '') + : "audio-x-generic-symbolic"; icon.tooltipText = stream.name; slider.value = stream.volume; percent.label = `${Math.floor(stream.volume * 100)}%`; diff --git a/modules/misc/nvim/lazy-lock.json b/modules/misc/nvim/lazy-lock.json index 224e771..407bd95 100644 --- a/modules/misc/nvim/lazy-lock.json +++ b/modules/misc/nvim/lazy-lock.json @@ -1,59 +1,59 @@ { - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" }, + "LuaSnip": { "branch": "master", "commit": "df58ee1664cfda71479cd2bbd56114f56599eba6" }, "ReplaceWithRegister": { "branch": "master", "commit": "832efc23111d19591d495dc72286de2fb0b09345" }, - "SchemaStore.nvim": { "branch": "main", "commit": "f934fbbf417cf05da7f1576c67655ab25f7b702d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "54a4ea14b70cd3fc9db8217bb4ac9e1f78bfa390" }, "auto-save.nvim": { "branch": "main", "commit": "94003fec719ac04dac8a055c9b1baab6de4ac152" }, - "catppuccin": { "branch": "main", "commit": "d7521f6050b94cb0e23067f63829d86886f870fe" }, + "catppuccin": { "branch": "main", "commit": "a2107df4379d66e72a36a89792603151cebec1bf" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "66affb4034ee6d77160f0aed99b615fad311ce14" }, + "conform.nvim": { "branch": "master", "commit": "cbc510ca5b4aec1fd104b6c6f070a7fcf36cc0c8" }, "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "gitsigns.nvim": { "branch": "main", "commit": "5fc573f2d2a49aec74dd6dc977e8b137429d1897" }, "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, "increment-activator": { "branch": "master", "commit": "55efcff88be45bd98cfdf7333dd718399373d10c" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "lazy-lsp.nvim": { "branch": "master", "commit": "287d190557fdec28e10eb1a4312422d09e261911" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "leap.nvim": { "branch": "main", "commit": "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c" }, - "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, + "lsp_signature.nvim": { "branch": "master", "commit": "9768d5b32c97539aa87c553a6527d58a345e5cb1" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mini.align": { "branch": "main", "commit": "86c8edae77023a7b71d0fa9e2bf78960c1e46fd8" }, - "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, - "mini.splitjoin": { "branch": "main", "commit": "5f4237ae557f255a1f1a435c76c6a715be39060a" }, - "neo-tree.nvim": { "branch": "main", "commit": "f053f09962819c1558cd93639aa80edf7c314c17" }, - "neodev.nvim": { "branch": "main", "commit": "b90ec1b35dc67902bd3c4fbd80ab11993c1af8cc" }, + "mini.align": { "branch": "main", "commit": "c5ab28809c630b65ffe069b564ce1d473bbcb332" }, + "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, + "mini.pairs": { "branch": "main", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, + "mini.splitjoin": { "branch": "main", "commit": "2b4ade24c1d46ce98801b74fc84241d7b676f9f4" }, + "neo-tree.nvim": { "branch": "main", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, + "neodev.nvim": { "branch": "main", "commit": "f972d7e6cd21b691199565cfe3e6487e774a4e8f" }, "neodim": { "branch": "master", "commit": "41535b577deed1bb770830fd9263c3923b70a18c" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, "nvim-lint": { "branch": "fix/repair-eslint-linters", "commit": "58f863259aae92ecf4d5ec7821e2050ffc85b99a" }, - "nvim-lspconfig": { "branch": "master", "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" }, + "nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-pqf": { "branch": "main", "commit": "d15582d3d0c09280f371fa5f21537cf4530ed330" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-surround": { "branch": "main", "commit": "4f0e1f470595af067eca9b872778d83c7f52f134" }, - "nvim-treesitter": { "branch": "master", "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "e1e670a86274d5cb681e475d4891ea1afe605ced" }, + "nvim-surround": { "branch": "main", "commit": "18016d6af52edc9f1c794dcf6665a26a2962d2ee" }, + "nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "b8ff464f2afc2000f6c72fa331a8fc090cb46b39" }, "nvim-type-fmt": { "branch": "main", "commit": "59ce3d837de63633801ba0b28ed88164e14d6b87" }, - "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, + "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, + "statuscol.nvim": { "branch": "0.10", "commit": "fb56a46dc446d3e9b61c269dd4aadbfd509223a7" }, "telescope-fzf-native.nvim": { "branch": "feature/69-prebuilt-release-binaries", "commit": "af1d3c6efa0124123272bba094a60e15682c9cd5" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "telescope.nvim": { "branch": "master", "commit": "e4c62dedd760d339bea5b8325c2d918d87476d00" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "trouble.nvim": { "branch": "cascading-sev-2", "commit": "b97b3261433d659b0edb8aedd90dc0b199b8f37b" }, "unimpaired-which-key.nvim": { "branch": "main", "commit": "321a247ecbbb31a59a8580350eec044b88d82e81" }, - "vim-lumen": { "branch": "master", "commit": "692cdc7fff03303d56cede923a43942cffbcb9d1" }, + "vim-lumen": { "branch": "master", "commit": "7f501a241eee6ed61cd5a15f13fe6d9ca2f0992c" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" }, diff --git a/modules/misc/nvim/lua/plugins/tree.lua b/modules/misc/nvim/lua/plugins/tree.lua index b99b56e..3330637 100644 --- a/modules/misc/nvim/lua/plugins/tree.lua +++ b/modules/misc/nvim/lua/plugins/tree.lua @@ -1,4 +1,18 @@ return { + -- { + -- "stevearc/oil.nvim", + -- opts = { + -- skip_confirm_for_simple_edits = true, + -- view_options = { + -- show_hidden = true, + -- }, + -- }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, + -- keys = { + -- { "-", "Oil", desc = "Open parent directory" }, + -- }, + -- }, + { "nvim-neo-tree/neo-tree.nvim", dependencies = { @@ -8,9 +22,9 @@ return { }, cmd = "Neotree", keys = { - { "-", "Neotree current dir=%:h reveal_force_cwd toggle", desc = "Toggle explorer", }, - { "\\", "Neotree current dir=%:h reveal_force_cwd toggle", desc = "Toggle explorer", }, - { "e", "Neotree left toggle", desc = "Toggle left explorer", }, + { "-", "Neotree current dir=%:h reveal_force_cwd toggle", desc = "Toggle explorer", }, + { "\\", "Neotree current dir=%:h reveal_force_cwd toggle", desc = "Toggle explorer", }, + { "e", "Neotree left toggle", desc = "Toggle left explorer", }, }, deactivate = function() vim.cmd([[Neotree close]]) @@ -51,18 +65,18 @@ return { ["h"] = function(state) local node = state.tree:get_node() if node.type == 'directory' and node:is_expanded() then - require'neo-tree.sources.filesystem'.toggle_directory(state, node) + require 'neo-tree.sources.filesystem'.toggle_directory(state, node) else - require'neo-tree.ui.renderer'.focus_node(state, node:get_parent_id()) + require 'neo-tree.ui.renderer'.focus_node(state, node:get_parent_id()) end end, ["l"] = function(state) local node = state.tree:get_node() if node.type == 'directory' then if not node:is_expanded() then - require'neo-tree.sources.filesystem'.toggle_directory(state, node) + require 'neo-tree.sources.filesystem'.toggle_directory(state, node) elseif node:has_children() then - require'neo-tree.ui.renderer'.focus_node(state, node:get_child_ids()[1]) + require 'neo-tree.ui.renderer'.focus_node(state, node:get_child_ids()[1]) end end end, diff --git a/modules/misc/nvim/lua/plugins/treesiter.lua b/modules/misc/nvim/lua/plugins/treesiter.lua index f9256a1..3c9c71c 100644 --- a/modules/misc/nvim/lua/plugins/treesiter.lua +++ b/modules/misc/nvim/lua/plugins/treesiter.lua @@ -13,7 +13,6 @@ return { additional_vim_regex_highlighting = false, }, indent = { enable = true }, - context_commentstring = { enable = true, enable_autocmd = false }, ensure_installed = "all", sync_install = false, textobjects = { @@ -36,19 +35,25 @@ return { }, { - "numToStr/Comment.nvim", - event = "VeryLazy", + "echasnovski/mini.comment", + version = '*', dependencies = { - "JoosepAlviste/nvim-ts-context-commentstring", + { + "JoosepAlviste/nvim-ts-context-commentstring", + opts = { + enable_autocmd = false, + } + }, }, - opts = function() - return { - pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(), - toggler = { - block = "gC", - }, + event = "VeryLazy", + opts = { + options = { + custom_commentstring = function() + return require("ts_context_commentstring").calculate_commentstring() or vim.bo.commentstring + end, + } - end + }, }, { diff --git a/modules/misc/nvim/lua/plugins/ui.lua b/modules/misc/nvim/lua/plugins/ui.lua index dbe7728..6361452 100644 --- a/modules/misc/nvim/lua/plugins/ui.lua +++ b/modules/misc/nvim/lua/plugins/ui.lua @@ -79,6 +79,7 @@ return { { "luukvbaal/statuscol.nvim", + branch = "0.10", event = "VeryLazy", config = function() local builtin = require("statuscol.builtin") @@ -86,7 +87,11 @@ return { relculright = false, segments = { { - sign = { name = { ".*" }, maxwidth = 1, }, + sign = { + name = { ".*" }, + namespace = { ".*" }, + maxwidth = 1, + }, click = "v:lua.ScSa" }, { text = { builtin.lnumfunc }, click = "v:lua.ScLa", },