From 1fc86c9634bae9158e044db8ba2690ea44aa5170 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 26 Oct 2022 20:52:29 +1030 Subject: [PATCH] updates across the board --- .config/nvim/lua/user/lsp/handlers.lua | 2 +- .config/nvim/lua/user/lsp/mason.lua | 1 - .config/nvim/lua/user/plugins.lua | 2 +- .config/shell/profile | 15 +++++++++++++++ .config/xmobar/xmobarrc-single.hs | 2 +- .config/zsh/.zshrc | 1 + .xmonad/xmonad.hs | 14 +++++++------- 7 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.config/nvim/lua/user/lsp/handlers.lua b/.config/nvim/lua/user/lsp/handlers.lua index 9930ec8..8f8ecaa 100644 --- a/.config/nvim/lua/user/lsp/handlers.lua +++ b/.config/nvim/lua/user/lsp/handlers.lua @@ -9,7 +9,7 @@ if not status_cmp_ok then end M.capabilities.textDocument.completion.completionItem.snippetSupport = true -M.capabilities = cmp_nvim_lsp.update_capabilities(M.capabilities) +M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities) M.setup = function() local icons = require "user.icons" diff --git a/.config/nvim/lua/user/lsp/mason.lua b/.config/nvim/lua/user/lsp/mason.lua index ce99fb0..47ec534 100644 --- a/.config/nvim/lua/user/lsp/mason.lua +++ b/.config/nvim/lua/user/lsp/mason.lua @@ -15,7 +15,6 @@ local servers = { "html", "jdtls", "solc", - "solidity_ls", "sumneko_lua", "omnisharp", "tflint", diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 7d8773b..a193321 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -48,7 +48,7 @@ return packer.startup(function(use) -- Lua Development use("nvim-lua/plenary.nvim") -- useful lua functions use("nvim-lua/popup.nvim") - use("folke/lua-dev.nvim") + use("folke/neodev.nvim") -- LSP use("neovim/nvim-lspconfig") -- enable LSP diff --git a/.config/shell/profile b/.config/shell/profile index c6cb2ff..90a2cfd 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -23,15 +23,30 @@ export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" export XDG_CACHE_HOME="$HOME/.cache" export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc" +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config" export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0" export LESSHISTFILE="-" +export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc" export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/shell/inputrc" export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" +export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default" +export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi" +export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" +export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android" +export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo" +export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" +export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" +export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison" export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history" +export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat" +export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config" +export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum" # Other program settings: export DICS="/usr/share/stardict/dic/" +export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" +export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" export LESS=-R export LESS_TERMCAP_mb="$(printf '%b' '')" export LESS_TERMCAP_md="$(printf '%b' '')" diff --git a/.config/xmobar/xmobarrc-single.hs b/.config/xmobar/xmobarrc-single.hs index 269d0e7..3af88d7 100644 --- a/.config/xmobar/xmobarrc-single.hs +++ b/.config/xmobar/xmobarrc-single.hs @@ -1,7 +1,7 @@ Config { -- appearance - font = "xft:Fira Code:size=12:antialias=true:hinting=true" + font = "xft:Fira Code:size=9:antialias=true:hinting=true" , additionalFonts = [ "xft:FiraCode Nerd Font:style=Regular:size=9:antialias=true:hinting=true" ] , bgColor = "#282a36" , fgColor = "#f8f8f2" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 142c844..3e82d60 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -89,6 +89,7 @@ lfcd() { bindkey -s '^o' '^ulfcd\n' bindkey -s '^t' '^utms\n' +bindkey -s '^n' '^uzk edit --interactive --sort modified-\n' if [ -f /etc/hostname ]; then HOST=$(cat /etc/hostname) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 15dbc8f..18a08d6 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -139,7 +139,7 @@ myClickJustFocuses = False -- Width of the window border in pixels. myBorderWidth :: Dimension -myBorderWidth = 2 +myBorderWidth = 1 -- Border colors for unfocused and focused windows, respectively. myNormalBorderColor :: String @@ -438,12 +438,12 @@ mySpacing i = spacingRaw True (Border i i i i) True (Border i i i i) True -- mySpacing n sets the gap size around the windows. tall = renamed [Replace "tall"] $ limitWindows 12 - $ mySpacing 2 + $ mySpacing 1 -- $ Mirror $ ResizableTall 1 (3/100) (1/2) [] wide = renamed [Replace "wide"] $ limitWindows 12 - $ mySpacing 2 + $ mySpacing 1 $ Mirror $ ResizableTall 1 (3/100) (1/2) [] monocle = renamed [Replace "monocle"] @@ -452,19 +452,19 @@ floats = renamed [Replace "floats"] $ limitWindows 20 simplestFloat grid = renamed [Replace "grid"] $ limitWindows 12 - $ mySpacing 2 + $ mySpacing 1 $ mkToggle (single MIRROR) $ Grid (16/10) spirals = renamed [Replace "spirals"] - $ mySpacing 2 + $ mySpacing 1 $ spiral (6/7) threeCol = renamed [Replace "threeCol"] $ limitWindows 7 - $ mySpacing 2 + $ mySpacing 1 $ ThreeCol 1 (3/100) (1/2) threeRow = renamed [Replace "threeRow"] $ limitWindows 7 - $ mySpacing 2 + $ mySpacing 1 -- Mirror takes a layout and rotates it by 90 degrees. -- So we are applying Mirror to the ThreeCol layout. $ Mirror