From 421f2d64075f63e3104f68acf9917bbc02f4c549 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Tue, 31 Dec 2024 12:55:48 -0600 Subject: [PATCH] move lappy-config into config --- boxes/aristotle/custom_command | 1 + boxes/aristotle/default.nix | 5 +- builds/dwm | 2 +- builds/lappy-st/clipboard.patch | 12 - builds/lappy-st/config.h | 470 ------------------ builds/lappy-st/scrollback.patch | 351 ------------- builds/lappy-utils.nix | 28 -- builds/lappy-utils/blackhole | 8 - builds/lappy-utils/git-rbw-wrap | 14 - builds/lappy-utils/khalmacs | 43 -- builds/lappy-utils/passmenu | 6 - builds/lappy-utils/pimsync | 7 - builds/lappy-utils/rebuild | 3 - builds/rebuild/rebuild | 23 +- .../paperless => utils/aristotle-paperless} | 0 .../status => utils/aristotle-status} | 0 .../{lappy-utils => utils}/cmus-status-update | 0 builds/utils/rbw-dmenu-list | 4 +- builds/utils/rbw-git-handler | 5 +- config/aristotle.nix | 71 +++ config/bash/bashrc | 8 +- config/cmus/rc | 3 + config/nvim/init.min.lua | 5 + config/sx/aristotle | 9 + config/sx/default.nix | 17 + lappy-config/lynx/lynx.cfg | 56 --- lappy-config/tmux/tmux.conf | 0 27 files changed, 130 insertions(+), 1021 deletions(-) create mode 100644 boxes/aristotle/custom_command delete mode 100644 builds/lappy-st/clipboard.patch delete mode 100644 builds/lappy-st/config.h delete mode 100644 builds/lappy-st/scrollback.patch delete mode 100644 builds/lappy-utils.nix delete mode 100755 builds/lappy-utils/blackhole delete mode 100755 builds/lappy-utils/git-rbw-wrap delete mode 100755 builds/lappy-utils/khalmacs delete mode 100755 builds/lappy-utils/passmenu delete mode 100755 builds/lappy-utils/pimsync delete mode 100755 builds/lappy-utils/rebuild rename builds/{lappy-utils/paperless => utils/aristotle-paperless} (100%) rename builds/{lappy-utils/status => utils/aristotle-status} (100%) rename builds/{lappy-utils => utils}/cmus-status-update (100%) create mode 100644 config/aristotle.nix create mode 100644 config/cmus/rc create mode 100755 config/sx/aristotle create mode 100644 config/sx/default.nix delete mode 100644 lappy-config/lynx/lynx.cfg delete mode 100644 lappy-config/tmux/tmux.conf diff --git a/boxes/aristotle/custom_command b/boxes/aristotle/custom_command new file mode 100644 index 0000000..d4b6627 --- /dev/null +++ b/boxes/aristotle/custom_command @@ -0,0 +1 @@ +sudo nixos-rebuild switch --flake .?submodules=1 diff --git a/boxes/aristotle/default.nix b/boxes/aristotle/default.nix index 8869070..b9f267f 100644 --- a/boxes/aristotle/default.nix +++ b/boxes/aristotle/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../lappy-config + ../../config/aristotle.nix ./paperless.nix ./sshd.nix ./agenix.nix @@ -58,7 +58,8 @@ brave qutebrowser (callPackage ../../builds/st.nix { aristotle = true; }) - (callPackage ../../builds/lappy-utils.nix {}) + (callPackage ../../builds/utils.nix {}) + (callPackage ../../builds/rebuild.nix {}) (callPackage ../../builds/dwm.nix {}) (callPackage ../../builds/sssg.nix {}) dmenu diff --git a/builds/dwm b/builds/dwm index 7c33f3a..7248b43 160000 --- a/builds/dwm +++ b/builds/dwm @@ -1 +1 @@ -Subproject commit 7c33f3af6e8c1da972876b31918e11523308f019 +Subproject commit 7248b43424def635e2a6194281e84ec0689fd7ba diff --git a/builds/lappy-st/clipboard.patch b/builds/lappy-st/clipboard.patch deleted file mode 100644 index c1e0e9e..0000000 --- a/builds/lappy-st/clipboard.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/x.c b/x.c -index e5f1737..5cabd60 100644 ---- a/x.c -+++ b/x.c -@@ -673,6 +673,7 @@ setsel(char *str, Time t) - XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); - if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) - selclear(); -+ clipcopy(NULL); - } - - void diff --git a/builds/lappy-st/config.h b/builds/lappy-st/config.h deleted file mode 100644 index 88385c6..0000000 --- a/builds/lappy-st/config.h +++ /dev/null @@ -1,470 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* - * appearance - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -static int borderpx = 2; - -/* - * What program is execed by st depends of these precedence rules: - * 1: program passed with -e - * 2: scroll and/or utmp - * 3: SHELL environment variable - * 4: value of shell in /etc/passwd - * 5: value of shell in config.h - */ -static char *shell = "/bin/sh"; -char *utmp = NULL; -/* scroll program: to enable use a string like "scroll" */ -char *scroll = NULL; -char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; - -/* identification sequence returned in DA and DECID */ -char *vtiden = "\033[?6c"; - -/* Kerning / character bounding-box multipliers */ -static float cwscale = 1.0; -static float chscale = 1.0; - -/* - * word delimiter string - * - * More advanced example: L" `'\"()[]{}" - */ -wchar_t *worddelimiters = L" "; - -/* selection timeouts (in milliseconds) */ -static unsigned int doubleclicktimeout = 300; -static unsigned int tripleclicktimeout = 600; - -/* alt screens */ -int allowaltscreen = 1; - -/* allow certain non-interactive (insecure) window operations such as: - setting the clipboard text */ -int allowwindowops = 0; - -/* - * draw latency range in ms - from new content/keypress/etc until drawing. - * within this range, st draws when content stops arriving (idle). mostly it's - * near minlatency, but it waits longer for slow updates to avoid partial draw. - * low minlatency will tear/flicker more, as it can "detect" idle too early. - */ -static double minlatency = 2; -static double maxlatency = 33; - -/* - * blinking timeout (set to 0 to disable blinking) for the terminal blinking - * attribute. - */ -static unsigned int blinktimeout = 800; - -/* - * thickness of underline and bar cursors - */ -static unsigned int cursorthickness = 2; - -/* - * bell volume. It must be a value between -100 and 100. Use 0 for disabling - * it - */ -static int bellvolume = 0; - -/* default TERM value */ -char *termname = "st-256color"; - -/* - * spaces per tab - * - * When you are changing this value, don't forget to adapt the »it« value in - * the st.info and appropriately install the st.info in the environment where - * you use this st version. - * - * it#$tabspaces, - * - * Secondly make sure your kernel is not expanding tabs. When running `stty - * -a` »tab0« should appear. You can tell the terminal to not expand tabs by - * running following command: - * - * stty tabs - */ -unsigned int tabspaces = 8; - -/* Terminal colors (16 first used in escape sequence) */ -static const char *colorname[] = { - /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", - - /* 8 bright colors */ - "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", - "white", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", - "gray90", /* default foreground colour */ - "black", /* default background colour */ -}; - - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 258; -unsigned int defaultbg = 259; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; - -/* - * Default shape of cursor - * 2: Block ("█") - * 4: Underline ("_") - * 6: Bar ("|") - * 7: Snowman ("☃") - */ -static unsigned int cursorshape = 2; - -/* - * Default columns and rows numbers - */ - -static unsigned int cols = 80; -static unsigned int rows = 24; - -/* - * Default colour and shape of the mouse cursor - */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; - -/* - * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other - * modifier, set to 0 to not use it. - */ -static uint forcemousemod = ShiftMask; - -/* - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -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 */ - { MODKEY, XK_H, zoom, {.f = +1} }, - { MODKEY, XK_L, zoom, {.f = -1} }, - { MODKEY, XK_C, clipcopy, {.i = 0} }, - { MODKEY, XK_V, clippaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { MODKEY, XK_K, kscrollup, {.i = -1} }, - { MODKEY, XK_J, kscrolldown, {.i = -1} }, -}; - -/* - * Special keys (change & recompile st.info accordingly) - * - * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state - * * Use XK_NO_MOD to match the key alone (no modifiers) - * appkey value: - * * 0: no value - * * > 0: keypad application mode enabled - * * = 2: term.numlock = 1 - * * < 0: keypad application mode disabled - * appcursor value: - * * 0: no value - * * > 0: cursor application mode enabled - * * < 0: cursor application mode disabled - * - * Be careful with the order of the definitions because st searches in - * this table sequentially, so any XK_ANY_MOD must be in the last - * position for a key. - */ - -/* - * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) - * to be mapped below, add them to this array. - */ -static KeySym mappedkeys[] = { -1 }; - -/* - * State bits to ignore when matching key or button events. By default, - * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. - */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; - -/* - * This is the huge key array which defines all compatibility to the Linux - * world. Please decide about changes wisely. - */ -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}, -}; - -/* - * Selection types' masks. - * Use the same masks as usual. - * Button1Mask is always unset, to make masks match between ButtonPress. - * ButtonRelease and MotionNotify. - * If no match is found, regular selection is used. - */ -static uint selmasks[] = { - [SEL_RECTANGULAR] = Mod1Mask, -}; - -/* - * Printable characters in ASCII, used to estimate the advance width - * of single wide characters. - */ -static char ascii_printable[] = - " !\"#$%&'()*+,-./0123456789:;<=>?" - "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" - "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/builds/lappy-st/scrollback.patch b/builds/lappy-st/scrollback.patch deleted file mode 100644 index f9782e8..0000000 --- a/builds/lappy-st/scrollback.patch +++ /dev/null @@ -1,351 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 2cd740a..40b7d93 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -201,6 +201,8 @@ static Shortcut shortcuts[] = { - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, -+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, -+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, - }; - - /* -diff --git a/st.c b/st.c -index b9f66e7..2478942 100644 ---- a/st.c -+++ b/st.c -@@ -35,6 +35,7 @@ - #define ESC_ARG_SIZ 16 - #define STR_BUF_SIZ ESC_BUF_SIZ - #define STR_ARG_SIZ ESC_ARG_SIZ -+#define HISTSIZE 2000 - - /* macros */ - #define IS_SET(flag) ((term.mode & (flag)) != 0) -@@ -42,6 +43,9 @@ - #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) - #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) - #define ISDELIM(u) (u && wcschr(worddelimiters, u)) -+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \ -+ term.scr + HISTSIZE + 1) % HISTSIZE] : \ -+ term.line[(y) - term.scr]) - - enum term_mode { - MODE_WRAP = 1 << 0, -@@ -115,6 +119,9 @@ typedef struct { - int col; /* nb col */ - Line *line; /* screen */ - Line *alt; /* alternate screen */ -+ Line hist[HISTSIZE]; /* history buffer */ -+ int histi; /* history index */ -+ int scr; /* scroll back */ - int *dirty; /* dirtyness of lines */ - TCursor c; /* cursor */ - int ocx; /* old cursor col */ -@@ -185,8 +192,8 @@ static void tnewline(int); - static void tputtab(int); - static void tputc(Rune); - static void treset(void); --static void tscrollup(int, int); --static void tscrolldown(int, int); -+static void tscrollup(int, int, int); -+static void tscrolldown(int, int, int); - static void tsetattr(const int *, int); - static void tsetchar(Rune, const Glyph *, int, int); - static void tsetdirt(int, int); -@@ -409,10 +416,10 @@ tlinelen(int y) - { - int i = term.col; - -- if (term.line[y][i - 1].mode & ATTR_WRAP) -+ if (TLINE(y)[i - 1].mode & ATTR_WRAP) - return i; - -- while (i > 0 && term.line[y][i - 1].u == ' ') -+ while (i > 0 && TLINE(y)[i - 1].u == ' ') - --i; - - return i; -@@ -521,7 +528,7 @@ selsnap(int *x, int *y, int direction) - * Snap around if the word wraps around at the end or - * beginning of a line. - */ -- prevgp = &term.line[*y][*x]; -+ prevgp = &TLINE(*y)[*x]; - prevdelim = ISDELIM(prevgp->u); - for (;;) { - newx = *x + direction; -@@ -536,14 +543,14 @@ selsnap(int *x, int *y, int direction) - yt = *y, xt = *x; - else - yt = newy, xt = newx; -- if (!(term.line[yt][xt].mode & ATTR_WRAP)) -+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) - break; - } - - if (newx >= tlinelen(newy)) - break; - -- gp = &term.line[newy][newx]; -+ gp = &TLINE(newy)[newx]; - delim = ISDELIM(gp->u); - if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim - || (delim && gp->u != prevgp->u))) -@@ -564,14 +571,14 @@ selsnap(int *x, int *y, int direction) - *x = (direction < 0) ? 0 : term.col - 1; - if (direction < 0) { - for (; *y > 0; *y += direction) { -- if (!(term.line[*y-1][term.col-1].mode -+ if (!(TLINE(*y-1)[term.col-1].mode - & ATTR_WRAP)) { - break; - } - } - } else if (direction > 0) { - for (; *y < term.row-1; *y += direction) { -- if (!(term.line[*y][term.col-1].mode -+ if (!(TLINE(*y)[term.col-1].mode - & ATTR_WRAP)) { - break; - } -@@ -602,13 +609,13 @@ getsel(void) - } - - if (sel.type == SEL_RECTANGULAR) { -- gp = &term.line[y][sel.nb.x]; -+ gp = &TLINE(y)[sel.nb.x]; - lastx = sel.ne.x; - } else { -- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; -+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; - lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; - } -- last = &term.line[y][MIN(lastx, linelen-1)]; -+ last = &TLINE(y)[MIN(lastx, linelen-1)]; - while (last >= gp && last->u == ' ') - --last; - -@@ -844,6 +851,9 @@ void - ttywrite(const char *s, size_t n, int may_echo) - { - const char *next; -+ Arg arg = (Arg) { .i = term.scr }; -+ -+ kscrolldown(&arg); - - if (may_echo && IS_SET(MODE_ECHO)) - twrite(s, n, 1); -@@ -1055,13 +1065,53 @@ tswapscreen(void) - } - - void --tscrolldown(int orig, int n) -+kscrolldown(const Arg* a) -+{ -+ int n = a->i; -+ -+ if (n < 0) -+ n = term.row + n; -+ -+ if (n > term.scr) -+ n = term.scr; -+ -+ if (term.scr > 0) { -+ term.scr -= n; -+ selscroll(0, -n); -+ tfulldirt(); -+ } -+} -+ -+void -+kscrollup(const Arg* a) -+{ -+ int n = a->i; -+ -+ if (n < 0) -+ n = term.row + n; -+ -+ if (term.scr <= HISTSIZE-n) { -+ term.scr += n; -+ selscroll(0, n); -+ tfulldirt(); -+ } -+} -+ -+void -+tscrolldown(int orig, int n, int copyhist) - { - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - -+ if (copyhist) { -+ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE; -+ temp = term.hist[term.histi]; -+ term.hist[term.histi] = term.line[term.bot]; -+ term.line[term.bot] = temp; -+ } -+ - tsetdirt(orig, term.bot-n); - tclearregion(0, term.bot-n+1, term.col-1, term.bot); - -@@ -1071,17 +1121,28 @@ tscrolldown(int orig, int n) - term.line[i-n] = temp; - } - -- selscroll(orig, n); -+ if (term.scr == 0) -+ selscroll(orig, n); - } - - void --tscrollup(int orig, int n) -+tscrollup(int orig, int n, int copyhist) - { - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - -+ if (copyhist) { -+ term.histi = (term.histi + 1) % HISTSIZE; -+ temp = term.hist[term.histi]; -+ term.hist[term.histi] = term.line[orig]; -+ term.line[orig] = temp; -+ } -+ -+ if (term.scr > 0 && term.scr < HISTSIZE) -+ term.scr = MIN(term.scr + n, HISTSIZE-1); -+ - tclearregion(0, orig, term.col-1, orig+n-1); - tsetdirt(orig+n, term.bot); - -@@ -1091,7 +1152,8 @@ tscrollup(int orig, int n) - term.line[i+n] = temp; - } - -- selscroll(orig, -n); -+ if (term.scr == 0) -+ selscroll(orig, -n); - } - - void -@@ -1120,7 +1182,7 @@ tnewline(int first_col) - int y = term.c.y; - - if (y == term.bot) { -- tscrollup(term.top, 1); -+ tscrollup(term.top, 1, 1); - } else { - y++; - } -@@ -1285,14 +1347,14 @@ void - tinsertblankline(int n) - { - if (BETWEEN(term.c.y, term.top, term.bot)) -- tscrolldown(term.c.y, n); -+ tscrolldown(term.c.y, n, 0); - } - - void - tdeleteline(int n) - { - if (BETWEEN(term.c.y, term.top, term.bot)) -- tscrollup(term.c.y, n); -+ tscrollup(term.c.y, n, 0); - } - - int32_t -@@ -1730,11 +1792,11 @@ csihandle(void) - case 'S': /* SU -- Scroll line up */ - if (csiescseq.priv) break; - DEFAULT(csiescseq.arg[0], 1); -- tscrollup(term.top, csiescseq.arg[0]); -+ tscrollup(term.top, csiescseq.arg[0], 0); - break; - case 'T': /* SD -- Scroll line down */ - DEFAULT(csiescseq.arg[0], 1); -- tscrolldown(term.top, csiescseq.arg[0]); -+ tscrolldown(term.top, csiescseq.arg[0], 0); - break; - case 'L': /* IL -- Insert blank lines */ - DEFAULT(csiescseq.arg[0], 1); -@@ -2306,7 +2368,7 @@ eschandle(uchar ascii) - return 0; - case 'D': /* IND -- Linefeed */ - if (term.c.y == term.bot) { -- tscrollup(term.top, 1); -+ tscrollup(term.top, 1, 1); - } else { - tmoveto(term.c.x, term.c.y+1); - } -@@ -2319,7 +2381,7 @@ eschandle(uchar ascii) - break; - case 'M': /* RI -- Reverse index */ - if (term.c.y == term.top) { -- tscrolldown(term.top, 1); -+ tscrolldown(term.top, 1, 1); - } else { - tmoveto(term.c.x, term.c.y-1); - } -@@ -2542,7 +2604,7 @@ twrite(const char *buf, int buflen, int show_ctrl) - void - tresize(int col, int row) - { -- int i; -+ int i, j; - int minrow = MIN(row, term.row); - int mincol = MIN(col, term.col); - int *bp; -@@ -2579,6 +2641,14 @@ tresize(int col, int row) - term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); - term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); - -+ for (i = 0; i < HISTSIZE; i++) { -+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); -+ for (j = mincol; j < col; j++) { -+ term.hist[i][j] = term.c.attr; -+ term.hist[i][j].u = ' '; -+ } -+ } -+ - /* resize each row to new width, zero-pad if needed */ - for (i = 0; i < minrow; i++) { - term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); -@@ -2637,7 +2707,7 @@ drawregion(int x1, int y1, int x2, int y2) - continue; - - term.dirty[y] = 0; -- xdrawline(term.line[y], x1, y, x2); -+ xdrawline(TLINE(y), x1, y, x2); - } - } - -@@ -2658,8 +2728,9 @@ draw(void) - cx--; - - drawregion(0, 0, term.col, term.row); -- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], -- term.ocx, term.ocy, term.line[term.ocy][term.ocx]); -+ if (term.scr == 0) -+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], -+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]); - term.ocx = cx; - term.ocy = term.c.y; - xfinishdraw(); -diff --git a/st.h b/st.h -index fd3b0d8..818a6f8 100644 ---- a/st.h -+++ b/st.h -@@ -81,6 +81,8 @@ void die(const char *, ...); - void redraw(void); - void draw(void); - -+void kscrolldown(const Arg *); -+void kscrollup(const Arg *); - void printscreen(const Arg *); - void printsel(const Arg *); - void sendbreak(const Arg *); diff --git a/builds/lappy-utils.nix b/builds/lappy-utils.nix deleted file mode 100644 index a8e6d4b..0000000 --- a/builds/lappy-utils.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, lib -, pkgs -# shell scripts stuff -, makeWrapper -, kbd # for chvt -, xclip -, rbw -}: - -stdenv.mkDerivation rec { - pname = "lappy-utils"; - version = "1.01"; - - src = ./lappy-utils; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ xclip kbd rbw ]; - - installPhase = '' - mkdir -p $out/bin - - for i in $(ls $src/); do - cp $src/$i $out/bin - wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ xclip kbd rbw ]} - done - ''; -} diff --git a/builds/lappy-utils/blackhole b/builds/lappy-utils/blackhole deleted file mode 100755 index 6002712..0000000 --- a/builds/lappy-utils/blackhole +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -sudo echo "" -chvt 6 -sleep 2 -sudo stty -echo -F /dev/tty6 -sudo systemctl start sshd -sudo /run/current-system/sw/bin/jsfw server 24800 /home/usr/dots/lappy/jsfw.json >/dev/null diff --git a/builds/lappy-utils/git-rbw-wrap b/builds/lappy-utils/git-rbw-wrap deleted file mode 100755 index 082eeec..0000000 --- a/builds/lappy-utils/git-rbw-wrap +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -[ -z "$1" ] && exit 1 - -# wrap rbw get $1 --full to output in the git credential helper -# format: -# username=yourusername -# password=yourpassword - -rbw get $1 --full | \ - sed '1{s/^/password=/}' | \ - sed 's/Username: /username=/g' | \ - grep -E 'username|password' | \ - tac diff --git a/builds/lappy-utils/khalmacs b/builds/lappy-utils/khalmacs deleted file mode 100755 index 8dd785e..0000000 --- a/builds/lappy-utils/khalmacs +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -print_help() { - echo " -this is khalmacs. - -builtin-options: - - regular - - late - " -} - -case $1 in - "regular") - khal new -g school -a home $2 07:40 08:27 AP Computer Science - khal new -g school -a home $2 08:34 09:19 Chemistry I H - khal new -g school -a home $2 09:29 10:14 AP Precalculus - khal new -g school -a home $2 10:21 11:06 AP European History - khal new -g school -a home $2 11:06 11:08 Flex Check time - khal new -g school -a home $2 11:15 12:05 Wind Ensemble H - khal new -g school -a home $2 12:12 12:37 SAIL - khal new -g school -a home $2 12:37 13:02 Lunch - khal new -g school -a home $2 13:09 13:54 English II H - khal new -g school -a home $2 14:01 14:47 Spanish III H - ;; - "late") - khal new -g school -a home $2 08:25 09:08 AP Computer Science - khal new -g school -a home $2 09:15 09:56 Chemistry I H - khal new -g school -a home $2 10:06 10:47 AP Precalculus - khal new -g school -a home $2 10:54 11:33 AP European History - khal new -g school -a home $2 11:33 11:35 Flex Check time - khal new -g school -a home $2 11:41 12:22 Wind Ensemble H - khal new -g school -a home $2 12:29 13:10 Lunch - khal new -g school -a home $2 13:17 13:58 English II H - khal new -g school -a home $2 14:05 14:47 Spanish III H - ;; - *) - print_help - ;; - "help") - print_help - ;; -esac diff --git a/builds/lappy-utils/passmenu b/builds/lappy-utils/passmenu deleted file mode 100755 index fd28fdf..0000000 --- a/builds/lappy-utils/passmenu +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -resp=$(rbw list | dmenu) - -rbw get "$resp" | xclip -selection clipboard -sleep 15 -echo "cleared" | xclip -selection clipboard diff --git a/builds/lappy-utils/pimsync b/builds/lappy-utils/pimsync deleted file mode 100755 index d2d1c5d..0000000 --- a/builds/lappy-utils/pimsync +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -mkdir -p ~/pim/mail/main -mbsync -c ~/.config/isync/config main - -vdirsyncer sync -rbw sync diff --git a/builds/lappy-utils/rebuild b/builds/lappy-utils/rebuild deleted file mode 100755 index d1569a8..0000000 --- a/builds/lappy-utils/rebuild +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cd $HOME/dots; sudo nixos-rebuild switch --flake .?submodules=1 $@ diff --git a/builds/rebuild/rebuild b/builds/rebuild/rebuild index 1ea01b9..eea7514 100755 --- a/builds/rebuild/rebuild +++ b/builds/rebuild/rebuild @@ -1,20 +1,15 @@ #!/bin/sh -cd ~/dot_testing -if [ "$(hostname)" = "localhost" ]; then - # we're on a phone - cd boxes/phone/out-of-tree - make $@ - exit +if [ -d "$HOME/dot_testing" ]; then + cd ~/dot_testing +elif [ -d "$HOME/dots" ]; then + cd ~/dots fi -if [ -f "boxes/$(hostname)/custom_command" ]; then - eval "$(cat boxes/$(hostname)/custom_command)" - exit +machine=$(hostname) + +if [ "$machine" = "localhost" ]; then + machine="phone" fi -if [ -f "flake.nix" ]; then - sudo nixos-rebuild --flake . switch $@ -else - sudo nixos-rebuild -I nixos-config=./boxes/$(hostname).nix switch $@ -fi +sh boxes/$machine/custom_command $@ diff --git a/builds/lappy-utils/paperless b/builds/utils/aristotle-paperless similarity index 100% rename from builds/lappy-utils/paperless rename to builds/utils/aristotle-paperless diff --git a/builds/lappy-utils/status b/builds/utils/aristotle-status similarity index 100% rename from builds/lappy-utils/status rename to builds/utils/aristotle-status diff --git a/builds/lappy-utils/cmus-status-update b/builds/utils/cmus-status-update similarity index 100% rename from builds/lappy-utils/cmus-status-update rename to builds/utils/cmus-status-update diff --git a/builds/utils/rbw-dmenu-list b/builds/utils/rbw-dmenu-list index 962b0ff..00f3a17 100755 --- a/builds/utils/rbw-dmenu-list +++ b/builds/utils/rbw-dmenu-list @@ -1,6 +1,8 @@ # wrapper around rbw -rbw-x11-prompt +if [ "$HOSTNAME" != "aristotle" ]; then + rbw-x11-prompt +fi resp=$(rbw list | dmenu) diff --git a/builds/utils/rbw-git-handler b/builds/utils/rbw-git-handler index 99e00a2..969ee3b 100755 --- a/builds/utils/rbw-git-handler +++ b/builds/utils/rbw-git-handler @@ -5,8 +5,9 @@ # wrap rbw get $1 --full to output in the git credential helper # format -# assume we're running xorg -rbw-x11-prompt +if [ "$HOSTNAME" != "aristotle" ]; then + rbw-x11-prompt +fi # username=yourusername # password=yourpassword diff --git a/config/aristotle.nix b/config/aristotle.nix new file mode 100644 index 0000000..238496b --- /dev/null +++ b/config/aristotle.nix @@ -0,0 +1,71 @@ +{ pkgs, ... }: +{ + imports = [ + ./sx + ]; + + # make the bashrc go in .config/bash, not the home directory + environment.etc = { + "profile.local" = { + text = "source /home/usr/.config/bash/profile"; + }; + "bashrc.local" = { + text = "source /home/usr/.config/bash/bashrc"; + }; + }; + + system.userActivationScripts = { + copyEssentialConfiguration = { + text = '' + mkdir -p /home/usr/.config/bash + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/bash/bashrc /home/usr/.config/bash/bashrc + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/bash/profile /home/usr/.config/bash/profile + + mkdir -p /home/usr/.config/cmus + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/cmus/rc /home/usr/.config/cmus/rc + + mkdir -p /home/usr/.config/git + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/git/config /home/usr/.config/git/config + + mkdir -p /home/usr/.config/isync + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/isync/config /home/usr/.config/isync/config + + mkdir -p /home/usr/.config/khal + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/khal/config /home/usr/.config/khal/config + + mkdir -p /home/usr/.config/khard + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/khard/khard.conf /home/usr/.config/khard/khard.conf + + mkdir -p /home/usr/.config/msmtp + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/msmtp/config /home/usr/.config/msmtp/config + + mkdir -p /home/usr/.config/neomutt + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/neomutt/neomuttrc /home/usr/.config/neomutt/neomuttrc + + mkdir -p /home/usr/.config/nvim + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/nvim/init.min.lua /home/usr/.config/nvim/init.lua + + mkdir -p /home/usr/.config/python + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/python/pythonrc.py /home/usr/.config/python/pythonrc.py + + mkdir -p /home/usr/.config/rbw + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/rbw/config.json /home/usr/.config/rbw/config.json + + mkdir -p /home/usr/.config/ssh + mkdir -p /home/usr/.ssh + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/ssh/config /home/usr/.config/ssh/config + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/ssh/config /home/usr/.ssh/config + + mkdir -p /home/usr/.config/sx + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/sx/aristotle /home/usr/.config/sx/sxrc + + mkdir -p /home/usr/.config/todoman + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/todoman/config.py /home/usr/.config/todoman/config.py + + mkdir -p /home/usr/.config/vdirsyncer + ${pkgs.coreutils}/bin/ln -sf /home/usr/dots/config/vdirsyncer/config /home/usr/.config/vdirsyncer/config + ''; + deps = []; + }; + }; +} diff --git a/config/bash/bashrc b/config/bash/bashrc index 593b3ad..c261b83 100644 --- a/config/bash/bashrc +++ b/config/bash/bashrc @@ -5,6 +5,11 @@ # some housekeeping alias ls="ls --color=auto --group-directories-first" +alias weather="curl https://wttr.in" +alias lynx="lynx -cfg=$LYNX_CFG_PATH/lynx.cfg" +alias elinks="TERM='xterm-color' elinks" +alias pkgsearch="nix search nixpkgs" +alias reload=". ~/.config/bash/profile" function cd() { builtin cd "$@" && ls --color=auto --group-directories-first @@ -45,9 +50,6 @@ case "$HOSTNAME" in "copernicus") PS1="$USER_PREFIX\[\033[97;1m\]${NIX_SHELL_PS1}coper:$PS1\[\033[0;0m\]" ;; - "mlg") - PS1="$USER_PREFIX\[\033[94;1m\]${NIX_SHELL_PS1}mlg:$PS1\[\033[0;0m\]" - ;; "netbox") PS1="$USER_PREFIX\[\033[95;1m\]${NIX_SHELL_PS1}net:$PS1\[\033[0;0m\]" ;; diff --git a/config/cmus/rc b/config/cmus/rc new file mode 100644 index 0000000..ec85020 --- /dev/null +++ b/config/cmus/rc @@ -0,0 +1,3 @@ +set show_current_bitrate=true +set pause_on_output_change=true +set status_display_program=cmus-status-update diff --git a/config/nvim/init.min.lua b/config/nvim/init.min.lua index e92f3b6..e199c7e 100644 --- a/config/nvim/init.min.lua +++ b/config/nvim/init.min.lua @@ -99,6 +99,11 @@ vim.api.nvim_create_autocmd({"TermOpen"}, { vim.wo.number = false end }) + +vim.api.nvim_create_autocmd({"TermOpen"}, { + pattern = {"*"}, + command = "setlocal nospell", +}) -- }}} -- netrw options {{{ diff --git a/config/sx/aristotle b/config/sx/aristotle new file mode 100755 index 0000000..12b5942 --- /dev/null +++ b/config/sx/aristotle @@ -0,0 +1,9 @@ +# sx configuration for aristotle +aristotle-status & + +xset r rate 200 80 +setxkbmap -option caps:super +pkill xcape +xcape -e 'Super_L=Escape' + +dwm diff --git a/config/sx/default.nix b/config/sx/default.nix new file mode 100644 index 0000000..22aac33 --- /dev/null +++ b/config/sx/default.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, ...}: + +{ + services.xserver = { + enable = true; + xkb.layout = "us"; + + displayManager.sx.enable = true; + }; + + environment.systemPackages = with pkgs; [ + xorg.xset + xorg.setxkbmap + xcape + xclip + ]; +} diff --git a/lappy-config/lynx/lynx.cfg b/lappy-config/lynx/lynx.cfg deleted file mode 100644 index 6ff589e..0000000 --- a/lappy-config/lynx/lynx.cfg +++ /dev/null @@ -1,56 +0,0 @@ -accept_all_cookies=off -anonftp_password= -bookmark_file=lynx_bookmarks.html -case_sensitive_searching=off -character_set=Western (ISO-8859-1) -cookie_accept_domains= -cookie_file= -cookie_loose_invalid_domains= -cookie_query_invalid_domains= -cookie_reject_domains= -cookie_strict_invalid_domains= -dir_list_order=ORDER_BY_NAME -dir_list_style=MIXED_STYLE -emacs_keys=off -file_editor= -file_sorting_method=BY_FILENAME -keypad_mode=LINKS_ARE_NOT_NUMBERED -lineedit_mode=Default Binding -multi_bookmarkB= -multi_bookmarkC= -multi_bookmarkD= -multi_bookmarkE= -multi_bookmarkF= -multi_bookmarkG= -multi_bookmarkH= -multi_bookmarkI= -multi_bookmarkJ= -multi_bookmarkK= -multi_bookmarkL= -multi_bookmarkM= -multi_bookmarkN= -multi_bookmarkO= -multi_bookmarkP= -multi_bookmarkQ= -multi_bookmarkR= -multi_bookmarkS= -multi_bookmarkT= -multi_bookmarkU= -multi_bookmarkV= -multi_bookmarkW= -multi_bookmarkX= -multi_bookmarkY= -multi_bookmarkZ= -personal_mail_address= -personal_mail_name= -preferred_charset= -preferred_language=en -select_popups=on -show_color=default -show_cursor=on -show_dotfiles=off -sub_bookmarks=OFF -user_mode=ADVANCED -verbose_images=on -vi_keys=off -visited_links=LAST_REVERSED diff --git a/lappy-config/tmux/tmux.conf b/lappy-config/tmux/tmux.conf deleted file mode 100644 index e69de29..0000000