diff options
author | Jack Sangdahl <[email protected]> | 2024-10-06 11:06:21 -0600 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-10-06 11:06:21 -0600 |
commit | 39e0e8c6efdf40d6dfddbe8767ca355c3bb245fd (patch) | |
tree | 549fb38508cbd688fac0bf52c648053f03077599 /.config | |
parent | f1dcda828b784c3ee36179c05dfa481509624f86 (diff) | |
download | dots-39e0e8c6efdf40d6dfddbe8767ca355c3bb245fd.tar.gz dots-39e0e8c6efdf40d6dfddbe8767ca355c3bb245fd.zip |
Nvim improvements, temp Waybar fix, other changes
Diffstat (limited to '.config')
-rw-r--r-- | .config/.gitignore | 2 | ||||
-rw-r--r-- | .config/mimeapps.list | 1 | ||||
-rw-r--r-- | .config/nvim/init.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/chadrc.lua | 12 | ||||
-rw-r--r-- | .config/nvim/lua/mappings.lua | 5 | ||||
-rw-r--r-- | .config/nvim/lua/plugins.lua | 14 | ||||
-rwxr-xr-x | .config/scripts/clock.sh | 2 | ||||
-rw-r--r-- | .config/waybar/config | 15 | ||||
-rw-r--r-- | .config/waybar/style.css | 4 |
9 files changed, 35 insertions, 22 deletions
diff --git a/.config/.gitignore b/.config/.gitignore index 2860ad68..14c3c8cf 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -4,8 +4,10 @@ dconf discord Electron glib-2.0 +go kicad nvim/lazy-lock.json +obsidian pulse rclone spicetify diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 53f0de46..5434de2a 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -4,3 +4,4 @@ x-scheme-handler/http=firefox-bin.desktop x-scheme-handler/https=firefox-bin.desktop x-scheme-handler/about=firefox-bin.desktop x-scheme-handler/unknown=firefox-bin.desktop +x-scheme-handler/obsidian=obsidian.desktop diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7b9f5b1c..6a78ddf6 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -35,5 +35,5 @@ dofile(vim.g.base46_cache .. "statusline") require("nvchad.autocmds") vim.schedule(function() - require("nvchad.mappings") + require("mappings") end) diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua index 47c113b0..01e52de3 100644 --- a/.config/nvim/lua/chadrc.lua +++ b/.config/nvim/lua/chadrc.lua @@ -3,10 +3,20 @@ local M = {} M.ui = { theme = "solarized_dark", - theme_toggle = { "onenord", "onenord_light" }, statusline = { theme = "vscode_colored" }, tabufline = { lazyload = true }, nvdash = { load_on_startup = true }, } +M.mason.pkgs = { + "lua-language-server", + "stylua", + "html-lsp", + "css-lsp", + "prettier", + "texlab", + "ruff", + "python-lsp-server", +} + return M diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua new file mode 100644 index 00000000..73fba0de --- /dev/null +++ b/.config/nvim/lua/mappings.lua @@ -0,0 +1,5 @@ +require("nvchad.mappings") + +local map = vim.keymap.set + +map("n", ";", ":", { desc = "CMD enter command mode" }) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index a1b8d0be..ac64bcac 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -14,20 +14,6 @@ return { end, }, { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "lua-language-server", - "stylua", - "html-lsp", - "css-lsp", - "prettier", - "bash-language-server", - "texlab", - }, - }, - }, - { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = { diff --git a/.config/scripts/clock.sh b/.config/scripts/clock.sh new file mode 100755 index 00000000..5b0f6149 --- /dev/null +++ b/.config/scripts/clock.sh @@ -0,0 +1,2 @@ +#!/bin/sh +date "+%H:%M" diff --git a/.config/waybar/config b/.config/waybar/config index 2cc42b87..6e0b98ee 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -18,6 +18,11 @@ "cpu": { "format": "\uf2db {usage}%" }, + "custom/time": { + "exec": "~/.config/scripts/clock.sh", + "format": "\uf017 {}", + "interval": 60 + }, "custom/date": { "exec": "~/.config/scripts/date.sh", "format": "\uf133 {}", @@ -29,8 +34,8 @@ "format": "{icon} {}", "max-length": 40, "on-click": "playerctl play-pause", - "on-scroll-down": "playerctl previous", - "on-scroll-up": "playerctl next", + "on-scroll-down": "playerctl next", + "on-scroll-up": "playerctl previous", "return-type": "json" }, "custom/power": { @@ -59,11 +64,13 @@ }, "modules-center": ["sway/workspaces"], "modules-left": ["custom/power", "memory", "cpu", "temperature", "network"], - "modules-right": ["custom/media", "wireplumber", "custom/date", "clock"], + "modules-right": ["custom/media", "wireplumber", "custom/date", "custom/time"], "network": { "format-disconnected": "\udb85\udebc disconnected", "format-wifi": "\uf1eb {ipaddr}/{cidr}", - "tooltip-format-wifi": "\uf1eb {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\n\uf093 {bandwidthUpBits} \uf019 {bandwidthDownBits}" + "tooltip-format-wifi": "\uf1eb {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\n\uf093 {bandwidthUpBits} \uf019 {bandwidthDownBits}", + "format-ethernet": "\uf1eb {ipaddr}/{cidr}", + "tooltip-format-ethernet": "\uf1eb {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\n\uf093 {bandwidthUpBits} \uf019 {bandwidthDownBits}" }, "output": "DP-3", "position": "bottom", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 4f0784d4..835ca8ab 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -20,7 +20,7 @@ window#waybar { #network, #wireplumber, #custom-date, -#clock { +#custom-time { background: @base02; padding: 0px 5px 0px 5px; } @@ -92,7 +92,7 @@ tooltip * { color: @violet; } -#clock { +#custom-time { color: @magenta; border-radius: 0px 8px 8px 0px; margin-right: 10px; |