From db048db3c0d1303c61e863cbfe51c2436e26d604 Mon Sep 17 00:00:00 2001 From: mitchell Date: Wed, 3 Jul 2024 00:22:34 -0400 Subject: [PATCH] Reorganize and update nvim config, and refactor polybar config --- .config/bspwm/bspwmrc | 3 +- .config/nvim/config.vim | 4 -- .config/nvim/init.lua | 28 +++++++------- .config/polybar/config | 81 +++++++++++------------------------------ 4 files changed, 35 insertions(+), 81 deletions(-) diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 21acd44..654aef8 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -26,13 +26,12 @@ end ~/.fehbg & if test $DISPLAY = ":0" - killall -q polybar cbatticon pasystray barrier barrierc + killall -q polybar pasystray barrier barrierc barrier & keepassxc & end polybar m-bar & -cbatticon & pasystray & bspc monitor -d I II III IV V VI VII diff --git a/.config/nvim/config.vim b/.config/nvim/config.vim index 31410d2..3b9cf68 100644 --- a/.config/nvim/config.vim +++ b/.config/nvim/config.vim @@ -54,10 +54,6 @@ let g:ale_completion_enabled = 0 let g:pencil#map#suspend_af = 'K' -let g:lightline = { - \ 'colorscheme': 'wombat', - \ } - let g:ale_linters = { \ 'javascript': ['eslint', 'stylelint'], \ 'typescript': ['eslint', 'stylelint'], diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 76bdec9..77ea691 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,21 +4,15 @@ vim.call("plug#begin") -- Contains lots of sensible configurations, which I have in turn omitted from here plug("tpope/vim-sensible") +plug("w0rp/ale") plug("tpope/vim-eunuch") plug("tpope/vim-surround") plug("tpope/vim-endwise") -plug("itchyny/lightline.vim") plug("edkolev/tmuxline.vim") plug("airblade/vim-gitgutter") plug("reedes/vim-pencil", { ["on"] = { "HardPencil", "SoftPencil" } }) - -plug("w0rp/ale") plug("tpope/vim-fugitive", { ["on"] = { "G", "Git" }, ["for"] = "gitcommit" }) -plug("mileszs/ack.vim", { ["on"] = "Ack" }) -plug("nvim-treesitter/nvim-treesitter", { ["do"] = ":TSUpdate" }) -plug("nvim-treesitter/nvim-treesitter-context") -plug("BurntSushi/ripgrep") plug("MunifTanjim/nui.nvim") plug("rcarriga/nvim-notify") plug("nvim-lua/plenary.nvim") @@ -31,13 +25,14 @@ plug("folke/zen-mode.nvim") plug("folke/twilight.nvim") plug("neovim/nvim-lspconfig") plug("ellisonleao/gruvbox.nvim") +plug("nvim-lualine/lualine.nvim") plug("nvim-neo-tree/neo-tree.nvim") -plug("nvim-telescope/telescope.nvim") -plug("simrat39/symbols-outline.nvim") -plug("nvim-telescope/telescope-fzf-native.nvim", { - ["do"] = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build", -}) plug("pmizio/typescript-tools.nvim") +plug("simrat39/symbols-outline.nvim") +plug("nvim-telescope/telescope.nvim") +plug("nvim-telescope/telescope-fzf-native.nvim", { ["do"] = "make" }) +plug("nvim-treesitter/nvim-treesitter", { ["do"] = ":TSUpdate" }) +plug("nvim-treesitter/nvim-treesitter-context") vim.call("plug#end") @@ -49,7 +44,8 @@ require("gruvbox").setup({ transparent_mode = true, }) -require("twilight").setup() +require("lualine").setup() + require("zen-mode").setup({ window = { backdrop = 1, @@ -58,12 +54,15 @@ require("zen-mode").setup({ require("symbols-outline").setup({ autofold_depth = 2, }) -require("leap").add_default_mappings() +require("leap").create_default_mappings() require("notify").setup({ background_colour = "#000000", }) +require("telescope").setup() +require("telescope").load_extension("fzf") + require("noice").setup({ lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** @@ -86,7 +85,6 @@ require("noice").setup({ }, }) -require("treesitter-context").setup() require("nvim-treesitter.configs").setup({ -- A list of parser names, or "all" (the four listed parsers should always be installed) ensure_installed = { diff --git a/.config/polybar/config b/.config/polybar/config index c4a110a..6774d6a 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -52,14 +52,14 @@ module-margin-left = 0 module-margin-right = 2 font-0 = IBM Plex Sans:size=10;3 -font-1 = JetBrains Mono:size=11;3 +font-1 = JetBrainsMono Nerd Font:size=11;3 #font-2 = JetBrains Mono:pixelsize=10;1 #font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 #font-2 = siji:pixelsize=10;1 modules-left = bspwm modules-center = xwindow -modules-right = pulseaudio cpu memory filesystem eth date xkeyboard powermenu +modules-right = pulseaudio cpu memory temperature filesystem battery xkeyboard date powermenu tray-position = right tray-padding = 2 @@ -87,7 +87,7 @@ label = %title:0:30:...% type = internal/xkeyboard blacklist-0 = num lock -format-prefix = " " +format-prefix = "kb " format-prefix-foreground = ${colors.foreground-alt} format-prefix-underline = ${colors.secondary} @@ -133,19 +133,6 @@ label-empty-padding = 4 ; Separator in between workspaces ; label-separator = | -[module/mpd] -type = internal/mpd -format-online = - -icon-prev =  -icon-stop =  -icon-play =  -icon-pause =  -icon-next =  - -label-song-maxlen = 25 -label-song-ellipsis = true - [module/xbacklight] type = internal/xbacklight @@ -171,7 +158,7 @@ card = intel_backlight [module/cpu] type = internal/cpu interval = 2 -format-prefix = " " +format-prefix = "cpu " format-prefix-foreground = ${colors.foreground-alt} format-underline = ${colors.alert} label = %percentage:2%% @@ -179,7 +166,7 @@ label = %percentage:2%% [module/memory] type = internal/memory interval = 2 -format-prefix = " " +format-prefix = "mem " format-prefix-foreground = ${colors.foreground-alt} format-underline = ${colors.alert} label = %percentage_used%% @@ -190,7 +177,7 @@ interface = wlan0 interval = 3.0 format-connected = -format-connected-underline = #9f78e1 +format-connected-underline = ${colors.secondary} label-connected = %essid% format-disconnected = @@ -208,11 +195,11 @@ ramp-signal-foreground = ${colors.foreground-alt} [module/eth] type = internal/network -interface = enp125s0u1u4 +interface = enp5s0f4u2 interval = 3.0 format-connected-underline = ${colors.secondary} -format-connected-prefix = " " +format-connected-prefix = "eth " format-connected-prefix-foreground = ${colors.foreground-alt} label-connected = %local_ip% @@ -232,9 +219,9 @@ date-alt = " %Y-%m-%d" time = %H:%M time-alt = %H:%M:%S -format-prefix =  +format-prefix = "" format-prefix-foreground = ${colors.foreground-alt} -format-underline = #98971a +format-underline = ${colors.secondary} label = %date% %time% @@ -254,7 +241,7 @@ bar-volume-foreground-1 = ${colors.secondary} bar-volume-foreground-2 = ${colors.secondary} bar-volume-foreground-3 = ${colors.secondary} bar-volume-foreground-4 = ${colors.secondary} -bar-volume-foreground-5 = #f5a70a +bar-volume-foreground-5 = ${colors.orange} bar-volume-foreground-6 = ${colors.alert} bar-volume-gradient = false bar-volume-indicator = | @@ -265,49 +252,23 @@ bar-volume-empty = ─ bar-volume-empty-font = 2 bar-volume-empty-foreground = ${colors.foreground-alt} -[module/alsa] -type = internal/alsa - -format-volume = -label-volume = VOL -label-volume-foreground = ${root.foreground} - -format-muted-prefix = " " -format-muted-foreground = ${colors.foreground-alt} -label-muted = sound muted - -bar-volume-width = 10 -bar-volume-foreground-0 = #55aa55 -bar-volume-foreground-1 = #55aa55 -bar-volume-foreground-2 = #55aa55 -bar-volume-foreground-3 = #55aa55 -bar-volume-foreground-4 = #55aa55 -bar-volume-foreground-5 = #f5a70a -bar-volume-foreground-6 = #ff5555 -bar-volume-gradient = false -bar-volume-indicator = | -bar-volume-indicator-font = 2 -bar-volume-fill = ─ -bar-volume-fill-font = 2 -bar-volume-empty = ─ -bar-volume-empty-font = 2 -bar-volume-empty-foreground = ${colors.foreground-alt} - [module/battery] type = internal/battery battery = BAT0 adapter = ADP1 full-at = 98 -format-charging = -format-charging-underline = #ffb52a +format-charging-prefix = "bat " +format-charging-prefix-foreground = ${colors.foreground-alt} +format-charging-underline = ${colors.secondary} -format-discharging = -format-discharging-underline = ${self.format-charging-underline} +format-discharging-prefix = ${self.format-charging-prefix} +format-discharging-prefix-foreground = ${colors.foreground-alt} +format-discharging-underline = ${colors.orange} -format-full-prefix = " " +format-full-prefix = ${self.format-charging-prefix} format-full-prefix-foreground = ${colors.foreground-alt} -format-full-underline = ${self.format-charging-underline} +format-full-underline = ${colors.secondary} ramp-capacity-0 =  ramp-capacity-1 =  @@ -332,13 +293,13 @@ thermal-zone = 0 warn-temperature = 60 format =