merege

.config/hypr/hyprland.conf

@@ -36,7 +36,7 @@ monitor=,preferred,auto,auto
 # Set programs that you use
 $terminal = kitty
 $fileManager = nautilus
-$menu = wofi --show drun -Gn -L 4
+$menu = wofi --show drun -GI
 
 
 #################
@@ -58,6 +58,7 @@ exec-once = flatpak run com.github.wwmm.easyeffects -w
 exec-once = powertop --auto-tune
 exec-once = systemctl --user start hyprpolkitagent
 exec-once = xrdb -merge ~/.Xresources
+exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
                          
 
 #############################
@@ -95,8 +96,8 @@ permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
 
 # https://wiki.hypr.land/Configuring/Variables/#general
 general {
-    gaps_in = 4
+    gaps_in = 2
-    gaps_out = 4
+    gaps_out = 2
 
     border_size = 1
 
@@ -117,7 +118,7 @@ general {
 
 # https://wiki.hypr.land/Configuring/Variables/#decoration
 decoration {
-    rounding = 6
+    rounding = 4
     rounding_power = 2
 
     # Change transparency of focused and unfocused windows
@@ -253,6 +254,8 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 bind = $mainMod, RETURN, exec, $terminal
 bind = $mainMod, D, exec, $menu
 bind = $mainMod, F, fullscreen
+bind = $mainMod, M, exec, swaylock -c 0x000000; playerctl pause
+
 bind = $mainMod SHIFT, SPACE, togglefloating,
 bind = $mainMod SHIFT, Q, hy3:killactive,
 bind = $mainMod SHIFT, M, exit,

.config/nvim/lua/plugins/mason.lua

@@ -1,54 +1,53 @@
 return {
     "mason-org/mason-lspconfig.nvim",
-	dependencies = {
+    dependencies = {
-	    {"mason-org/mason.nvim"},
+        {"mason-org/mason.nvim"},
-		{'neovim/nvim-lspconfig'},
+        {'neovim/nvim-lspconfig'},
 
-		{'nvim-mini/mini.nvim'},
+        {'nvim-mini/mini.nvim'},
         {'nvim-mini/mini.completion'},
-	},
+    },
-	config = function()
+    config = function()
-		require("mason").setup()
+        require("mason").setup()
         require("mason-lspconfig").setup {}
 
-		-- NOTE: this is meant to be backwards compatible with Neovim v0.9
+        -- NOTE: this is meant to be backwards compatible with Neovim v0.9
-		---
+        ---
-		-- Autocompletion
+        -- Autocompletion
-		---
+        ---
-
         --require('mini.snippets').setup()
-		require('mini.completion').setup()
+        require('mini.completion').setup()
 
-		---
+        ---
-		-- Language server configuration
+        -- Language server configuration
-		---
+        ---
 
-		-- These keymaps are the defaults in Neovim v0.10
+        -- These keymaps are the defaults in Neovim v0.10
-		if vim.fn.has('nvim-0.11') == 0 then
+        if vim.fn.has('nvim-0.11') == 0 then
-			-- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11
+            -- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11
-			-- that's why we put these under a conditional block
+            -- that's why we put these under a conditional block
-			vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
+            vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-			vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
+            vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-			vim.keymap.set('n', '<C-w>d', '<cmd>lua vim.diagnostic.open_float()<cr>')
+            vim.keymap.set('n', '<C-w>d', '<cmd>lua vim.diagnostic.open_float()<cr>')
-			vim.keymap.set('n', '<C-w><C-d>', '<cmd>lua vim.diagnostic.open_float()<cr>')
+            vim.keymap.set('n', '<C-w><C-d>', '<cmd>lua vim.diagnostic.open_float()<cr>')
-		end
+        end
 
-		vim.api.nvim_create_autocmd('LspAttach', {
+        vim.api.nvim_create_autocmd('LspAttach', {
-			callback = function(event)
+            callback = function(event)
-				local bufmap = function(mode, rhs, lhs)
+                local bufmap = function(mode, rhs, lhs)
-					vim.keymap.set(mode, rhs, lhs, {buffer = event.buf})
+                    vim.keymap.set(mode, rhs, lhs, {buffer = event.buf})
-				end
+                end
 
-				-- These keymaps are the defaults in Neovim v0.11
+                -- These keymaps are the defaults in Neovim v0.11
-				bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
+                bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-				bufmap('n', 'grr', '<cmd>lua vim.lsp.buf.references()<cr>')
+                bufmap('n', 'grr', '<cmd>lua vim.lsp.buf.references()<cr>')
-				bufmap('n', 'gri', '<cmd>lua vim.lsp.buf.implementation()<cr>')
+                bufmap('n', 'gri', '<cmd>lua vim.lsp.buf.implementation()<cr>')
-				bufmap('n', 'grn', '<cmd>lua vim.lsp.buf.rename()<cr>')
+                bufmap('n', 'grn', '<cmd>lua vim.lsp.buf.rename()<cr>')
-				bufmap('n', 'gra', '<cmd>lua vim.lsp.buf.code_action()<cr>')
+                bufmap('n', 'gra', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-				bufmap('n', 'gO', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
+                bufmap('n', 'gO', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
-				bufmap({'i', 's'}, '<C-s>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
+                bufmap({'i', 's'}, '<C-s>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-			end,
+            end,
-		})
+        })
 
     end
 }

.config/nvim/lua/plugins/treesitter.lua

@@ -2,45 +2,48 @@ return {
     "nvim-treesitter/nvim-treesitter",
     build = ":TSUpdate",
     config = function()
-        require("nvim-treesitter.configs").setup {
+        require("nvim-treesitter").install({})
-            -- A list of parser names, or "all" (the five listed parsers should always be installed)
-            ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" },
 
-            -- Install parsers synchronously (only applied to `ensure_installed`)
+        --require("nvim-treesitter.configs").setup ({
-            sync_install = false,
+        --    -- A list of parser names, or "all" (the five listed parsers should always be installed)
+        --    ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" },
 
-            -- Automatically install missing parsers when entering buffer
+        --    -- Install parsers synchronously (only applied to `ensure_installed`)
-            -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+        --    sync_install = false,
-            auto_install = true,
 
-            -- List of parsers to ignore installing (for "all")
+        --    -- Automatically install missing parsers when entering buffer
-            ignore_install = { "javascript" },
+        --    -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+        --    auto_install = true,
 
-            ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
+        --    -- List of parsers to ignore installing (for "all")
-            -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
+        --    ignore_install = { "javascript" },
 
-            highlight = {
+        --    ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-                enable = true,
+        --    -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
 
-                -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+        --    highlight = {
-                -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+        --        enable = true,
-                -- the name of the parser)
-                -- list of language that will be disabled
-                -- disable = { "c", "rust" },
-                -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
-                disable = function(lang, buf)
-                    local max_filesize = 100 * 1024 -- 100 KB
-                    local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-                    if ok and stats and stats.size > max_filesize then
-                        return true
-                    end
-                end,
 
-                -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+        --        -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-                -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+        --        -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-                -- Using this option may slow down your editor, and you may see some duplicate highlights.
+        --        -- the name of the parser)
-                -- Instead of true it can also be a list of languages
+        --        -- list of language that will be disabled
-                additional_vim_regex_highlighting = false,
+        --        -- disable = { "c", "rust" },
-            },
+        --        -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
-        }
+        --        disable = function(lang, buf)
-end }
+        --            local max_filesize = 100 * 1024 -- 100 KB
+        --            local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+        --            if ok and stats and stats.size > max_filesize then
+        --                return true
+        --            end
+        --        end,
+
+        --        -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+        --        -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+        --        -- Using this option may slow down your editor, and you may see some duplicate highlights.
+        --        -- Instead of true it can also be a list of languages
+        --        additional_vim_regex_highlighting = false,
+        --    },
+        --})
+    end 
+}