From f8bd4418ffe7268193121649e1b6082382ee4be1 Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Fri, 5 May 2023 14:54:42 +0100 Subject: [PATCH] lmao arch time --- archinstall.json | 66 +++++++++++++++++++++++++ common/.config/nvim/lua/keymappings.lua | 5 +- common/.config/nvim/lua/lsp-general.lua | 1 + common/.config/nvim/lua/plugins.lua | 17 +++---- 4 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 archinstall.json diff --git a/archinstall.json b/archinstall.json new file mode 100644 index 0000000..043b70e --- /dev/null +++ b/archinstall.json @@ -0,0 +1,66 @@ +{ + "audio": "pulseaudio", + "bootloader": "grub-install", + "custom-commands": [ + ], + "filesystem": "ext4", + "gfx_driver": "Intel (open-source)", + "swap": true, + "hostname": "benk", + "kernels": [ + "linux" + ], + "keyboard-language": "en", + "mirror-region": "United Kingdom", + "nic": { + "NetworkManager": true, + }, + "ntp": true, + "packages": [ + "yay", + "git", + "wget", + "curl", + "zsh", + "zsh-vi-mode", + "base-devel", + "rust-git", + "cmake-git", + "exa", + "bluez", + "bluez-utils", + "blueman", + "network-manager-applet-git", + "xfce4-power-manager", + "volumeicon", + "pulseaudio-equalizer-ladspa", + "neovim-git", + "mpris-cli", + "wezterm", + "tmux", + "ranger", + "xorg-server", + "xorg-xbacklight", + "xidlehook", + "lightdm", + "lightdm-gtk-greeter", + "awesome-git", + "picom-git", + "i3lock-git", + "i3exit", + "arc-icon-theme", + "ttf-dejavu-sans-mono-powerline-git", + "flameshot", + "rofi", + "google-chrome-unstable", + "darktable-git", + "ktira", + ], + "services": [ + "bluetooth.service", + "lightdm.service", + ], + "sys-encoding": "utf-8", + "sys-language": "en_UK", + "timezone": "Europe/London", +} diff --git a/common/.config/nvim/lua/keymappings.lua b/common/.config/nvim/lua/keymappings.lua index 26c75f1..62cbff1 100644 --- a/common/.config/nvim/lua/keymappings.lua +++ b/common/.config/nvim/lua/keymappings.lua @@ -7,6 +7,9 @@ vim.api.nvim_set_keymap('i', '', '"+pa', opts) -- paste and keep the paste register vim.api.nvim_set_keymap('', 'p', '"_dP', opts) +-- peek registers +vim.api.nvim_set_keymap('n', 'r', ':Telescope registers', opts) + -- vscode style quick peek at the tree vim.api.nvim_set_keymap('n', '', ":NvimTreeToggle", { noremap = true }) @@ -21,8 +24,6 @@ vim.api.nvim_set_keymap('', 'U', '', opts) vim.api.nvim_set_keymap('', '', '', opts) -- indent via Tab -vim.api.nvim_set_keymap('n', '', '>>_', opts) -vim.api.nvim_set_keymap('n', '', '<<_', opts) vim.api.nvim_set_keymap('v', '', '>>_', opts) vim.api.nvim_set_keymap('v', '', '<<_', opts) vim.api.nvim_set_keymap('i', '', '\t', opts) diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua index 8fe96ad..3e7162a 100644 --- a/common/.config/nvim/lua/lsp-general.lua +++ b/common/.config/nvim/lua/lsp-general.lua @@ -76,6 +76,7 @@ lsp.on_attach(function(_, bufnr) -- CLANGFORMATTTTT vim.keymap.set('n', 'gf', 'lua vim.lsp.buf.format()', opts) + vim.keymap.set('n', 'gw', 'StripWhitespace', opts) end) diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua index cb056d5..0f4c68a 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/common/.config/nvim/lua/plugins.lua @@ -38,14 +38,6 @@ local packer = require('packer').startup(function(use) end } - -- speedy searching - use { - 'ggandor/leap.nvim', - config = function () - require('leap').add_default_mappings() - end - } - -- colourise colour codes use { 'norcalli/nvim-colorizer.lua', @@ -134,7 +126,14 @@ local packer = require('packer').startup(function(use) branch = "main", event = "LspAttach", config = function() - require("lspsaga").setup({}) + require("lspsaga").setup({ + lightbulb = { + enable = false, + }, + rename = { + whole_project = false, + } + }) end, }