aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/nvim/colors/mine.lua10
-rw-r--r--.config/nvim/colors/mini-theme.lua (renamed from .config/nvim/colors/minimal.lua)12
-rw-r--r--.config/nvim/init.lua19
-rw-r--r--.config/nvim/nvim-pack-lock.json4
-rw-r--r--dmenu_config.h4
-rw-r--r--dwm_config.h13
-rwxr-xr-xdwm_status.sh2
7 files changed, 38 insertions, 26 deletions
diff --git a/.config/nvim/colors/mine.lua b/.config/nvim/colors/mine.lua
index ccdf48d..06fd8f1 100644
--- a/.config/nvim/colors/mine.lua
+++ b/.config/nvim/colors/mine.lua
@@ -44,7 +44,7 @@ local colors = {
["Identifier"] = {fg="#FFFFFF"},
["Function"] = {fg="#5599EE"},
- ["Statement"] = {fg="#FF4499", bold=true},
+ ["Statement"] = {fg="#FF4499"},
["Label"] = {fg="#FF9944"},
["Operator"] = {fg="#AAAABB"},
@@ -70,12 +70,12 @@ local colors = {
["@function.builtin"] = {link="Function"},
["@attribute.builtin"] = {link="@attribute"},
- ["@keyword.repeat"] = {fg="#DD66FF", bold=true},
- ["@keyword.conditional"] = {fg="#FF99CC", bold=true},
+ ["@keyword.repeat"] = {fg="#DD66FF"},
+ ["@keyword.conditional"] = {fg="#FF66DD"},
["@variable"] = {fg="#CCCCCC"},
["@variable.parameter.builtin"] = {link="@variable.builtin"},
- ["@variable.parameter"] = {fg="#EDEDED", italic=true},
+ ["@variable.parameter"] = {fg="#CCCCCC", italic=true},
["@variable.builtin"] = {fg="#DD66FF", italic=true},
["@variable.member"] = {fg="#9999FF"},
@@ -83,7 +83,7 @@ local colors = {
["@lsp.type.parameter"] = {link="@variable.parameter"},
["@lsp.type.enumMember"] = {link="Constant"},
["@lsp.typemod.variable.static"] = {link="@lsp.typemod.variable.global"},
- ["@lsp.typemod.variable.global"] = {fg="#FFDD66", italic=true},
+ ["@lsp.typemod.variable.global"] = {fg="#FFDD66"},
}
for k, v in pairs(colors) do
diff --git a/.config/nvim/colors/minimal.lua b/.config/nvim/colors/mini-theme.lua
index 84b7284..16b7831 100644
--- a/.config/nvim/colors/minimal.lua
+++ b/.config/nvim/colors/mini-theme.lua
@@ -37,12 +37,12 @@ local colors = {
["Comment"] = {fg="#88DEDE", italic=true},
- ["Constant"] = {fg="#DDDD66", bg="#272620"},
+ ["Constant"] = {fg="#DDDD66"--[[, bg="#272620"]]},
["Number"] = {link="Constant"},
["String"] = {link="Constant"},
["Boolean"] = {link="Constant"},
- ["Function"] = {fg="#9999EE", bg="#23222b"},
+ ["Function"] = {fg="#9999EE"--[[, bg="#23222b"]]},
["Identifier"] = {link="Normal"},
["Statement"] = {bold=true},
["Label"] = {link="Normal"},
@@ -58,11 +58,17 @@ local colors = {
["@constant.builtin"] = {link="@constant"},
+ ["@constructor"] = {link="Normal"},
+
+ ["@lsp.typemod.function.declaration"] = {link="Function"},
+ ["@lsp.type.function"] = {link="@function.call"},
+ ["@lsp.type.function.lua"] = {link="Function"},
["@function.builtin"] = {link="@function.call"},
["@function.method.call"] = {link="@function.call"},
- ["@function.call"] = {link="Normal"},
+ ["@function.call"] = {italic=true},
["@variable"] = {link="Normal"},
+ -- ["@variable"] = {fg="#ff0000"},
["@variable.builtin"] = {link="@variable"},
["@module"] = {link="Normal"},
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index dbb21b7..1c289df 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -13,7 +13,7 @@ vim.o.shiftwidth = 0
vim.o.expandtab = true
vim.o.undofile = true
vim.o.scrolloff = 3
-vim.o.winborder = "bold"
+vim.o.winborder = "none"
vim.o.mouse = ""
vim.o.completeopt = "menu,menuone,noselect"
@@ -22,6 +22,7 @@ vim.g.mapleader = " "
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
"https://github.com/nvim-mini/mini.pick",
+ "https://github.com/projekt0n/github-nvim-theme",
})
for _, plugin in ipairs(vim.pack.get()) do
@@ -30,7 +31,13 @@ for _, plugin in ipairs(vim.pack.get()) do
end
end
-require("mini.pick").setup()
+require("mini.pick").setup({
+ window = {
+ config = {
+ border = "none"
+ },
+ },
+})
vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>")
@@ -72,7 +79,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
for i = 32, 126 do
table.insert(chars, string.char(i))
end
- client.server_capabilities.semanticTokensProvider = nil
+ -- client.server_capabilities.semanticTokensProvider = nil
client.server_capabilities.completionProvider.triggerCharacters = chars
if client:supports_method("textDocument/completion") then
vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger=true})
@@ -80,8 +87,8 @@ vim.api.nvim_create_autocmd("LspAttach", {
end,
})
-vim.cmd.colorscheme("minimal")
-vim.api.nvim_set_hl(0, "NormalFloat", {link="Normal"})
-vim.api.nvim_set_hl(0, "LineNr", {link="Pmenu"})
+vim.g.adwaita_darker = true
+
+vim.cmd.colorscheme("github_dark_default")
require('vim._extui').enable({})
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 2dd82f5..905ad4c 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -1,5 +1,9 @@
{
"plugins": {
+ "github-nvim-theme": {
+ "rev": "c106c94",
+ "src": "https://github.com/projekt0n/github-nvim-theme"
+ },
"mini.pick": {
"rev": "96ee37d",
"src": "https://github.com/nvim-mini/mini.pick"
diff --git a/dmenu_config.h b/dmenu_config.h
index c407a79..69f2e40 100644
--- a/dmenu_config.h
+++ b/dmenu_config.h
@@ -9,8 +9,8 @@ static const char *fonts[] = {
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
static const char *colors[SchemeLast][2] = {
/* fg bg */
- [SchemeNorm] = { "#ffffff", "#202020" },
- [SchemeSel] = { "#ffffff", "#969696" },
+ [SchemeNorm] = { "#ffffff", "#000000" },
+ [SchemeSel] = { "#ffffff", "#202020" },
[SchemeOut] = { "#000000", "#00ffff" },
};
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
diff --git a/dwm_config.h b/dwm_config.h
index bf3580d..ccd5570 100644
--- a/dwm_config.h
+++ b/dwm_config.h
@@ -12,9 +12,9 @@ static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = {"CommitMono:style=Regular:pixelsize=14"};
static const char dmenufont[] = "Fixed:style=Regular:pixelsize=14:antialias=false";
-static const char col_bg_active[] = "#969696";
+static const char col_bg_active[] = "#202020";
static const char col_fg_active[] = "#ffffff";
-static const char col_bg_inactive[] = "#202020";
+static const char col_bg_inactive[] = "#000000";
static const char col_fg_inactive[] = "#ffffff";
static const char *colors[][3] = {
@@ -24,7 +24,7 @@ static const char *colors[][3] = {
};
/* tagging */
-static const char *tags[] = {"WWW", "DEV", "GAME", "3", "2", "4", "1", "5", "6"};
+static const char *tags[] = {"WWW", "DEV", "GAME", "MISC"};
#define T(x) (1 << x)
static const Rule rules[] = {
@@ -107,12 +107,7 @@ static const Key keys[] = {
TAGKEYS( XK_c, 0)
TAGKEYS( XK_v, 1)
TAGKEYS( XK_b, 2)
- TAGKEYS( XK_1, 3)
- TAGKEYS( XK_2, 4)
- TAGKEYS( XK_3, 5)
- TAGKEYS( XK_4, 6)
- TAGKEYS( XK_5, 7)
- TAGKEYS( XK_6, 8)
+ TAGKEYS( XK_x, 3)
{MODKEY|ShiftMask, XK_e, quit, {0}},
};
diff --git a/dwm_status.sh b/dwm_status.sh
index b72cffb..003a8fd 100755
--- a/dwm_status.sh
+++ b/dwm_status.sh
@@ -6,6 +6,6 @@ while true; do
clock=`date +"%a %b %d, %H.%M.%S"`
pkg=`xbps-query -l | wc -l`
vol=`pactl get-sink-volume @DEFAULT_SINK@ | awk 'NR==1{printf "VOL %s", $5}'`
- xprop -root -set WM_NAME " PKG $pkg | $vol | $ram | $cpu | $clock "
+ xprop -root -set WM_NAME " PKG $pkg $vol $ram $cpu $clock "
sleep 1
done &
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-06 05:07:22 +0000