diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index 3b6b669..1fd422d 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -1,7 +1,7 @@ #!/bin/sh -bspc monitor HDMI-A-0 -d 1 2 3 4 5 -bspc monitor DVI-D-0 -d 6 7 8 9 10 +bspc monitor HDMI-1 -d 1 2 3 4 5 +bspc monitor DVI-D-1 -d 6 7 8 9 10 bspc config bottom_padding 0 bspc config top_padding 23 bspc config border_width 3 @@ -42,7 +42,6 @@ bspc config presel_feedback_color "$(get_xrdb color6)" bspc rule -a mpv state=floating bspc rule -a pentablet state=floating bspc rule -a Alacritty:flota state=floating -bspc rule -a Sxiv:flota state=floating bspc rule -a Firefox:Browser state=floating bspc rule -a Firefox:Navigator state=tiled desktop='^6' bspc rule -a Zathura state=tiled diff --git a/gtk-2.0/gtkfilechooser.ini b/gtk-2.0/gtkfilechooser.ini index e15d293..9a7b09d 100644 --- a/gtk-2.0/gtkfilechooser.ini +++ b/gtk-2.0/gtkfilechooser.ini @@ -4,8 +4,8 @@ LocationMode=path-bar ShowHidden=false ExpandFolders=false ShowSizeColumn=true -GeometryX=137 -GeometryY=70 +GeometryX=2351 +GeometryY=191 GeometryWidth=1058 GeometryHeight=698 SortColumn=modified diff --git a/lf/lfrc b/lf/lfrc index d5446b8..f4be586 100644 --- a/lf/lfrc +++ b/lf/lfrc @@ -22,15 +22,14 @@ recol # Custom Functions cmd open ${{ - case $(file --mime-type $f -bL) in + case $(file --mime-type "$(readlink -f $f)" -b) in text/*|application/json) vix "$f";; - image/gif) setsid sxiv-gif $f 2>/dev/null & ;; image/svg+xml) display -- $f ;; - image/*) setsid sxiv-rifle $f 2>/dev/null & ;; - audio/*) mpv $f ;; - video/*) setsid mpv $f -quiet >/dev/null 2>&1 & ;; - application/pdf|application/cbz|application/cbr|application/epub*) setsid zathura $fx >/dev/null 2>&1 & ;; - *) for f in $fx; do setsid $OPENER $f > /dev/null 2>&1 & done;; + image/*) setsid nsxiv-rifle $f 2>/dev/null & ;; + audio/*) mpv $f ;; + video/*) setsid mpv $f -quiet >/dev/null 2>&1 & ;; + application/cbz|application/cbr|image/vnd.djvu|application/pdf|application/octet-stream|application/postscript|application/pdf|application/vnd*|application/epub*) setsid -f zathura $fx >/dev/null 2>&1 ;; + *) xdg-open "$f" &>/dev/null &;; esac }} diff --git a/mangadesk/config.json b/mangadesk/config.json index 7555b26..3962df5 100755 --- a/mangadesk/config.json +++ b/mangadesk/config.json @@ -4,6 +4,7 @@ "en" ], "downloadQuality": "data", + "explicitContent": false, "forcePort443": false, "asZip": true, "zipType": "cbz" diff --git a/mpv/mpv.conf b/mpv/mpv.conf index ee1c9f0..a2e7902 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -46,3 +46,4 @@ save-position-on-quit no-border msg-module msg-color +audio-display=no diff --git a/sxiv/exec/image-info b/nsxiv/exec/image-info similarity index 100% rename from sxiv/exec/image-info rename to nsxiv/exec/image-info diff --git a/sxiv/exec/key-handler b/nsxiv/exec/key-handler similarity index 100% rename from sxiv/exec/key-handler rename to nsxiv/exec/key-handler diff --git a/nvim/after/ftplugin/terminal.vim b/nvim/after/ftplugin/terminal.vim deleted file mode 100644 index 1ef7340..0000000 --- a/nvim/after/ftplugin/terminal.vim +++ /dev/null @@ -1,14 +0,0 @@ -setlocal nofoldenable foldcolumn=0 -setlocal nonumber norelativenumber -setlocal signcolumn=no -setlocal wrap noruler - -aug MyTerminal - au! - au TermOpen * set laststatus=0 noshowmode noshowcmd - " workaround for a segfault: https://github.com/neovim/neovim/issues/11548#issuecomment-583081783 - " immediately enter insert mode when switching to a terminal - au BufEnter term://* startinsert! - au TermClose * set laststatus=2 showmode showcmd - au BufLeave term://* stopinsert -aug END diff --git a/nvim/after/ftplugin/text.vim b/nvim/after/ftplugin/txt.vim similarity index 100% rename from nvim/after/ftplugin/text.vim rename to nvim/after/ftplugin/txt.vim diff --git a/nvim/init.lua b/nvim/init.lua index b1a4b62..716cc07 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -5,11 +5,24 @@ vim.o.termguicolors = true local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim" if vim.fn.empty(vim.fn.glob(install_path)) > 0 then - vim.fn.execute("!git clone https://github.com/wbthomason/packer.nvim " .. install_path) + vim.fn.execute("!git clone --depth 1 https://github.com/wbthomason/packer.nvim " .. install_path) end vim.api.nvim_command([[packadd packer.nvim]]) -require("packer").startup({ +local status_ok, packer = pcall(require, "packer") +if not status_ok then + return +end + +packer.init({ + display = { + open_fn = function() + return require("packer.util").float({ border = "single" }) + end, + }, +}) + +return packer.startup({ function(use) use({ "wbthomason/packer.nvim", opt = true }) use({ @@ -18,9 +31,8 @@ require("packer").startup({ require("impatient") end, }) - use("nathom/filetype.nvim") use("nvim-lua/plenary.nvim") - use({ "ellisonleao/gruvbox.nvim", requires = { "rktjmp/lush.nvim", opt = true } }) + use({ "ellisonleao/gruvbox.nvim" }) use({ "kyazdani42/nvim-web-devicons", after = "gruvbox.nvim", @@ -52,19 +64,14 @@ require("packer").startup({ require("plugins.gitsigns_nvim") end, }) + use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" }) + use({ "nvim-telescope/telescope-file-browser.nvim" }) use({ "nvim-telescope/telescope.nvim", event = "CursorHold", config = function() require("plugins.telescope") end, - }, { - "nvim-telescope/telescope-fzf-native.nvim", - after = "telescope.nvim", - run = "make", - config = function() - require("telescope").load_extension("fzf") - end, }) use({ "numToStr/Comment.nvim", @@ -106,10 +113,11 @@ require("packer").startup({ }, }, }, - { "saadparwaiz1/cmp_luasnip", after = "nvim-cmp" }, { "hrsh7th/cmp-path", after = "nvim-cmp" }, { "hrsh7th/cmp-buffer", after = "nvim-cmp" }, + { "f3fora/cmp-spell", after = "nvim-cmp" }, { "hrsh7th/cmp-nvim-lua", after = "nvim-cmp" }, + { "saadparwaiz1/cmp_luasnip", after = "LuaSnip" }, }) use({ "windwp/nvim-autopairs", @@ -119,21 +127,6 @@ require("packer").startup({ require("plugins.autopairs") end, }) - use({ - "folke/lsp-trouble.nvim", - cmd = { "LspTrouble" }, - config = function() - require("plugins.trouble") - end, - }) + use({ "nathom/filetype.nvim" }) end, - config = { - compile_path = vim.fn.stdpath("config") .. "/lua/packer_compiled.lua", - display = { - open_fn = function() - return require("packer.util").float({ border = "single" }) - end, - }, - }, }) -require("packer_compiled") diff --git a/nvim/lua/packer_compiled.lua b/nvim/lua/packer_compiled.lua deleted file mode 100644 index ec1536c..0000000 --- a/nvim/lua/packer_compiled.lua +++ /dev/null @@ -1,309 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end - else - time = function(chunk, start) end - end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - - _G._packer = _G._packer or {} - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/corpse/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/corpse/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/corpse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/corpse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/corpse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["Comment.nvim"] = { - config = { "\27LJ\2\0025\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/Comment.nvim", - url = "https://github.com/numToStr/Comment.nvim" - }, - LuaSnip = { - config = { "\27LJ\2\0023\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\24plugins.lsp.luasnip\frequire\0" }, - loaded = false, - needs_bufread = true, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cmp-buffer"] = { - after_files = { "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-buffer/after/plugin/cmp_buffer.lua" }, - load_after = { - ["nvim-cmp"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-nvim-lua"] = { - after_files = { "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lua/after/plugin/cmp_nvim_lua.lua" }, - load_after = { - ["nvim-cmp"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lua", - url = "https://github.com/hrsh7th/cmp-nvim-lua" - }, - ["cmp-path"] = { - after_files = { "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-path/after/plugin/cmp_path.lua" }, - load_after = { - ["nvim-cmp"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - cmp_luasnip = { - after_files = { "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp_luasnip/after/plugin/cmp_luasnip.lua" }, - load_after = { - ["nvim-cmp"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["filetype.nvim"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/filetype.nvim", - url = "https://github.com/nathom/filetype.nvim" - }, - ["friendly-snippets"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/friendly-snippets", - url = "https://github.com/rafamadriz/friendly-snippets" - }, - ["gitsigns.nvim"] = { - config = { "\27LJ\2\0025\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\26plugins.gitsigns_nvim\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/gitsigns.nvim", - url = "https://github.com/lewis6991/gitsigns.nvim" - }, - ["gruvbox.nvim"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", - url = "https://github.com/ellisonleao/gruvbox.nvim" - }, - ["impatient.nvim"] = { - config = { "\27LJ\2\2)\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\14impatient\frequire\0" }, - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/impatient.nvim", - url = "https://github.com/lewis6991/impatient.nvim" - }, - ["lsp-trouble.nvim"] = { - commands = { "LspTrouble" }, - config = { "\27LJ\2\2/\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\20plugins.trouble\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/lsp-trouble.nvim", - url = "https://github.com/folke/lsp-trouble.nvim" - }, - ["lsp_signature.nvim"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim", - url = "https://github.com/ray-x/lsp_signature.nvim" - }, - ["lush.nvim"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/lush.nvim", - url = "https://github.com/rktjmp/lush.nvim" - }, - ["null-ls.nvim"] = { - config = { "\27LJ\2\0023\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\24plugins.lsp.null-ls\frequire\0" }, - load_after = { - ["nvim-lspconfig"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/null-ls.nvim", - url = "https://github.com/jose-elias-alvarez/null-ls.nvim" - }, - ["nvim-autopairs"] = { - config = { "\27LJ\2\0021\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\22plugins.autopairs\frequire\0" }, - load_after = { - ["nvim-cmp"] = true - }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" - }, - ["nvim-cmp"] = { - after = { "nvim-autopairs", "cmp-buffer", "cmp_luasnip", "cmp-nvim-lua", "cmp-path" }, - config = { "\27LJ\2\0024\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\25plugins.lsp.nvim-cmp\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-colorizer.lua"] = { - config = { "\27LJ\2\0021\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\22plugins.colorizer\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-colorizer.lua", - url = "https://github.com/norcalli/nvim-colorizer.lua" - }, - ["nvim-lspconfig"] = { - after = { "null-ls.nvim" }, - config = { "\27LJ\2\0026\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\27plugins.lsp.lsp-config\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - config = { "\27LJ\2\0022\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\23plugins.treesitter\frequire\0" }, - loaded = false, - needs_bufread = true, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - config = { "\27LJ\2\0028\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\29plugins.webdevicons_nvim\frequire\0" }, - load_after = {}, - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/corpse/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\2\0021\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\22plugins.telescope\frequire\0" }, - loaded = false, - needs_bufread = true, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["vim-fugitive"] = { - commands = { "Git", "Gdiff", "Gblame", "Glog", "Git mergetool" }, - loaded = false, - needs_bufread = true, - only_cond = false, - path = "/home/corpse/.local/share/nvim/site/pack/packer/opt/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - } -} - -time([[Defining packer_plugins]], false) --- Config for: impatient.nvim -time([[Config for impatient.nvim]], true) -try_loadstring("\27LJ\2\2)\0\0\2\0\2\0\0046\0\0\0'\1\1\0B\0\2\1K\0\1\0\14impatient\frequire\0", "config", "impatient.nvim") -time([[Config for impatient.nvim]], false) --- Load plugins in order defined by `after` -time([[Sequenced loading]], true) -vim.cmd [[ packadd gruvbox.nvim ]] -time([[Sequenced loading]], false) - --- Command lazy-loads -time([[Defining lazy-load commands]], true) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file LspTrouble lua require("packer.load")({'lsp-trouble.nvim'}, { cmd = "LspTrouble", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Gdiff lua require("packer.load")({'vim-fugitive'}, { cmd = "Gdiff", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Gblame lua require("packer.load")({'vim-fugitive'}, { cmd = "Gblame", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Git lua require("packer.load")({'vim-fugitive'}, { cmd = "Git", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -pcall(vim.cmd, [[au CmdUndefined Git mergetool ++once lua require"packer.load"({'vim-fugitive'}, {}, _G.packer_plugins)]]) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Glog lua require("packer.load")({'vim-fugitive'}, { cmd = "Glog", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -time([[Defining lazy-load commands]], false) - -vim.cmd [[augroup packer_load_aucmds]] -vim.cmd [[au!]] - -- Event lazy-loads -time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'nvim-autopairs'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] -vim.cmd [[au CursorHold * ++once lua require("packer.load")({'nvim-treesitter', 'LuaSnip', 'telescope.nvim', 'nvim-colorizer.lua'}, { event = "CursorHold *" }, _G.packer_plugins)]] -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-cmp'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'nvim-lspconfig', 'Comment.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] -time([[Defining lazy-load event autocommands]], false) -vim.cmd("augroup END") -if should_profile then save_profiles() end - -end) - -if not no_errors then - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/nvim/lua/plugins/lsp/lsp-config.lua b/nvim/lua/plugins/lsp/lsp-config.lua index 82bda9a..51d2b94 100644 --- a/nvim/lua/plugins/lsp/lsp-config.lua +++ b/nvim/lua/plugins/lsp/lsp-config.lua @@ -10,7 +10,7 @@ local runtime_path = vim.split(package.path, ";") table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua") local sumneko_root_path = "/mnt/wd1tb/catacombs/code/lua-language-server" -local sumneko_binary = sumneko_root_path .. "/bin/Linux/lua-language-server" +local sumneko_binary = "luals" local handlers = { ["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "single" }), diff --git a/nvim/lua/plugins/lsp/nvim-cmp.lua b/nvim/lua/plugins/lsp/nvim-cmp.lua index aa73f18..55132b0 100644 --- a/nvim/lua/plugins/lsp/nvim-cmp.lua +++ b/nvim/lua/plugins/lsp/nvim-cmp.lua @@ -30,6 +30,11 @@ local cmp_kinds = { } cmp.setup({ + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, formatting = { format = function(_, vim_item) vim_item.kind = (cmp_kinds[vim_item.kind] or "") .. vim_item.kind @@ -74,9 +79,4 @@ cmp.setup({ { name = "path", max_item_count = 10 }, { name = "buffer", max_item_count = 10 }, }), - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, }) diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 6414d45..3672c22 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -24,7 +24,8 @@ local new_maker = function(filepath, bufnr, opts) end require("telescope").setup({ - defaults = { + defaults = require("telescope.themes").get_ivy({ + dynamic_preview_title = true, vimgrep_arguments = { "rg", "--color=never", @@ -35,11 +36,16 @@ require("telescope").setup({ "--smart-case", "--trim", }, + preview = { + filesize_limit = 5, + timeout = 150, + treesitter = true, + title = false, + }, + borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }, sorting_strategy = "ascending", layout_config = { - width = 0.75, prompt_position = "top", - preview_cutoff = 120, }, pickers = { buffers = { @@ -49,72 +55,23 @@ require("telescope").setup({ }, }, sort_mru = true, - preview_title = false, + sort_lastused = true, }, find_files = { - find_command = { "fd", "-t f", "-c always", "-H", "--strip-cwd-prefix" }, + find_command = { "fd", "--type", "f", "-c always", "-H", "--strip-cwd-prefix" }, + mappings = { + n = { + ["cd"] = function(prompt_bufnr) + local selection = require("telescope.actions.state").get_selected_entry() + local dir = vim.fn.fnamemodify(selection.path, ":p:h") + require("telescope.actions").close(prompt_bufnr) + -- Depending on what you want put `cd`, `lcd`, `tcd` + vim.cmd(string.format("silent lcd %s", dir)) + end, + }, + }, hidden = true, }, - file_browser = { - hidden = true, - }, - lsp_references = { - initial_mode = "normal", - sorting_strategy = "ascending", - layout_strategy = "cursor", - preview_title = false, - results_title = false, - prompt_title = "References", - layout_config = { - width = 0.4, - height = 0.4, - }, - }, - lsp_code_actions = { - initial_mode = "normal", - sorting_strategy = "ascending", - layout_strategy = "cursor", - preview = false, - prompt_title = "Code Actions", - results_title = "", - layout_config = { - width = 0.2, - height = 0.3, - }, - }, - lsp_range_code_actions = { - initial_mode = "normal", - sorting_strategy = "ascending", - layout_strategy = "cursor", - preview = false, - prompt_title = "Code Actions", - results_title = "", - layout_config = { - width = 0.3, - height = 0.3, - }, - }, - lsp_document_diagnostics = { - initial_mode = "normal", - sorting_strategy = "ascending", - layout_strategy = "cursor", - prompt_title = "Diagnostics", - results_title = "", - layout_config = { - width = 0.5, - height = 0.5, - }, - }, - lsp_definitions = { - layout_strategy = "cursor", - prompt_title = "Definitions", - preview_title = false, - results_title = false, - layout_config = { - width = 0.5, - height = 0.5, - }, - }, }, selection_caret = "→", color_devicons = true, @@ -132,22 +89,23 @@ require("telescope").setup({ [""] = actions.move_selection_previous, [""] = actions.toggle_selection + actions.move_selection_next, [""] = actions.send_selected_to_qflist, + [""] = require("telescope.actions.layout").toggle_preview, }, n = { [""] = actions.smart_send_to_qflist + actions.open_qflist, + [""] = require("telescope.actions.layout").toggle_preview, }, }, - }, + extensions = { + file_browser = { + hidden = true, + theme = "ivy", + dir_icon = " ", + }, + }, + }), }) -Project_files = function() - local opts = {} - local ok = pcall(require("telescope.builtin").git_files, opts) - if not ok then - require("telescope.builtin").find_files(opts) - end -end - local delta = previewers.new_termopen_previewer({ get_command = function(entry) return { "git", "-c", "core.pager=delta", "-c", "delta.side-by-side=false", "diff", entry.value .. "^!" } @@ -161,7 +119,6 @@ Delta_git_commits = function(opts) previewers.git_commit_message.new(opts), previewers.git_commit_diff_as_was.new(opts), } - builtin.git_commits(opts) end @@ -172,15 +129,22 @@ Delta_git_bcommits = function(opts) previewers.git_commit_message.new(opts), previewers.git_commit_diff_as_was.new(opts), } - builtin.git_bcommits(opts) end local default_opts = { noremap = true, silent = true } vim.api.nvim_set_keymap("n", "", "Telescope help_tags", default_opts) -vim.api.nvim_set_keymap("n", "", 'lua require("telescope").Project_files()', default_opts) -vim.api.nvim_set_keymap("n", "", "Telescope file_browser hidden=true", default_opts) +vim.api.nvim_set_keymap("n", "", "Telescope file_browser", default_opts) +vim.api.nvim_set_keymap( + "n", + "", + ":lua require'telescope'.extensions.file_browser.file_browser({path = vim.fn.expand('%:p:h')})", + default_opts +) vim.api.nvim_set_keymap("n", "", "Telescope buffers", default_opts) vim.api.nvim_set_keymap("n", "", "Telescope live_grep", default_opts) vim.api.nvim_set_keymap("n", "", "Telescope git_commits", default_opts) vim.api.nvim_set_keymap("n", "", "Telescope resume", default_opts) + +require("telescope").load_extension("fzf") +require("telescope").load_extension("file_browser") diff --git a/nvim/plugin/autocmds.vim b/nvim/plugin/autocmds.vim index 886292c..18a7832 100644 --- a/nvim/plugin/autocmds.vim +++ b/nvim/plugin/autocmds.vim @@ -3,6 +3,7 @@ scriptencoding utf-8 if !exists('autocommands_loaded') && has('autocmd') let autocommands_loaded = 1 let ftToIgnore = ['markdown', 'html', 'text'] + let statusline_blacklist = ['terminal', 'fugitive', 'vista', 'diagnostics', 'qf'] aug OnInsert au InsertLeave * if &paste | setlocal nopaste | endif @@ -19,13 +20,20 @@ if !exists('autocommands_loaded') && has('autocmd') aug OnSave au BufWritePre * if index(ftToIgnore, &ft) < 0 | :%s/\s\+$//e - au BufWritePost init.lua PackerSync + au BufWritePost init.lua source | PackerSync au QuitPre * if empty(&buftype) | lclose | endif aug END - let statusline_blacklist = ['terminal', 'fugitive', 'vista', 'diagnostics', 'qf'] aug StatusLine au WinEnter,BufEnter * if index(statusline_blacklist, &ft) < 0 | setlocal statusline=%!v:lua.StatusLine() au WinLeave,BufLeave * if index(statusline_blacklist, &ft) < 0 | setlocal statusline=%!v:lua.StatusLineInactive() aug END + + aug OpenTerm + au TermOpen * set laststatus=0 + au TermOpen * setlocal nonumber wrap signcolumn=no + au BufEnter term://* startinsert! + au TermClose * set laststatus=2 + au BufLeave term://* stopinsert + aug END endif diff --git a/nvim/plugin/color.vim b/nvim/plugin/color.vim index c102490..760a8b0 100644 --- a/nvim/plugin/color.vim +++ b/nvim/plugin/color.vim @@ -6,3 +6,6 @@ hi! LspDiagnosticsLineNrError guibg=#51202A guifg=#FF0000 gui=bold hi! LspDiagnosticsLineNrWarning guibg=#51412A guifg=#FFA500 gui=bold hi! LspDiagnosticsLineNrInformation guibg=#1E535D guifg=#00FFFF gui=bold hi! LspDiagnosticsLineNrHint guibg=#1E205D guifg=#008bbd gui=bold +hi! TelescopeNormal guibg=#000000 +highlight default link TelescopePromptPrefix TelescopeNormal +highlight default link TelescopePromptCounter TelescopeNormal diff --git a/rofi/config.rasi b/rofi/config.rasi index 5c6a12b..02ebc73 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,6 +1,5 @@ configuration { modi: "run,drun,window"; - drun-display-format: "{name}"; drun-match-fields: "name,exec"; pid: "/tmp/rofi_pid"; cache-dir: "/tmp"; diff --git a/rofi/lnch.rasi b/rofi/lnch.rasi index bcde4f4..de36f8a 100644 --- a/rofi/lnch.rasi +++ b/rofi/lnch.rasi @@ -1,117 +1,118 @@ configuration { - scroll-method: 1; - click-to-exit: true; - display-run: "%"; - display-drun: "$"; + scroll-method: 1; + click-to-exit: true; + display-run: "%"; + display-drun: "$"; + drun-display-format: "{name}"; } @import "colors.rasi" * { - font: "System Charcoal 11.5"; - background-color: @trans; + font: "System Charcoal 11.5"; + background-color: @trans; } window { - width: 68%; - height: 0px; - anchor: northwest; - location: northwest; - padding: 0px 5px 0px 0px; - transparency: "real"; - children: [ horibox ]; - background-color: @trans; + width: 68%; + height: 0px; + anchor: northwest; + location: northwest; + padding: 0px 5px 0px 0px; + transparency: "real"; + children: [ horibox ]; + background-color: @trans; } prompt { - spacing: 0; - border: 0; - background-color: @selected; - text-color: @background; - padding: 2px 10px; + spacing: 0; + border: 0; + background-color: @selected; + text-color: @background; + padding: 2px 10px; } entry { - expand: false; - width: 10em; - text-color: @foreground; - padding: 2px 5px; - background-color: @trans; + expand: false; + width: 10em; + text-color: @foreground; + padding: 2px 5px; + background-color: @trans; } inputbar { - spacing: 0px; - text-color: @foreground; - border: 0px; - background-color: @trans; + spacing: 0px; + text-color: @foreground; + border: 0px; + background-color: @trans; } horibox { - orientation: horizontal; - children: [ prompt, entry, listview ]; - border: 0px; - spacing: 6px; - background-color: @trans; + orientation: horizontal; + children: [ prompt, entry, listview ]; + border: 0px; + spacing: 6px; + background-color: @trans; } listview { - spacing: 5px; - scrollbar: false; - layout: horizontal; - background-color: @trans; + spacing: 5px; + scrollbar: false; + layout: horizontal; + background-color: @trans; } element-text, element-icon { - background-color: inherit; - text-color: inherit; + background-color: inherit; + text-color: inherit; } element { - padding: 3px 5px; + padding: 3px 5px; } element normal.normal { - background-color: @trans; - text-color: @foreground; + background-color: @trans; + text-color: @foreground; } element normal.urgent { - background-color: @background; - text-color: @off; + background-color: @background; + text-color: @off; } element normal.active { - background-color: @trans; - text-color: @on; + background-color: @trans; + text-color: @on; } element selected.normal { - background-color: @selected; - text-color: @background; + background-color: @selected; + text-color: @background; } element selected.urgent { - background-color: @background; - text-color: @off; + background-color: @background; + text-color: @off; } element selected.active { - background-color: @background; - text-color: @selected; + background-color: @background; + text-color: @selected; } element alternate.normal { - background-color: @trans; - text-color: @foreground; + background-color: @trans; + text-color: @foreground; } element alternate.urgent { - background-color: @background; - text-color: @foreground; + background-color: @background; + text-color: @foreground; } element alternate.active { - background-color: @trans; - text-color: @foreground; + background-color: @trans; + text-color: @foreground; } message { - border: 0px; - border-color: @selected; - padding: 1px; + border: 0px; + border-color: @selected; + padding: 1px; } textbox { - text-color: @foreground; + text-color: @foreground; } diff --git a/rofi/menoo.rasi b/rofi/menoo.rasi index b1e9209..bd35a08 100644 --- a/rofi/menoo.rasi +++ b/rofi/menoo.rasi @@ -1,122 +1,120 @@ configuration { - window-format: "[{w}] ··· {c} ··· {t}"; - click-to-exit: true; - display-window: ""; + window-format: "[{w}] ··· {c} ··· {t}"; + click-to-exit: true; + display-window: ""; } * { - font: "System Charcoal 11.5"; - background-color: @trans; + font: "System Charcoal 11.5"; + background-color: @trans; } @import "colors.rasi" window { - transparency: "real"; - background-color: @trans; - text-color: @foreground; - location: northwest; - anchor: northwest; - padding: 0px 5px 0px 0px; + transparency: "real"; + background-color: @trans; + text-color: @foreground; + location: northwest; + anchor: northwest; + padding: 0px 5px 0px 0px; } prompt { - spacing: 0; - border: 0; - background-color: @selected; - text-color: @background; - padding: 2px 10px; - margin: 0px 1px 5px 1px; + spacing: 0; + border: 0; + background-color: @selected; + text-color: @background; + padding: 2px 10px; + margin: 0px 1px 5px 1px; } entry { - background-color: @trans; - text-color: @foreground; - expand: false; - padding: 10px; - margin: 10px 0px; + background-color: @trans; + text-color: @foreground; + expand: false; + padding: 10px; + margin: 10px 0px; } inputbar { - spacing: 0; - background-color: @trans; - text-color: @foreground; - expand: false; - margin: 0px; - padding: 0px; - children: [ prompt, textbox-prompt-colon ]; + spacing: 0; + background-color: @trans; + text-color: @foreground; + expand: false; + margin: 0px; + padding: 0px; + children: [ prompt, textbox-prompt-colon ]; } listview { - background-color: @background; - columns: 1; - spacing: 5px; - fixed-height: false; - scrollbar: false; - cycle: true; - dynamic: true; - layout: vertical; + background-color: @background; + columns: 1; + spacing: 5px; + fixed-height: false; + scrollbar: false; + cycle: true; + dynamic: true; + layout: vertical; } mainbox { - background-color: @trans; - children: [ inputbar, listview ]; - spacing: 10px; + background-color: @trans; + children: [ inputbar, listview ]; + spacing: 10px; } element { - background-color: @background; - text-color: @foreground; - orientation: horizontal; - border-radius: 0px; - padding: 5px; + background-color: @background; + text-color: @foreground; + orientation: horizontal; + border-radius: 0px; + padding: 5px; } element-icon { - background-color: inherit; - text-color: inherit; - horizontal-align: 0.5; - vertical-align: 0.5; - size: 0px; - border: 0px; + background-color: inherit; + text-color: inherit; + horizontal-align: 0.5; + vertical-align: 0.5; + size: 0px; + border: 0px; } element-text { - background-color: inherit; - text-color: inherit; - expand: true; - horizontal-align: 0; - vertical-align: 0; - margin: 2px 0px 2px 2px; + background-color: inherit; + text-color: inherit; + expand: true; + horizontal-align: 0; + vertical-align: 0; + margin: 2px 0px 2px 2px; } element selected { - background-color: @selected; - text-color: @background; - border: 0px; - border-radius: 0px; - border-color: @selected; + background-color: @selected; + text-color: @background; + border: 0px; + border-radius: 0px; + border-color: @selected; } -element.active, -element.selected.urgent { - background-color: @on; - text-color: @background; - border-color: @on; +element.active, element.selected.urgent { + background-color: @on; + text-color: @background; + border-color: @on; } element.selected.urgent { - border-color: @selected; + border-color: @selected; } -element.urgent, -element.selected.active { - background-color: @off; - text-color: @background; - border-color: @off; -} +element.urgent, element.selected.active { + background-color: @off; + text-color: @background; + border-color: @off; + } element.selected.active { - border-color: @selected; + border-color: @selected; } diff --git a/xbpaketes b/xbpaketes index ac45394..e841637 100644 --- a/xbpaketes +++ b/xbpaketes @@ -1,78 +1,92 @@ MangoHud-0.6.5_1 SDL-1.2.15_12 SDL_mixer-1.2.12_14 -StyLua-0.11.2_1 +StyLua-0.11.3_1 Vulkan-Headers-1.2.182_1 alacritty-0.9.0_2 -alsa-plugins-1.2.5_1 -alsa-plugins-ffmpeg-1.2.5_1 -alsa-plugins-jack-1.2.5_1 -alsa-plugins-pulseaudio-1.2.5_1 -alsa-utils-1.2.5.1_1 +alsa-lib-32bit-1.2.6.1_1 +alsa-plugins-1.2.6_1 +alsa-plugins-32bit-1.2.6_1 +alsa-plugins-ffmpeg-1.2.6_1 +alsa-plugins-jack-1.2.6_1 +alsa-plugins-pulseaudio-1.2.6_1 +alsa-plugins-pulseaudio-32bit-1.2.6_1 +alsa-utils-1.2.6_1 +alsaequal-0.7.1_2 +alsaequal-32bit-0.7.1_2 amdvlk-2021.Q3.7_1 amdvlk-32bit-2021.Q3.7_1 amfora-1.9.2_1 -android-tools-31.0.3_1 +android-tools-31.0.3p1_1 android-udev-rules-20210501_1 audacious-4.1_1 audacious-plugins-4.1_4 base-devel-20181003_2 base-system-0.114_1 bat-0.18.3_1 -blender-2.93.5_1 +blender-3.0.0_1 bspwm-0.9.10_1 -catgirl-2.0_1 +catgirl-2.0a_1 cgo-0.6.1_1 -chrony-4.1_1 -cmake-3.21.1_1 -curl-7.80.0_1 -delta-0.10.2_1 -delve-1.7.1_1 +chrony-4.2_1 +cmake-3.22.1_1 +curl-7.81.0_1 +delta-0.11.3_1 +delve-1.8.0_1 dfc-3.1.1_2 dkms-2.8.4_2 -droidcam-1.7.3_1 +droidcam-1.8.1_1 dunst-1.7.3_1 -elinks-0.14.3_1 +elinks-0.15.0_1 +elogind-246.9.2_3 +evtest-qt-0.2.0_1 fcitx-4.2.9.8_5 fcitx-configtool-0.4.10_2 fcitx-mozc-2.26.4472.102_2 -fd-8.3.0_1 -feh-3.7.2_1 +fd-8.3.1_1 +feh-3.8_1 ffmpeg-4.4.1_1 figlet-2.2.5_6 figlet-fonts-20150508_4 file-roller-3.40.0_1 -firefox-95.0_1 +firefox-96.0.2_1 font-misc-misc-1.1.2_7 -fzf-0.28.0_2 -gallery-dl-1.19.0_2 -git-2.34.1_1 -git-libsecret-2.34.1_1 +fzf-0.29.0_1 +gallery-dl-1.20.1_1 +git-2.35.0_1 +git-libsecret-2.35.0_1 glu-9.0.2_2 +glu-32bit-9.0.2_2 glxinfo-8.4.0_3 gmic-2.9.9_1 gnome-ssh-askpass-8.8p1_1 gnupg2-2.2.32_1 -go-1.17.5_1 -golangci-lint-1.42.1_1 -gopls-0.7.3_1 +go-1.17.6_1 +golangci-lint-1.43.0_1 +gopls-0.7.4_1 grub-2.06_2 gucharmap-12.0.1_2 gzdoom-4.7.1_1 +hidapi-0.11.2_1 +hidapi-32bit-0.11.2_1 highlight-4.1_2 -htop-3.1.1_1 +htop-3.1.2_1 hunspell-1.7.0_3 hunspell-es_ES-2.6_1 +hwinfo-21.80_1 isync-1.4.4_1 -jack-1.9.19_1 +jack-1.9.20_1 keychain-2.8.5_2 -krita-4.4.8_2 +krita-5.0.0_3 lf-r26_1 -libdrm-32bit-2.4.107_1 +libOSMesa-32bit-21.3.3_2 +libdrm-32bit-2.4.109_1 libfcitx-gtk-4.2.9.8_5 libfcitx-gtk3-4.2.9.8_5 libgcc-32bit-10.2.1pre1_3 -libglvnd-32bit-1.3.3_1 +libglvnd-32bit-1.4.0_1 +libspa-alsa-0.3.43_1 +libspa-alsa-32bit-0.3.43_1 libstdc++-32bit-10.2.1pre1_3 linux-headers-5.15_1 lm_sensors-3.6.0_1 @@ -80,62 +94,68 @@ lolcat-c-1.2_1 lua53-devel-5.3.5_7 lua54-devel-5.4.3_2 luarocks-lua54-3.7.0_1 -maim-5.7.4_2 -mesa-dri-21.2.6_1 -mesa-dri-32bit-21.2.6_1 -mesa-vaapi-21.2.6_1 -mesa-vaapi-32bit-21.2.6_1 -mesa-vdpau-21.2.6_1 -mesa-vdpau-32bit-21.2.6_1 -mesa-vulkan-overlay-layer-21.2.6_1 -mesa-vulkan-overlay-layer-32bit-21.2.6_1 -mesa-vulkan-radeon-21.2.6_1 -mesa-vulkan-radeon-32bit-21.2.6_1 +lutris-0.5.9.1_1 +maim-5.7.4_3 +mesa-dri-21.3.3_2 +mesa-dri-32bit-21.3.3_2 +mesa-vaapi-21.3.3_2 +mesa-vaapi-32bit-21.3.3_2 +mesa-vdpau-21.3.3_2 +mesa-vdpau-32bit-21.3.3_2 +mesa-vulkan-intel-21.3.3_2 +mesa-vulkan-intel-32bit-21.3.3_2 +mesa-vulkan-overlay-layer-21.3.3_2 +mesa-vulkan-overlay-layer-32bit-21.3.3_2 +mesa-vulkan-radeon-21.3.3_2 +mesa-vulkan-radeon-32bit-21.3.3_2 mlocate-0.26_7 mosh-1.3.2_23 -mpv-0.34.0_1 +mpv-0.34.1_1 msmtp-1.8.18_1 -mumble-1.3.4_7 +mumble-1.4.230_2 ncdu-1.16_1 ncurses-devel-6.2_4 neomutt-20211029_1 -neovim-0.6.0_1 -newsboat-2.25_1 +neovim-0.6.1_1 +newsboat-2.26_1 nfs-utils-2.5.4_1 nftables-1.0.1_1 -nicotine+-3.1.1_1 -nodejs-16.9.1_1 +nicotine+-3.2.0_1 +nodejs-16.13.2_2 noto-fonts-cjk-20190416_2 -noto-fonts-emoji-2.028_1 +noto-fonts-emoji-2.034_1 noto-fonts-ttf-20190926_2 -opendoas-6.8.1_1 +nsxiv-28_1 +opendoas-6.8.2_1 openjdk11-11.0.12+5_2 p7zip-16.02_5 pass-1.7.4_1 +pcsx2-32bit-1.6.0_2 perl-File-MimeInfo-0.30_1 perl-Text-CharWidth-0.04_7 pinentry-gtk-1.2.0_1 pipe-viewer-0.1.7_1 polybar-3.5.7_1 +protontricks-1.6.1_1 pulsemixer-1.5.1_2 +python3-evdev-1.2.0_5 python3-neovim-0.4.3_2 -python3-requests-2.26.0_2 -qjackctl-0.9.5_1 +python3-requests-2.27.1_1 +qjackctl-0.9.6_1 ripgrep-13.0.0_1 rofi-1.7.2_1 rofi-emoji-2.2.0_1 rsync-3.2.3_3 -runit-nftables-20200123_2 setxkbmap-1.3.2_1 shellcheck-0.8.0_1 -shfmt-3.4.1_1 +shfmt-3.4.2_1 simple-mtpfs-0.4.0_1 snooze-0.5_1 socklog-void-20200115_2 steam-1.0.0.74_1 +strace-5.15_1 sv-netmount-0.1_3 sxhkd-0.6.2_1 -sxiv-26_1 tmux-3.2a_1 toilet-0.3_3 transmission-3.00_5 @@ -143,7 +163,7 @@ tremc-0.9.2_2 tty-solitaire-1.3.1_1 udevil-0.4.4_5 unclutter-xfixes-1.6_1 -unrar-6.1.3_1 +unrar-6.1.3_2 vkBasalt-0.3.2.4_1 vkBasalt-32bit-0.3.2.4_1 vkd3d-1.2_1 @@ -151,27 +171,38 @@ vkd3d-32bit-1.2_1 void-repo-multilib-6_3 void-repo-multilib-nonfree-6_3 void-repo-nonfree-9_5 +wine-7.0_1 +wine-32bit-7.0_1 +wine-devel-7.0_1 +wine-devel-32bit-7.0_1 +wine-gecko-2.47.2_1 +wine-mono-7.0.0_1 +wine-tools-7.0_1 +winetricks-20210825_1 words-web2-326913_2 -xboxdrv-0.8.8_3 xclip-0.13_2 xcompmgr-1.1.8_2 xdg-utils-1.1.3_4 xdo-0.5.7_3 +xf86-video-fbdev-0.5.0_1 xf86-video-nouveau-1.0.17_1 +xf86-video-vesa-2.5.0_1 xinput-1.6.3_1 xkcdpass-1.19.3_2 xkill-1.0.5_1 xorg-minimal-1.2_2 -xorg-video-drivers-7.6_22 xprop-1.2.5_1 xrandr-1.5.1_1 xrdb-1.2.1_1 xset-1.2.4_1 xsetroot-1.1.2_1 +xtools-0.63_1 zathura-0.4.8_1 zathura-cb-0.1.9_1 zathura-pdf-mupdf-0.3.7_3 zip-3.0_6 +zita-alsa-pcmi-0.4.0_1 +zita-alsa-pcmi-32bit-0.4.0_1 zsh-5.8_2 zsh-history-substring-search-1.0.2_2 zsh-syntax-highlighting-0.7.1_3 diff --git a/zsh/conf/03_aliases.zsh b/zsh/conf/03_aliases.zsh index 42bcbc5..5f992ca 100644 --- a/zsh/conf/03_aliases.zsh +++ b/zsh/conf/03_aliases.zsh @@ -97,7 +97,7 @@ alias \ reboot='doas shutdown -r now' \ shutdown='doas shutdown -h now' \ path='echo -e ${PATH//:/\\n}' \ - wp='sxiv-rifle ~/img/wallpaper >/dev/null 2>&1' \ + wp='nsxiv ~/img/wallpaper >/dev/null 2>&1' \ pwn='chmod +x' \ rat='tar -xf' \ um='udevil mount' \