From 2f0d7ed2c6923f5c3efd3540495827aa0a879ead Mon Sep 17 00:00:00 2001 From: fqbn207 Date: Tue, 14 Jan 2025 23:13:46 +0100 Subject: [PATCH] kekl --- .../nix/wm/i3/alacritty.nix => alacritty.nix | 0 configuration.nix | 6 +- modules/nix/X/dwm/default.nix | 23 ++ modules/nix/X/dwm/source/dwm | 1 + modules/nix/X/dwm/source/st/config.def.h | 323 ++++++++++++++++++ modules/nix/default.nix | 4 +- modules/nix/{editors => }/nvim/cmp.nix | 0 modules/nix/{editors => }/nvim/default.nix | 0 modules/nix/{editors => }/nvim/dev.nix | 0 modules/nix/{editors => }/nvim/lsp.nix | 0 modules/nix/{editors => }/nvim/lualine.nix | 0 modules/nix/{editors => }/nvim/neotree.nix | 0 modules/nix/{editors => }/nvim/nonels.nix | 0 modules/nix/{editors => }/nvim/opts.nix | 0 modules/nix/{editors => }/nvim/treesitter.nix | 0 15 files changed, 349 insertions(+), 8 deletions(-) rename modules/nix/wm/i3/alacritty.nix => alacritty.nix (100%) create mode 100644 modules/nix/X/dwm/default.nix create mode 160000 modules/nix/X/dwm/source/dwm create mode 100644 modules/nix/X/dwm/source/st/config.def.h rename modules/nix/{editors => }/nvim/cmp.nix (100%) rename modules/nix/{editors => }/nvim/default.nix (100%) rename modules/nix/{editors => }/nvim/dev.nix (100%) rename modules/nix/{editors => }/nvim/lsp.nix (100%) rename modules/nix/{editors => }/nvim/lualine.nix (100%) rename modules/nix/{editors => }/nvim/neotree.nix (100%) rename modules/nix/{editors => }/nvim/nonels.nix (100%) rename modules/nix/{editors => }/nvim/opts.nix (100%) rename modules/nix/{editors => }/nvim/treesitter.nix (100%) diff --git a/modules/nix/wm/i3/alacritty.nix b/alacritty.nix similarity index 100% rename from modules/nix/wm/i3/alacritty.nix rename to alacritty.nix diff --git a/configuration.nix b/configuration.nix index 061e864..b580081 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,6 +13,7 @@ in ./hardware-configuration.nix ./modules/nix/firefox.nix ./modules/nix/gaming.nix + ./modules/nix/X/dwm/default.nix ]; nixpkgs.config.allowUnfree = true; @@ -72,11 +73,6 @@ in }; services = { - xserver = { - enable = true; - displayManager.startx.enable = true; - windowManager.i3.enable = true; - }; libinput = { enable = true; }; diff --git a/modules/nix/X/dwm/default.nix b/modules/nix/X/dwm/default.nix new file mode 100644 index 0000000..aea201f --- /dev/null +++ b/modules/nix/X/dwm/default.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + dmenu + (st.overrideAttrs (oldAttrs: rec { + configFile = writeText "config.def.h" (builtins.readFile ./source/st/config.def.h); + })) + ]; + services = { + xserver = { + enable = true; + displayManager.startx.enable = true; + windowManager = { + dwm = { + enable = true; + package = pkgs.dwm.overrideAttrs { + src = ./source/dwm; + }; + }; + }; + }; + }; +} diff --git a/modules/nix/X/dwm/source/dwm b/modules/nix/X/dwm/source/dwm new file mode 160000 index 0000000..bcbc2e6 --- /dev/null +++ b/modules/nix/X/dwm/source/dwm @@ -0,0 +1 @@ +Subproject commit bcbc2e6d1d2ba08c8ac2a326e1b9ca21591ee36d diff --git a/modules/nix/X/dwm/source/st/config.def.h b/modules/nix/X/dwm/source/st/config.def.h new file mode 100644 index 0000000..570d7b9 --- /dev/null +++ b/modules/nix/X/dwm/source/st/config.def.h @@ -0,0 +1,323 @@ +static char *font = "Terminus:pixelsize=18:antialias=true:autohint=true"; +static int borderpx = 2; + +static char *shell = "/usr/local/bin/bash"; +char *utmp = NULL; +char *scroll = NULL; +char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; +char *vtiden = "\033[?6c"; + +static float cwscale = 1.0; +static float chscale = 1.0; +wchar_t *worddelimiters = L" "; +static unsigned int doubleclicktimeout = 300; +static unsigned int tripleclicktimeout = 600; +int allowaltscreen = 1; +int allowwindowops = 0; +static double minlatency = 2; +static double maxlatency = 33; +static unsigned int blinktimeout = 800; +static unsigned int cursorthickness = 2; +static int bellvolume = 0; +char *termname = "xterm"; +unsigned int tabspaces = 2; + +static const char *colorname[] = { + /* Normal colors */ + [0] = "#121212", /* black */ + [1] = "#ee5396", /* red */ + [2] = "#42be65", /* green */ + [3] = "#ffe97b", /* yellow */ + [4] = "#33b1ff", /* blue */ + [5] = "#ff7eb6", /* magenta */ + [6] = "#3ddbd9", /* cyan */ + [7] = "#dde1e6", /* white */ + + /* Bright colors */ + [8] = "#393939", /* black */ + [9] = "#ee5396", /* red */ + [10] = "#42be65", /* green */ + [11] = "#ffe97b", /* yellow */ + [12] = "#33b1ff", /* blue */ + [13] = "#ff7eb6", /* magenta */ + [14] = "#3ddbd9", /* cyan */ + [15] = "#ffffff", /* white */ + + /* Background and Foreground */ + [256] = "#121212", /* background */ + [257] = "#ffffff", /* foreground */ +}; +/* + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +unsigned int defaultfg = 15; +unsigned int defaultbg = 0; +unsigned int defaultcs = 15; +static unsigned int defaultrcs = 257; + +/* + * Default shape of cursor + * 2: Block ("█") + * 4: Underline ("_") + * 6: Bar ("|") + * 7: Snowman ("☃") + */ +static unsigned int cursorshape = 4; +static unsigned int cols = 80; +static unsigned int rows = 24; +static unsigned int mouseshape = XC_xterm; +static unsigned int mousefg = 7; +static unsigned int mousebg = 0; +static unsigned int defaultattr = 11; +static uint forcemousemod = ShiftMask; +static MouseShortcut mshortcuts[] = { + /* mask button function argument release */ + {XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1}, + {ShiftMask, Button4, ttysend, {.s = "\033[5;2~"}}, + {XK_ANY_MOD, Button4, ttysend, {.s = "\031"}}, + {ShiftMask, Button5, ttysend, {.s = "\033[6;2~"}}, + {XK_ANY_MOD, Button5, ttysend, {.s = "\005"}}, +}; + +/* Internal keyboard shortcuts. */ +#define MODKEY Mod1Mask +#define TERMMOD (ControlMask | ShiftMask) + +static Shortcut shortcuts[] = { + /* mask keysym function argument */ + {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}}, + {ControlMask, XK_Print, toggleprinter, {.i = 0}}, + {ShiftMask, XK_Print, printscreen, {.i = 0}}, + {XK_ANY_MOD, XK_Print, printsel, {.i = 0}}, + {TERMMOD, XK_Prior, zoom, {.f = +1}}, + {TERMMOD, XK_Next, zoom, {.f = -1}}, + {TERMMOD, XK_Home, zoomreset, {.f = 0}}, + {TERMMOD, XK_C, clipcopy, {.i = 0}}, + {TERMMOD, XK_V, clippaste, {.i = 0}}, + {TERMMOD, XK_Y, selpaste, {.i = 0}}, + {ShiftMask, XK_Insert, selpaste, {.i = 0}}, + {TERMMOD, XK_Num_Lock, numlock, {.i = 0}}, +}; +static KeySym mappedkeys[] = {-1}; +static uint ignoremod = Mod2Mask | XK_SWITCH_MOD; +static Key key[] = { + /* keysym mask string appkey appcursor */ + {XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, + {XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, + {XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, + {XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, + {XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, + {XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, + {XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, + {XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, + {XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, + {XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, + {XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, + {XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, + {XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, + {XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, + {XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, + {XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, + {XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, + {XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, + {XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, + {XK_KP_End, ControlMask, "\033[J", -1, 0}, + {XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, + {XK_KP_End, ShiftMask, "\033[K", -1, 0}, + {XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, + {XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, + {XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, + {XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, + {XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, + {XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, + {XK_KP_Insert, ControlMask, "\033[L", -1, 0}, + {XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, + {XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, + {XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, + {XK_KP_Delete, ControlMask, "\033[M", -1, 0}, + {XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, + {XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, + {XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, + {XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, + {XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, + {XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, + {XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, + {XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, + {XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, + {XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, + {XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, + {XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, + {XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, + {XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, + {XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, + {XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, + {XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, + {XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, + {XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, + {XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, + {XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, + {XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, + {XK_Up, ShiftMask, "\033[1;2A", 0, 0}, + {XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, + {XK_Up, ShiftMask | Mod1Mask, "\033[1;4A", 0, 0}, + {XK_Up, ControlMask, "\033[1;5A", 0, 0}, + {XK_Up, ShiftMask | ControlMask, "\033[1;6A", 0, 0}, + {XK_Up, ControlMask | Mod1Mask, "\033[1;7A", 0, 0}, + {XK_Up, ShiftMask | ControlMask | Mod1Mask, "\033[1;8A", 0, 0}, + {XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, + {XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, + {XK_Down, ShiftMask, "\033[1;2B", 0, 0}, + {XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, + {XK_Down, ShiftMask | Mod1Mask, "\033[1;4B", 0, 0}, + {XK_Down, ControlMask, "\033[1;5B", 0, 0}, + {XK_Down, ShiftMask | ControlMask, "\033[1;6B", 0, 0}, + {XK_Down, ControlMask | Mod1Mask, "\033[1;7B", 0, 0}, + {XK_Down, ShiftMask | ControlMask | Mod1Mask, "\033[1;8B", 0, 0}, + {XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, + {XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, + {XK_Left, ShiftMask, "\033[1;2D", 0, 0}, + {XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, + {XK_Left, ShiftMask | Mod1Mask, "\033[1;4D", 0, 0}, + {XK_Left, ControlMask, "\033[1;5D", 0, 0}, + {XK_Left, ShiftMask | ControlMask, "\033[1;6D", 0, 0}, + {XK_Left, ControlMask | Mod1Mask, "\033[1;7D", 0, 0}, + {XK_Left, ShiftMask | ControlMask | Mod1Mask, "\033[1;8D", 0, 0}, + {XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, + {XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, + {XK_Right, ShiftMask, "\033[1;2C", 0, 0}, + {XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, + {XK_Right, ShiftMask | Mod1Mask, "\033[1;4C", 0, 0}, + {XK_Right, ControlMask, "\033[1;5C", 0, 0}, + {XK_Right, ShiftMask | ControlMask, "\033[1;6C", 0, 0}, + {XK_Right, ControlMask | Mod1Mask, "\033[1;7C", 0, 0}, + {XK_Right, ShiftMask | ControlMask | Mod1Mask, "\033[1;8C", 0, 0}, + {XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, + {XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, + {XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, + {XK_Return, Mod1Mask, "\033\r", 0, 0}, + {XK_Return, XK_ANY_MOD, "\r", 0, 0}, + {XK_Insert, ShiftMask, "\033[4l", -1, 0}, + {XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, + {XK_Insert, ControlMask, "\033[L", -1, 0}, + {XK_Insert, ControlMask, "\033[2;5~", +1, 0}, + {XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, + {XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, + {XK_Delete, ControlMask, "\033[M", -1, 0}, + {XK_Delete, ControlMask, "\033[3;5~", +1, 0}, + {XK_Delete, ShiftMask, "\033[2K", -1, 0}, + {XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, + {XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, + {XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, + {XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, + {XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, + {XK_Home, ShiftMask, "\033[2J", 0, -1}, + {XK_Home, ShiftMask, "\033[1;2H", 0, +1}, + {XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, + {XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, + {XK_End, ControlMask, "\033[J", -1, 0}, + {XK_End, ControlMask, "\033[1;5F", +1, 0}, + {XK_End, ShiftMask, "\033[K", -1, 0}, + {XK_End, ShiftMask, "\033[1;2F", +1, 0}, + {XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, + {XK_Prior, ControlMask, "\033[5;5~", 0, 0}, + {XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, + {XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, + {XK_Next, ControlMask, "\033[6;5~", 0, 0}, + {XK_Next, ShiftMask, "\033[6;2~", 0, 0}, + {XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, + {XK_F1, XK_NO_MOD, "\033OP", 0, 0}, + {XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, + {XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, + {XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, + {XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, + {XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, + {XK_F2, XK_NO_MOD, "\033OQ", 0, 0}, + {XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, + {XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, + {XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, + {XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, + {XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, + {XK_F3, XK_NO_MOD, "\033OR", 0, 0}, + {XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, + {XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, + {XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, + {XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, + {XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, + {XK_F4, XK_NO_MOD, "\033OS", 0, 0}, + {XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, + {XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, + {XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, + {XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, + {XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, + {XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, + {XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, + {XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, + {XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, + {XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, + {XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, + {XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, + {XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, + {XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, + {XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, + {XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, + {XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, + {XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, + {XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, + {XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, + {XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, + {XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, + {XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, + {XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, + {XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, + {XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, + {XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, + {XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, + {XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, + {XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, + {XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, + {XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, + {XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, + {XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, + {XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, + {XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, + {XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, + {XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, + {XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, + {XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, + {XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, + {XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, + {XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, + {XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, + {XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, + {XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, + {XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, + {XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, + {XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, + {XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, + {XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, + {XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, + {XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, + {XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, + {XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, + {XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, + {XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, + {XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, + {XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, + {XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, + {XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, + {XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, + {XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, + {XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, + {XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, + {XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, + {XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, +}; + +static uint selmasks[] = { + [SEL_RECTANGULAR] = Mod1Mask, +}; + +static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?" + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 446e08b..53ed8ea 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -1,9 +1,7 @@ { config, pkgs, ... }: { imports = [ - ./editors/nvim/default.nix - #./wm/sway/default.nix - ./wm/i3/default.nix + ./nvim/default.nix ./bash.nix ./git.nix ./tmux.nix diff --git a/modules/nix/editors/nvim/cmp.nix b/modules/nix/nvim/cmp.nix similarity index 100% rename from modules/nix/editors/nvim/cmp.nix rename to modules/nix/nvim/cmp.nix diff --git a/modules/nix/editors/nvim/default.nix b/modules/nix/nvim/default.nix similarity index 100% rename from modules/nix/editors/nvim/default.nix rename to modules/nix/nvim/default.nix diff --git a/modules/nix/editors/nvim/dev.nix b/modules/nix/nvim/dev.nix similarity index 100% rename from modules/nix/editors/nvim/dev.nix rename to modules/nix/nvim/dev.nix diff --git a/modules/nix/editors/nvim/lsp.nix b/modules/nix/nvim/lsp.nix similarity index 100% rename from modules/nix/editors/nvim/lsp.nix rename to modules/nix/nvim/lsp.nix diff --git a/modules/nix/editors/nvim/lualine.nix b/modules/nix/nvim/lualine.nix similarity index 100% rename from modules/nix/editors/nvim/lualine.nix rename to modules/nix/nvim/lualine.nix diff --git a/modules/nix/editors/nvim/neotree.nix b/modules/nix/nvim/neotree.nix similarity index 100% rename from modules/nix/editors/nvim/neotree.nix rename to modules/nix/nvim/neotree.nix diff --git a/modules/nix/editors/nvim/nonels.nix b/modules/nix/nvim/nonels.nix similarity index 100% rename from modules/nix/editors/nvim/nonels.nix rename to modules/nix/nvim/nonels.nix diff --git a/modules/nix/editors/nvim/opts.nix b/modules/nix/nvim/opts.nix similarity index 100% rename from modules/nix/editors/nvim/opts.nix rename to modules/nix/nvim/opts.nix diff --git a/modules/nix/editors/nvim/treesitter.nix b/modules/nix/nvim/treesitter.nix similarity index 100% rename from modules/nix/editors/nvim/treesitter.nix rename to modules/nix/nvim/treesitter.nix