lupan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lupan:832b464cc670fb05c1425cc243417a868dd5aeb6
Branches Tags
lupan:master
lupan:wip
..
compare: lupan:fef317a18a3011aab5823e3f98fce7539adbfe56
Branches Tags
lupan:wip
lupan:master

No commits in common. "832b464cc670fb05c1425cc243417a868dd5aeb6" and "fef317a18a3011aab5823e3f98fce7539adbfe56" have entirely different histories.
832b464cc6 ... fef317a18a

5 changed files with 33 additions and 35 deletions
Show Stats Expand all files Collapse all files

9
nvim/.config/nvim/init.lua
View File

@ -242,7 +242,6 @@ vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = tr
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
vim.keymap.set("n", "<leader>tt", ":NvimTreeToggle<cr>", { desc = "[T]oggle Nvim [T]ree" })
vim.keymap.set("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [T]oggle" })
vim.keymap.set("n", "<A-h>", ":wincmd h<cr>", { desc = "move to left window" })
vim.keymap.set("n", "<A-j>", ":wincmd j<cr>", { desc = "move to below window" })
vim.keymap.set("n", "<A-k>", ":wincmd k<cr>", { desc = "move to above window" })
@ -410,11 +409,11 @@ end
-- Add any additional override configuration in the following tables. They will be passed to
-- the `settings` field of the server config. You must look up that documentation yourself.
local servers = {
clangd = {},
gopls = {},
-- clangd = {},
-- gopls = {},
-- pyright = {},
rust_analyzer = {},
tsserver = {},
-- rust_analyzer = {},
-- tsserver = {},
lua_ls = {
Lua = {

52
patches/dwm/config.h
View File

@ -5,18 +5,18 @@ 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[] = { "Inconsolata Nerd Font:size=12" };
static const char dmenufont[] = "Inconsolata Nerd Font:size=12";
static const char *fonts[] = { "Iosevka NFM Light:size=11" };
static const char dmenufont[] = "Iosevka NFM Light:size=11";
static const char col_gray1[] = "#222222";
static const char col_gray2[] = "#444444";
static const char col_gray3[] = "#bbbbbb";
static const char col_gray4[] = "#eeeeee";
static const char col_blue[] = "#414868";
static const char col_cyan[] = "#7dcfff";
static const char col_cyan[] = "#1a5a72"; // "#6c7aaa"; // "#007762"; // "#195971";
static const char col_orange[] = "#a0522d";
static const char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
[SchemeSel] = { col_gray4, col_blue, col_cyan },
[SchemeSel] = { col_gray4, col_cyan, col_orange },
};
/* tagging */
@ -46,7 +46,7 @@ static const Layout layouts[] = {
};
/* key definitions */
#define MODKEY Mod1Mask
#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
@ -65,30 +65,30 @@ static const char *suspendcmd[] = { "systemctl", "suspend", NULL };
static const Key keys[] = {
/* modifier key function argument */
{ MODKEY|ControlMask, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY|ControlMask|ShiftMask, XK_l, spawn, {.v = lockcmd } },
{ MODKEY|ControlMask|ShiftMask, XK_s, spawn, {.v = suspendcmd } },
{ MODKEY|ControlMask, XK_b, togglebar, {0} },
{ MODKEY|ControlMask, XK_j, focusstack, {.i = +1 } },
{ MODKEY|ControlMask, XK_k, focusstack, {.i = -1 } },
{ MODKEY|ControlMask, XK_i, incnmaster, {.i = +1 } },
{ MODKEY|ControlMask, XK_d, incnmaster, {.i = -1 } },
{ MODKEY|ControlMask, XK_h, setmfact, {.f = -0.05} },
{ MODKEY|ControlMask, XK_l, setmfact, {.f = +0.05} },
{ MODKEY|ControlMask, XK_Return, zoom, {0} },
{ MODKEY|ControlMask, XK_Tab, view, {0} },
{ MODKEY|ControlMask, XK_a, view, {0} },
{ MODKEY|ControlMask, XK_l, spawn, {.v = lockcmd } },
{ MODKEY|ControlMask, XK_s, spawn, {.v = suspendcmd } },
{ 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_d, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_Return, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_a, view, {0} },
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
{ MODKEY|ControlMask, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY|ControlMask, XK_f, setlayout, {.v = &layouts[1]} },
{ MODKEY|ControlMask, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY|ControlMask, XK_space, setlayout, {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|ControlMask, XK_0, view, {.ui = ~0 } },
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY|ControlMask, XK_comma, focusmon, {.i = -1 } },
{ MODKEY|ControlMask, XK_period, focusmon, {.i = +1 } },
{ 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)

4
tmux/.tmux.conf
View File

@ -1,5 +1,5 @@
set -g status-bg colour0
set -g status-fg colour7
set -g status-bg colour246
set -g status-fg colour235
set -g prefix C-t
bind-key C-t send-prefix

1
xsession/.xmodmaprc
View File

@ -1,6 +1,5 @@
! make right windows key and menu key a hyper key
remove mod4 = Super_R
keycode 133 = Escape NoSymbol Escape
keycode 134 = Hyper_R NoSymbol Hyper_R
keycode 135 = Hyper_R NoSymbol Hyper_R
add mod3 = Hyper_R

2
xsession/.xsession
View File

@ -8,7 +8,7 @@ xset b off
xrandr --auto
xrandr --output HDMI1 --right-of DP1
xrdb -merge ~/.Xresources
setxkbmap pl -option ctrl:nocaps
setxkbmap pl -option caps:escape
xmodmap ~/.xmodmaprc
if [ -x ~/.fehbg ]; then