aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/alacritty.toml2
-rw-r--r--.config/nvim/colors/xeno-yellow.lua8
-rw-r--r--.config/nvim/init.lua41
-rw-r--r--.config/nvim/nvim-pack-lock.json16
-rw-r--r--dmenu_config.h6
-rw-r--r--dwm_config.h163
-rw-r--r--screenshot.sh1
7 files changed, 135 insertions, 102 deletions
diff --git a/.config/alacritty.toml b/.config/alacritty.toml
index 50c70f0..d4598bd 100644
--- a/.config/alacritty.toml
+++ b/.config/alacritty.toml
@@ -16,7 +16,7 @@ draw_bold_text_with_bright_colors = true
[colors.primary]
foreground = "#FFFFFF"
-background = "#1A191C"
+background = "#161617"
[colors.normal]
black = "#333333"
diff --git a/.config/nvim/colors/xeno-yellow.lua b/.config/nvim/colors/xeno-yellow.lua
new file mode 100644
index 0000000..465ba94
--- /dev/null
+++ b/.config/nvim/colors/xeno-yellow.lua
@@ -0,0 +1,8 @@
+require("xeno").setup({
+ base = "#11100f",
+ accent = "#FFCC33",
+ variation = 0.0,
+ contrast = 0.1,
+ transparent = false,
+})
+vim.g.colors_name = "xeno-yellow"
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4cf8c56..14d659b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -6,21 +6,23 @@ vim.o.cc = "80"
vim.o.updatetime = 1000
vim.o.splitright = true
vim.o.splitbelow = true
-vim.o.winborder = "bold"
-vim.o.signcolumn = "no"
+vim.o.signcolumn = "no" -- diagnostics are already inline
vim.o.ignorecase = true
vim.o.tabstop = 2
vim.o.shiftwidth = 0
vim.o.expandtab = true
-vim.o.completeopt = "menu,menuone,noselect"
vim.o.undofile = true
-vim.opt.path:append("**")
+vim.o.scrolloff = 3
+vim.o.winborder = "bold"
+vim.o.mouse = ""
+vim.o.completeopt = "menu,menuone,noselect"
+
vim.g.mapleader = " "
-vim.g.qs_highlight_on_keys = {"f", "F", "t", "T"}
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
- "https://github.com/WTFox/jellybeans.nvim",
+ "https://github.com/nvim-mini/mini.pick",
+ "https://github.com/wesleimp/min-theme.nvim",
})
for _, plugin in ipairs(vim.pack.get()) do
@@ -29,6 +31,10 @@ for _, plugin in ipairs(vim.pack.get()) do
end
end
+require("mini.pick").setup()
+
+vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>")
+
-- Switch between semantically related files easily :)
local exts = {{"c", "h"}, {"cc", "hh"}, {"frag", "vert"}}
vim.keymap.set("n", "<leader>s", function()
@@ -45,13 +51,18 @@ vim.keymap.set("n", "<leader>s", function()
print("no files to swap to")
end)
--- I accidentally hit this when I'm incrementing and decrementing numbers
--- vim.keymap.set("n", "<C-z>", "<Nop>")
-vim.keymap.set("n", "<C-p>", ":find ")
-vim.keymap.set("n", "<C-f>", ":grep ")
+-- toggle inlay hints
+vim.keymap.set("n", "<leader>h", function()
+ vim.lsp.inlay_hint.enable(
+ not vim.lsp.inlay_hint.is_enabled({bufnr=0}),
+ {bufnr=0})
+end)
-vim.lsp.enable({"lua_ls", "clangd"})
-vim.diagnostic.config({virtual_text=true, severity_sort=true})
+vim.lsp.enable({"lua_ls", "clangd", "zls"})
+vim.diagnostic.config({
+ virtual_text = true,
+ severity_sort = true,
+})
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(ev)
local opts = {silent=true, buffer=ev.buf}
@@ -69,6 +80,8 @@ vim.api.nvim_create_autocmd("LspAttach", {
end,
})
-vim.cmd.colorscheme("jellybeans")
-vim.api.nvim_set_hl(0, "ColorColumn", {bg="#222222"})
+vim.cmd.colorscheme("min-dark")
vim.api.nvim_set_hl(0, "NormalFloat", {link="Normal"})
+vim.api.nvim_set_hl(0, "LineNr", {link="Pmenu"})
+
+require('vim._extui').enable({})
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..10d937d
--- /dev/null
+++ b/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,16 @@
+{
+ "plugins": {
+ "min-theme.nvim": {
+ "rev": "90f6cfe",
+ "src": "https://github.com/wesleimp/min-theme.nvim"
+ },
+ "mini.pick": {
+ "rev": "96ee37d",
+ "src": "https://github.com/nvim-mini/mini.pick"
+ },
+ "nvim-lspconfig": {
+ "rev": "e688b48",
+ "src": "https://github.com/neovim/nvim-lspconfig"
+ }
+ }
+} \ No newline at end of file
diff --git a/dmenu_config.h b/dmenu_config.h
index a03a578..c407a79 100644
--- a/dmenu_config.h
+++ b/dmenu_config.h
@@ -4,13 +4,13 @@
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
/* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = {
- "Fixed:style=Regular:pixelsize=14:antialias=false"
+ "CommitMono:style=Regular:pixelsize=14"
};
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
static const char *colors[SchemeLast][2] = {
/* fg bg */
- [SchemeNorm] = { "#CACACA", "#222222" },
- [SchemeSel] = { "#000000", "#E0E0E0" },
+ [SchemeNorm] = { "#ffffff", "#202020" },
+ [SchemeSel] = { "#ffffff", "#969696" },
[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 c07b1b5..bf3580d 100644
--- a/dwm_config.h
+++ b/dwm_config.h
@@ -7,23 +7,24 @@ static const unsigned int borderpx = 2; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = { "Fixed:style=Regular:pixelsize=14:antialias=false" };
+// static const char *fonts[] = {"Fixed:style=Regular:pixelsize=14:antialias=false"};
+// static const char dmenufont[] = "Fixed:style=Regular:pixelsize=14:antialias=false";
+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[] = "#E0E0E0";
-static const char col_fg_active[] = "#000000";
-static const char col_bg_inactive[] = "#222222";
-static const char col_fg_inactive[] = "#CACACA";
+static const char col_bg_active[] = "#969696";
+static const char col_fg_active[] = "#ffffff";
+static const char col_bg_inactive[] = "#202020";
+static const char col_fg_inactive[] = "#ffffff";
static const char *colors[][3] = {
/* fg bg border */
- [SchemeNorm] = { col_fg_inactive, col_bg_inactive, col_bg_inactive },
- [SchemeSel] = { col_fg_active, col_bg_active, col_bg_active },
+ [SchemeNorm] = {col_fg_inactive, col_bg_inactive, col_bg_inactive},
+ [SchemeSel] = {col_fg_active, col_bg_active, col_bg_active},
};
/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "Web", "Chat" };
-
+static const char *tags[] = {"WWW", "DEV", "GAME", "3", "2", "4", "1", "5", "6"};
#define T(x) (1 << x)
static const Rule rules[] = {
@@ -32,10 +33,7 @@ static const Rule rules[] = {
* WM_NAME(STRING) = title
*/
/* class instance title tags mask iscentered isfloating monitor */
- { "librewolf", NULL, NULL, T(7), 0, 0, -1 },
- { "thunderbird", NULL, NULL, T(7), 0, 0, -1 },
- { "discord", NULL, NULL, T(8), 0, 0, -1 },
- { NULL, NULL, "DEMONCHIME", 0, 1, 1, -1 },
+ {"librewolf", NULL, NULL, T(0), 0, 0, -1},
};
/* layout(s) */
@@ -46,95 +44,92 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win
static const Layout layouts[] = {
/* symbol arrange function */
- { "[]=", tile }, /* first entry is default */
- { "><>", NULL }, /* no layout function means floating behavior */
- { "[M]", monocle },
+ {"[]=", tile}, /* first entry is default */
+ {"><>", NULL}, /* no layout function means floating behavior */
+ {"[M]", monocle},
};
/* key definitions */
#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
+ {MODKEY, KEY, view, {.ui = 1 << TAG}}, \
+ {MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
+ {MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
+ {MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+#define SHCMD(cmd) {.v = (const char*[]){"/bin/sh", "-c", cmd, NULL}}
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", NULL };
-static const char *termcmd[] = { "alacritty", NULL };
-static const char *flameshotcmd[] = { "flameshot", "gui", NULL };
-static const char *pausecmd[] = { "playerctl", "play-pause", NULL };
-static const char *nextcmd[] = { "playerctl", "next", NULL };
-static const char *prevcmd[] = { "playerctl", "previous", NULL };
-static const char *volupcmd[] = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL };
-static const char *vollowcmd[] = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL };
-static const char *volmutecmd[] = { "pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL };
+static const char *dmenucmd[] = {"dmenu_run", NULL};
+static const char *termcmd[] = {"urxvt", NULL};
+static const char *sscmd[] = {"screenshot", NULL};
+static const char *pausecmd[] = {"playerctl", "play-pause", NULL};
+static const char *nextcmd[] = {"playerctl", "next", NULL};
+static const char *prevcmd[] = {"playerctl", "previous", NULL};
+static const char *volupcmd[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL};
+static const char *vollowcmd[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL};
+static const char *volmutecmd[] = {"pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL};
static const Key keys[] = {
/* modifier key function argument */
- { MODKEY, XK_d, spawn, {.v = dmenucmd } },
- { MODKEY, XK_Return, spawn, {.v = termcmd } },
- { MODKEY|ShiftMask, XK_s, spawn, {.v = flameshotcmd } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_u, incnmaster, {.i = -1 } },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
- { 0, XF86XK_AudioPrev, spawn, {.v = prevcmd}},
- { 0, XF86XK_AudioNext, spawn, {.v = nextcmd}},
- { 0, XF86XK_AudioPlay, spawn, {.v = pausecmd}},
- { 0, XF86XK_AudioLowerVolume, spawn, {.v = vollowcmd}},
- { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd}},
- { 0, XF86XK_AudioMute, spawn, {.v = volmutecmd}},
- { MODKEY, XK_s, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
- { MODKEY|ShiftMask, XK_q, killclient, {0} },
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- { MODKEY, XK_comma, focusmon, {.i = -1 } },
- { MODKEY, XK_period, focusmon, {.i = +1 } },
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
- TAGKEYS( XK_6, 5)
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_c, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_z, 7)
- TAGKEYS( XK_9, 8)
- TAGKEYS( XK_x, 8)
- { MODKEY|ShiftMask, XK_e, quit, {0} },
+ {MODKEY, XK_d, spawn, {.v = dmenucmd}},
+ {MODKEY, XK_Return, spawn, {.v = termcmd}},
+ {MODKEY|ShiftMask, XK_s, spawn, {.v = sscmd}},
+ {MODKEY, XK_j, focusstack, {.i = +1}},
+ {MODKEY, XK_k, focusstack, {.i = -1}},
+ {MODKEY, XK_i, incnmaster, {.i = +1}},
+ {MODKEY, XK_u, incnmaster, {.i = -1}},
+ {MODKEY, XK_h, setmfact, {.f = -0.025}},
+ {MODKEY, XK_l, setmfact, {.f = +0.025}},
+ {0, XF86XK_AudioPrev, spawn, {.v = prevcmd}},
+ {0, XF86XK_AudioNext, spawn, {.v = nextcmd}},
+ {0, XF86XK_AudioPlay, spawn, {.v = pausecmd}},
+ {0, XF86XK_AudioLowerVolume, spawn, {.v = vollowcmd}},
+ {0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd}},
+ {0, XF86XK_AudioMute, spawn, {.v = volmutecmd}},
+ {MODKEY, XK_s, zoom, {0}},
+ {MODKEY, XK_Tab, view, {0}},
+ {MODKEY|ShiftMask, XK_q, killclient, {0}},
+ {MODKEY, XK_g, setlayout, {.v = &layouts[0]}},
+ {MODKEY, XK_y, setlayout, {.v = &layouts[1]}},
+ {MODKEY, XK_f, setlayout, {.v = &layouts[2]}},
+ {MODKEY, XK_space, setlayout, {0}},
+ {MODKEY, XK_q, togglebar, {0}},
+ {MODKEY|ShiftMask, XK_space, togglefloating, {0}},
+ {MODKEY, XK_0, view, {.ui = ~0}},
+ {MODKEY|ShiftMask, XK_0, tag, {.ui = ~0}},
+ {MODKEY, XK_comma, focusmon, {.i = -1}},
+ {MODKEY, XK_period, focusmon, {.i = +1}},
+ {MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1}},
+ {MODKEY|ShiftMask, XK_period, tagmon, {.i = +1}},
+ 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)
+ {MODKEY|ShiftMask, XK_e, quit, {0}},
};
/* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = {
/* click event mask button function argument */
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
- // { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
- // { ClkWinTitle, 0, Button2, zoom, {0} },
- // { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
- { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
- { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
- // { ClkTagBar, 0, Button1, view, {0} },
- // { ClkTagBar, 0, Button3, toggleview, {0} },
- // { ClkTagBar, MODKEY, Button1, tag, {0} },
- // { ClkTagBar, MODKEY, Button3, toggletag, {0} },
+ {ClkLtSymbol, 0, Button1, setlayout, {0}},
+ // {ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]}},
+ // {ClkWinTitle, 0, Button2, zoom, {0}},
+ // {ClkStatusText, 0, Button2, spawn, {.v = termcmd}},
+ {ClkClientWin, MODKEY, Button1, movemouse, {0}},
+ {ClkClientWin, MODKEY, Button2, togglefloating, {0}},
+ {ClkClientWin, MODKEY, Button3, resizemouse, {0}},
+ // {ClkTagBar, 0, Button1, view, {0}},
+ // {ClkTagBar, 0, Button3, toggleview, {0}},
+ // {ClkTagBar, MODKEY, Button1, tag, {0}},
+ // {ClkTagBar, MODKEY, Button3, toggletag, {0}},
};
diff --git a/screenshot.sh b/screenshot.sh
new file mode 100644
index 0000000..7bb785e
--- /dev/null
+++ b/screenshot.sh
@@ -0,0 +1 @@
+maim -s | xclip -selection clipboard -t image/png
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-06 04:57:12 +0000