thomasabishop/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nvim: standardise icons

Browse source
This commit is contained in:
thomasabishop 2024-02-23 14:24:43 +00:00
parent d2b38fd15d
commit 8ce8fcaaeb
9 changed files with 215 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nvim/init.lua
View file

@ -30,3 +30,4 @@ require("thomas.plugins.gitblame")
require("thomas.plugins.zk") require("thomas.plugins.zk")
require("thomas.plugins.noice") require("thomas.plugins.noice")
require("thomas.plugins.obsidian-nvim") require("thomas.plugins.obsidian-nvim")
require("thomas.plugins.nvim-notify")

4
nvim/lua/thomas/core/colourscheme.lua
View file

@ -11,8 +11,8 @@ local function update_hl(group, tbl)
vim.api.nvim_set_hl(0, group, new_hl) vim.api.nvim_set_hl(0, group, new_hl)
end end
-- update_hl("Function", { bold = true }) update_hl("Function", { bold = true })
-- update_hl("Comment", { italic = true }) update_hl("Comment", { italic = true })
update_hl("markdownH1", { bold = true }) update_hl("markdownH1", { bold = true })
update_hl("markdownH2", { bold = true }) update_hl("markdownH2", { bold = true })

8
nvim/lua/thomas/plugins-setup.lua
View file

@ -37,12 +37,16 @@ return packer.startup(function(use)
-- require("pandoc").setup() -- require("pandoc").setup()
-- end, -- end,
-- }) -- })
use({ "folke/noice.nvim", requires = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" } }) use({
"folke/noice.nvim",
requires = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" },
})
use({ "epwalsh/obsidian.nvim", requires = { "nvim-lua/plenary.nvim" } }) use({ "epwalsh/obsidian.nvim", requires = { "nvim-lua/plenary.nvim" } })
use("ellisonleao/gruvbox.nvim") -- use("ellisonleao/gruvbox.nvim")
use("sainnhe/gruvbox-material") use("sainnhe/gruvbox-material")
use("kdheepak/lazygit.nvim") use("kdheepak/lazygit.nvim")
use("zk-org/zk-nvim") use("zk-org/zk-nvim")
use("ryanoasis/vim-devicons")
use("tpope/vim-fugitive") use("tpope/vim-fugitive")
use("rcarriga/nvim-notify") use("rcarriga/nvim-notify")
use("tpope/vim-markdown") use("tpope/vim-markdown")

10
nvim/lua/thomas/plugins/lsp/lspconfig.lua
View file

@ -37,11 +37,11 @@ end
local capabilities = cmp_nvim_lsp.default_capabilities() local capabilities = cmp_nvim_lsp.default_capabilities()
-- Change the Diagnostic symbols in the sign column (gutter) -- Change the Diagnostic symbols in the sign column (gutter)
-- local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " } local signs = { Error = "", Warn = "⚠", Hint = "", Info = "󰙎" }
-- for type, icon in pairs(signs) do for type, icon in pairs(signs) do
-- local hl = "DiagnosticSign" .. type local hl = "DiagnosticSign" .. type
-- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-- end end
-- Hide diagnostic virtual text by default, but toggle visibility with `lead:lh` command -- Hide diagnostic virtual text by default, but toggle visibility with `lead:lh` command
vim.diagnostic.config({ vim.diagnostic.config({

51
nvim/lua/thomas/plugins/noice.lua
View file

@ -11,12 +11,51 @@ noice.setup({
["vim.lsp.util.stylize_markdown"] = true, ["vim.lsp.util.stylize_markdown"] = true,
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
}, },
presets = { },
bottom_search = true, -- use a classic bottom cmdline for search presets = {
command_palette = true, -- position the cmdline and popupmenu together bottom_search = true, -- use a classic bottom cmdline for search
long_message_to_split = true, -- long messages will be sent to a split command_palette = true, -- position the cmdline and popupmenu together
inc_rename = false, -- enables an input dialog for inc-rename.nvim long_message_to_split = true, -- long messages will be sent to a split
lsp_doc_border = false, -- add a border to hover docs and signature help inc_rename = false, -- enables an input dialog for inc-rename.nvim
lsp_doc_border = false, -- add a border to hover docs and signature help
},
cmdline = {
format = {
cmdline = { icon = "" },
search_down = { icon = " ⌄" },
search_up = { icon = " ⌃" },
filter = { icon = "" },
lua = { icon = "" },
help = { icon = "󰋖 " },
level = {
icons = {
error = "",
warn = "⚠ ",
info = "󰙎 ",
},
},
},
},
views = {
cmdline_popup = {
border = {
style = "single",
},
},
popup = {
border = {
style = "single",
},
},
hover = {
border = {
style = "single",
},
},
confirm = {
border = {
style = "single",
},
}, },
}, },
}) })

17
nvim/lua/thomas/plugins/nvim-notify.lua Normal file
View file

@ -0,0 +1,17 @@
local notify_setup, notify = pcall(require, "notify")
if not notify_setup then
return
end
notify.setup({
render = "wrapped-compact",
stages = "fade",
icons = {
INFO = "󰙎",
WARN = "⚠",
ERROR = "",
TRACE = "󰏫 ",
DEBUG = "",
},
})

6
nvim/lua/thomas/plugins/rainbow-delimiters.lua
View file

@ -15,6 +15,6 @@ rd.setup({
}) })
-- change colour values to match One Dark -- change colour values to match One Dark
vim.api.nvim_set_hl(0, "RainbowDelimiterViolet", { foreground = "#C678DD" }) vim.api.nvim_set_hl(0, "RainbowDelimiterViolet", { foreground = "#d3869b" })
vim.api.nvim_set_hl(0, "RainbowDelimiterYellow", { foreground = "#E5C07B" }) vim.api.nvim_set_hl(0, "RainbowDelimiterYellow", { foreground = "#fabd2f" })
vim.api.nvim_set_hl(0, "RainbowDelimiterCyan", { foreground = "#56B6C2" }) vim.api.nvim_set_hl(0, "RainbowDelimiterCyan", { foreground = "#fe8019" })

74
waybar/config
View file

@ -1,13 +1,19 @@
{ {
"layer": "top", "layer": "top",
"margin": "6 10 -3",
"height": 30, "height": 30,
"spacing": 4, "spacing": 4,
"modules-left": [ "modules-left": [
"custom/os", "custom/os",
"hyprland/workspaces" "hyprland/workspaces",
"wlr/taskbar"
],
"modules-center": [
"custom/spotify",
"custom/toggl",
"custom/wakatime"
], ],
"modules-right": [ "modules-right": [
"custom/spotify",
"network", "network",
"bluetooth", "bluetooth",
"cpu", "cpu",
@ -15,10 +21,27 @@
"disk", "disk",
"temperature", "temperature",
"backlight", "backlight",
"custom/wakatime",
"battery", "battery",
"clock" "clock"
], ],
"wlr/taskbar": {
"format": "{icon} {name}",
"icon-size": 20,
"icon-theme": "Numix-Circle",
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"Alacritty"
],
"app_ids-mapping": {
"firefoxdeveloperedition": "firefox-developer-edition"
},
"rewrite": {
"Firefox Web Browser": "Firefox",
"Foot Server": "Terminal"
}
},
"keyboard-state": { "keyboard-state": {
"numlock": true, "numlock": true,
"capslock": true, "capslock": true,
@ -65,31 +88,30 @@
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
"format": "{: %H:%M  %d/%m/%Y}", "format": "{: %H:%M }",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "format-alt": "{: %d/%m/%Y}"
"format-alt": "{:%Y-%m-%d}"
}, },
"cpu": { "cpu": {
"format": " {usage}%", "format": " {usage}%",
"tooltip": false "tooltip": false
}, },
"memory": { "memory": {
"format": " {}%" "format": " {}%"
}, },
"temperature": { "temperature": {
"critical-threshold": 80, "critical-threshold": 80,
"format": "{icon} {temperatureC}°C", "format": "{icon} {temperatureC}°C",
"format-icons": [ "format-icons": [
"", "󱩅",
"", "󱩅",
"" "󱩅",
] ]
}, },
"backlight": { "backlight": {
"device": "acpi_video1", "device": "acpi_video1",
"format": "{percent}% {icon}", "format": "{icon} {percent}%",
"format-icons": [ "format-icons": [
"", "",
"", "",
"", "",
"", "",
@ -121,11 +143,11 @@
"bat": "BAT2" "bat": "BAT2"
}, },
"network": { "network": {
"format-wifi": " {essid} ({signalStrength}%)", "format-wifi": "󰖩 {essid} ({signalStrength}%)",
"format-ethernet": "{ipaddr}/{cidr}", "format-ethernet": "{ipaddr}/{cidr}",
"tooltip-format": "{ifname} via {gwaddr}", "tooltip-format": "{ifname} via {gwaddr}",
"format-linked": "{ifname} (No IP)", "format-linked": "{ifname} (No IP)",
"format-disconnected": "⚠ Disconnected", "format-disconnected": "󰖪 Disconnected",
"format-alt": "{ifname}: {ipaddr}/{cidr}" "format-alt": "{ifname}: {ipaddr}/{cidr}"
}, },
"pulseaudio": { "pulseaudio": {
@ -151,13 +173,13 @@
}, },
"disk": { "disk": {
"interval": 30, "interval": 30,
"format": " {percentage_used}%", "format": " {percentage_used}%",
"path": "/home" "path": "/home"
}, },
"bluetooth": { "bluetooth": {
"controller": "bluetoothctl", "controller": "bluetoothctl",
"format": " {status}", "format": "{status}",
"format-connected": " {device_alias}", "format-connected": "{device_alias}",
"format-connected-battery": " {device_alias} {device_battery_percentage}% ", "format-connected-battery": " {device_alias} {device_battery_percentage}% ",
"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
@ -180,7 +202,7 @@
}, },
"custom/spotify": { "custom/spotify": {
"exec": "/usr/bin/python3 $HOME/.config/waybar/resources/custom_modules/mediaplayer.py --player spotify", "exec": "/usr/bin/python3 $HOME/.config/waybar/resources/custom_modules/mediaplayer.py --player spotify",
"format": "{} ", "format": "{} ",
"return-type": "json", "return-type": "json",
"on-click": "playerctl play-pause", "on-click": "playerctl play-pause",
"on-scroll-up": "playerctl next", "on-scroll-up": "playerctl next",
@ -188,7 +210,13 @@
}, },
"custom/wakatime": { "custom/wakatime": {
"exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime.py", "exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime.py",
"format": " {}", "format": " {}",
"return-type": "json",
"interval": 600
},
"custom/toggl": {
"exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/toggl_controller.py",
"format": "{}",
"return-type": "json", "return-type": "json",
"interval": 600 "interval": 600
} }

146
waybar/style.css
View file

@ -1,53 +1,61 @@
/* blue yellow green orange purple aqua ..
*/
* { * {
/* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, "PragmataPro Mono Liga", Roboto, Helvetica, Arial, font-family: FontAwesome, "PragmataPro Mono Liga", Roboto, Helvetica, Arial,
sans-serif; sans-serif;
font-size: 16px; font-size: 16px;
} }
window#waybar {
/* background-color: #282828; */
background-color: rgba(40, 40, 40, 0.8);
}
tooltip { tooltip {
font-weight: 400;
border-radius: 0; border-radius: 0;
} font-weight: 400;
window#waybar.termite {
background-color: #3f3f3f;
}
window#waybar.chromium {
background-color: #000000;
border: none;
} }
button { button {
/* Use box-shadow instead of border so the text isn't offset */
box-shadow: inset 0 -3px transparent; box-shadow: inset 0 -3px transparent;
/* Avoid rounded borders under each button name */
border: none; border: none;
border-radius: 0; border-radius: 0;
opacity: 1;
} }
#workspaces button.active { #workspaces button.active {
background-color: #e78a4a; background-color: #98971a;
color: #282828; color: #282828;
} }
#workspaces button { #workspaces button {
font-weight: 600; padding: 2px 3px;
padding: 0 3px;
color: #282828; color: #282828;
background-color: #a89984; background-color: #928374;
border-radius: 5px; margin-right: 5px;
margin-right: 3px; margin-top: 6px;
margin-bottom: 6px;
} }
#workspaces button.urgent { #workspaces button.urgent {
background-color: #ea6962; background-color: #ea6962;
} }
#taskbar button {
background-color: #3c3836;
padding: 3px 8px;
margin-top: 6px;
margin-bottom: 6px;
}
#taskbar button.active {
background-color: #98971a;
color: #282828;
/* padding: 3px 10px;
margin-top: 6px;
margin-bottom: 6px; */
}
#clock, #clock,
#battery, #battery,
#cpu, #cpu,
@ -68,54 +76,53 @@ button {
#user, #user,
#bluetooth, #bluetooth,
#custom-wakatime, #custom-wakatime,
#custom-os { #custom-toggl {
font-weight: 600; font-weight: 400;
padding: 3px 12px; padding: 3px 10px;
margin: 0; margin-left: 4px;
border-radius: 5px; margin-top: 6px;
margin-bottom: 6px;
} }
#window, #custom-os {
font-weight: 400;
padding: 3px 10px;
margin-top: 6px;
margin-bottom: 6px;
margin-left: 8px;
}
#windowu,
#workspaces { #workspaces {
margin: 0 3px 0; margin: 0 3px 0;
font-weight: 600; font-weight: 400;
}
/* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces {
/* margin-left: 0; */
}
/* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces {
/* margin-right: 4; */
} }
#clock { #clock {
background-color: #a9b665; background-color: #689d6a;
color: #282828; color: #282828;
margin-right: 6px; margin-right: 8px;
} }
#bluetooth { #bluetooth {
background-color: #d8a657; background-color: #d65d0e;
color: #282828; color: #f2e5bc;
} }
#battery { #battery {
background-color: #d8a657; background-color: #b16286;
color: #282828; color: #f2e5bc;
} }
#battery.charging, #battery.charging,
#battery.plugged { #battery.plugged {
color: #282c34; background-color: #b16286;
background-color: #d8a657; color: #f2e5bc;
} }
#battery.critical:not(.charging) { #battery.critical:not(.charging) {
background-color: #ea6962; background-color: #ea6962;
color: #ddc7a1; color: #f2e5bc;
animation-name: blink; animation-name: blink;
animation-duration: 0.5s; animation-duration: 0.5s;
animation-timing-function: linear; animation-timing-function: linear;
@ -124,28 +131,33 @@ button {
} }
#cpu { #cpu {
background-color: #a9b665; background-color: #d79921;
color: #282828; color: #282828;
/* color: #282828; */
} }
#memory { #memory {
background-color: #e78a4a; background-color: #d79921;
color: #282828; color: #282828;
} }
#disk { #disk {
background-color: #d79921;
color: #282828; color: #282828;
background-color: #d3869b;
} }
#backlight { #backlight {
background-color: #a89984; background-color: #b16286;
color: #282828; color: #f2e5bc;
} }
#network { #network {
background-color: #7daea3; background-color: #d65d0e;
color: #282828; color: #f2e5bc;
}
#network.format.icons {
background-color: red;
} }
#network.disconnected { #network.disconnected {
@ -158,13 +170,13 @@ button {
} }
#custom-spotify { #custom-spotify {
background-color: #89b482; background-color: #689d6a;
color: #282828; color: #282828;
} }
#temperature { #temperature {
background-color: #d79921;
color: #282828; color: #282828;
background-color: #89b482;
} }
#temperature.critical { #temperature.critical {
@ -182,13 +194,25 @@ button {
} }
#custom-os { #custom-os {
background-color: #473c29;
color: #d4be98;
font-size: 16px; font-size: 16px;
margin-left: 6px; background-color: #458588;
color: #f2e5bc;
} }
#custom-wakatime { #custom-wakatime {
background-color: #7daea3; background-color: #b16286;
color: #f2e5bc;
margin-right: 4px;
}
#custom-toggl {
color: #282828; color: #282828;
} }
#custom-toggl.active {
background-color: #98971a;
}
#custom-toggl.inactive {
background-color: #928374;
}