Merge branch 'main' of git.tibeuleu.xyz:Tibeuleu/dotfiles

merge home config

.config/i3/config

@@ -72,7 +72,7 @@ bindsym $mod+Shift+q		[con_id="__focused__" instance="^(?!dropdown_).*$"] exec -
 bindsym $mod+w			exec --no-startup-id $BROWSER
 bindsym $mod+Shift+w		exec $term -e nmtui
 
-#bindsym $mod+r			exec --no-startup-id element-desktop
+bindsym $mod+r			exec --no-startup-id element-desktop
 bindsym $mod+Shift+r		exec --no-startup-id dmenuunicode
 
 bindsym $mod+e 			exec $term -e lf

.config/nvim/after/plugin/indent-blankline.lua

@@ -4,7 +4,7 @@ require("ibl").setup({
     indent = { char = " "},
     whitespace = { },
     scope = { char = "▎",
-        highlight = "IndentBlanklineContextChar",
+        -- highlight = "IndentBlanklineContextChar",
         show_start = false,
         show_end = false,
         include = { node_type = { python = { "if_statement",

.config/nvim/after/plugin/lsp.lua

@@ -32,6 +32,7 @@ local servers = {
             pylsp = {
                 plugins = {
                     -- I don't want pylsp linter/formatter
+                    black = { enabled = false, },
                     autopep8 = { enabled = false, },
                     flake8 = { enabled = false, },
                     mccabe = { enabled = false, },
@@ -47,11 +48,13 @@ local servers = {
         filetypes = { "python" },
         init_options = {
             settings = {
-                -- configuration = "<path_to_custom_ruff_toml>",  -- Custom config for ruff to use
+                configuration = "~/.local/share/nvim/ruff.toml",  -- Custom config for ruff to use
                 exclude = { "__about__.py" },  -- Files to be excluded by ruff checking
                 lineLength = 160,  -- Line length to pass to ruff checking and formatting
                 organizeImports = true,
+                format = {
                     preview = false,  -- Whether to enable the preview style linting and formatting.
+                },
                 lint = {
                     enable = true,  -- Enable linting
                     -- select = { "F" },  -- Rules to be enabled by ruff

.config/nvim/after/plugin/treesitter.lua

@@ -24,33 +24,17 @@ require'nvim-treesitter.configs'.setup {
   },
 }
 local vim = vim
-local opt = vim.opt
-local api = vim.api
-local M = {}
 
-opt.foldmethod = "expr"
+vim.o.foldmethod = 'expr'
-opt.foldexpr = "nvim_treesitter#foldexpr()"
+-- Default to treesitter folding
-
+vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
--- function to create a list of commands and convert them to autocommands
+-- Prefer LSP folding if client supports it
--------- This function is taken from https://github.com/norcalli/nvim_utils
+vim.api.nvim_create_autocmd('LspAttach', {
-function M.nvim_create_augroups(definitions)
+    callback = function(args)
-    for group_name, definition in pairs(definitions) do
+    local client = vim.lsp.get_client_by_id(args.data.client_id)
-        api.nvim_command('augroup '..group_name)
+    if client:supports_method('textDocument/foldingRange') then
-        api.nvim_command('autocmd!')
+            local win = vim.api.nvim_get_current_win()
-        for _, def in ipairs(definition) do
+            vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()'
-            local command = table.concat(vim.tbl_flatten{'autocmd', def}, ' ')
-            api.nvim_command(command)
         end
-        api.nvim_command('augroup END')
+    end,
-    end
+})
-end
-
-
-local autoCommands = {
-    -- other autocommands
-    open_folds = {
-        {"BufReadPost,FileReadPost", "*", "normal zR"}
-    }
-}
-
-M.nvim_create_augroups(autoCommands)

.config/nvim/lua/config/gruvbox.lua

@@ -22,4 +22,4 @@ require("gruvbox").setup({
 	dim_inactive = false,
 	transparent_mode = true,
 })
-vim.cmd.colorscheme("gruvbox")
+vim.cmd("colorscheme gruvbox")

.config/nvim/lua/config/init.lua

@@ -1,4 +1,4 @@
+require("config.pckr")
 require("config.remap")
 require("config.options")
 require("config.gruvbox")
-require("config.packer")

.config/nvim/lua/config/options.lua

@@ -82,4 +82,3 @@ vim.api.nvim_create_autocmd('TextYankPost', {
         })
     end,
 })
-

.config/nvim/lua/config/pckr.lua

@@ -1,39 +1,48 @@
-return require('packer').startup(function(use)
+local function bootstrap_pckr()
-    -- Packer can manage itself
+  local pckr_path = vim.fn.stdpath("data") .. "/pckr/pckr.nvim"
-    use 'wbthomason/packer.nvim'
 
-    use {
+  if not (vim.uv or vim.loop).fs_stat(pckr_path) then
+    vim.fn.system({
+      'git',
+      'clone',
+      "--filter=blob:none",
+      'https://github.com/lewis6991/pckr.nvim',
+      pckr_path
+    })
+  end
+
+  vim.opt.rtp:prepend(pckr_path)
+end
+
+bootstrap_pckr()
+
+require('pckr').add{
+    {
         'nvim-telescope/telescope.nvim',
         tag = '0.1.1',
         -- or branch = '0.1.x',
         requires = { {'nvim-lua/plenary.nvim'} }
-    }
+    };
-    use "ellisonleao/gruvbox.nvim"
+    "ellisonleao/gruvbox.nvim";
-
+    {
-    use {
         'nvim-treesitter/nvim-treesitter',
         run = function()
             local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
             ts_update()
         end,
-    }
+    };
-    use 'nvim-treesitter/playground'
+    {
-    use {
         'ThePrimeagen/harpoon',
         requires = { {'nvim-lua/plenary.nvim'} }
-    }
+    };
-    use 'mbbill/undotree'
+    'mbbill/undotree';
-    use 'tpope/vim-fugitive'
+    'tpope/vim-fugitive';
-    use 'airblade/vim-gitgutter'
+    'airblade/vim-gitgutter';
-
+    'lukas-reineke/indent-blankline.nvim';
-    use 'lukas-reineke/indent-blankline.nvim'
+    'JoosepAlviste/nvim-ts-context-commentstring';
-
+    'numToStr/Comment.nvim';
-    use 'JoosepAlviste/nvim-ts-context-commentstring'
+    'lervag/vimtex';
-    use 'numToStr/Comment.nvim'
+    {
-
-    use 'lervag/vimtex'
-
-    use {
         'neovim/nvim-lspconfig',
         requires = {
             -- LSP Support
@@ -57,7 +66,6 @@ return require('packer').startup(function(use)
             -- Utils
             {'j-hui/fidget.nvim'},
             {'folke/neodev.nvim'}
+        };
+    };
 }
-    }
-
-end)

.config/qutebrowser/autoconfig.yml

@@ -6,5 +6,7 @@
 
 config_version: 2
 settings:
+  content.javascript.enabled:
+    global: true
   statusbar.show:
-    global: always
+    global: never

.config/qutebrowser/config.py

@@ -1176,7 +1176,6 @@ c.url.searchengines = {
     "!aw": "https://wiki.archlinux.org/index.php/Special:Search?search={}",
     "!ads": "https://ui.adsabs.harvard.edu/search/q={}",
     "!sci": "https://sci-hub.se/{}",
-    "!g": "https://www.google.com/search?hl=en&q={}",
     "!w": "https://en.wikipedia.org/w/index.php?title=Special%3ASearch&search={}",
     "!y": "https://www.youtube.com/results?search_query={}&search=Search",
 }