diff --git a/arch-setup/chroot.sh b/arch-setup/chroot.sh index d0981953..c71dfc64 100755 --- a/arch-setup/chroot.sh +++ b/arch-setup/chroot.sh @@ -8,11 +8,13 @@ echo "LANG=en_US.UTF-8" > /etc/locale.conf curl https://blackarch.org/strap.sh > /tmp/strap.sh chmod +x /tmp/strap.sh /tmp/strap.sh -echo "tatooine" > /etc/hostname +echo "Please enter hostname: " +read hostname +echo $hostname > /etc/hostname systemctl enable fstrim.timer -echo -e "127.0.0.1 localhost\n::1 localhost\n127.0.0.1 tatooine.localdomain tatooine" > /etc/hosts +echo -e "127.0.0.1 localhost\n::1 localhost\n127.0.0.1 $hostname.localdomain $hostname" > /etc/hosts cat << EOF > /etc/mkinitcpio.conf MODULES=(vfat i915) BINARIES=() @@ -62,7 +64,9 @@ cat << EOF > /boot/refind_linux.conf "Boot with encryption" "root=/dev/mapper/root resume=/dev/mapper/swap cryptdevice=UUID=$(blkid -s UUID -o value $(cat /install/device)3):root:allow-discards cryptkey=UUID=$uuid:vfat:key.yeet rw loglevel=3 quiet splash" EOF -echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers +echo "$username $hostname =NOPASSWD: /usr/bin/systemctl poweroff,/usr/bin/systemctl halt,/usr/bin/systemctl reboot,/usr/bin/systemctl hibernate" >> /etc/sudoers +echo "Defaults env_reset,pwfeedback" >> /etc/sudoers +echo "%wheel ALL=(ALL) NOSPASSWD: ALL" >> /etc/sudoers echo "Please enter name for regular user:" read username @@ -96,12 +100,17 @@ echo -e "/boot/EFI/refind\n2\n2" | sudo bash -c "$(curl -fsSL https://raw.github systemctl enable NetworkManager systemctl enable ly +systemctl enable cronie mkinitcpio -P vim /etc/fstab pacman -R nano # uninstall nano, eww +sed -i '$ d' /etc/sudoers # Fix sudo +echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers + + echo "SETUP COMPLETE" exit diff --git a/backgrounds/wallpaper.jpg b/backgrounds/wallpaper.jpg index 456280fa..2c4cb66e 100644 Binary files a/backgrounds/wallpaper.jpg and b/backgrounds/wallpaper.jpg differ diff --git a/fetch_keys.sh b/fetch_keys.sh new file mode 100755 index 00000000..ff3be464 --- /dev/null +++ b/fetch_keys.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +echo "Please enter the location of image file: " +read loc + +~/.scripts/jsteg reveal $loc > /tmp/out.zip.gpg + +echo "Please enter your passphrase: " +gpg -d /tmp/out.zip.gpg > /tmp/out.zip + +unzip /tmp/out.zip -d /tmp/keys + +gpg --import /tmp/keys/gpg.key + +mkdir -p ~/.ssh + +cp /tmp/keys/id_* ~/.ssh + + + diff --git a/scripts/dmenu-logout b/scripts/dmenu-logout index 52649b84..87a1097e 100755 --- a/scripts/dmenu-logout +++ b/scripts/dmenu-logout @@ -46,16 +46,16 @@ case $selection in logout ;; hibernate) - systemctl hibernate + sudo systemctl hibernate ;; suspend) - systemctl suspend + sudo systemctl suspend ;; reboot) - systemctl reboot + sudo systemctl reboot ;; halt|poweroff|shutdown) - systemctl poweroff + sudo systemctl poweroff ;; esac diff --git a/suckless/dmenu/dmenu-fuzzymatch-4.9.diff.1 b/suckless/dmenu/dmenu-fuzzymatch-4.9.diff.1 deleted file mode 100644 index 9fd206d8..00000000 --- a/suckless/dmenu/dmenu-fuzzymatch-4.9.diff.1 +++ /dev/null @@ -1,163 +0,0 @@ -From 94353eb52055927d9079f3d9e33da1c954abf386 Mon Sep 17 00:00:00 2001 -From: aleks -Date: Wed, 26 Jun 2019 13:25:10 +0200 -Subject: [PATCH] Add support for fuzzy-matching - ---- - config.def.h | 1 + - config.mk | 2 +- - dmenu.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 91 insertions(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index 1edb647..51612b9 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -2,6 +2,7 @@ - /* Default settings; can be overriden by command line. */ - - static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ -+static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */ - /* -fn option overrides fonts[0]; default X11 font or font set */ - static const char *fonts[] = { - "monospace:size=10" -diff --git a/config.mk b/config.mk -index 0929b4a..d14309a 100644 ---- a/config.mk -+++ b/config.mk -@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2 - - # includes and libs - INCS = -I$(X11INC) -I$(FREETYPEINC) --LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm - - # flags - CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) -diff --git a/dmenu.c b/dmenu.c -index 6b8f51b..96ddc98 100644 ---- a/dmenu.c -+++ b/dmenu.c -@@ -1,6 +1,7 @@ - /* See LICENSE file for copyright and license details. */ - #include - #include -+#include - #include - #include - #include -@@ -32,6 +33,7 @@ struct item { - char *text; - struct item *left, *right; - int out; -+ double distance; - }; - - static char text[BUFSIZ] = ""; -@@ -210,9 +212,94 @@ grabkeyboard(void) - die("cannot grab keyboard"); - } - -+int -+compare_distance(const void *a, const void *b) -+{ -+ struct item *da = *(struct item **) a; -+ struct item *db = *(struct item **) b; -+ -+ if (!db) -+ return 1; -+ if (!da) -+ return -1; -+ -+ return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1; -+} -+ -+void -+fuzzymatch(void) -+{ -+ /* bang - we have so much memory */ -+ struct item *it; -+ struct item **fuzzymatches = NULL; -+ char c; -+ int number_of_matches = 0, i, pidx, sidx, eidx; -+ int text_len = strlen(text), itext_len; -+ -+ matches = matchend = NULL; -+ -+ /* walk through all items */ -+ for (it = items; it && it->text; it++) { -+ if (text_len) { -+ itext_len = strlen(it->text); -+ pidx = 0; /* pointer */ -+ sidx = eidx = -1; /* start of match, end of match */ -+ /* walk through item text */ -+ for (i = 0; i < itext_len && (c = it->text[i]); i++) { -+ /* fuzzy match pattern */ -+ if (!fstrncmp(&text[pidx], &c, 1)) { -+ if(sidx == -1) -+ sidx = i; -+ pidx++; -+ if (pidx == text_len) { -+ eidx = i; -+ break; -+ } -+ } -+ } -+ /* build list of matches */ -+ if (eidx != -1) { -+ /* compute distance */ -+ /* add penalty if match starts late (log(sidx+2)) -+ * add penalty for long a match without many matching characters */ -+ it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len); -+ /* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */ -+ appenditem(it, &matches, &matchend); -+ number_of_matches++; -+ } -+ } else { -+ appenditem(it, &matches, &matchend); -+ } -+ } -+ -+ if (number_of_matches) { -+ /* initialize array with matches */ -+ if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*)))) -+ die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*)); -+ for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) { -+ fuzzymatches[i] = it; -+ } -+ /* sort matches according to distance */ -+ qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance); -+ /* rebuild list of matches */ -+ matches = matchend = NULL; -+ for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \ -+ it->text; i++, it = fuzzymatches[i]) { -+ appenditem(it, &matches, &matchend); -+ } -+ free(fuzzymatches); -+ } -+ curr = sel = matches; -+ calcoffsets(); -+} -+ - static void - match(void) - { -+ if (fuzzy) { -+ fuzzymatch(); -+ return; -+ } - static char **tokv = NULL; - static int tokn = 0; - -@@ -702,6 +789,8 @@ main(int argc, char *argv[]) - topbar = 0; - else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ - fast = 1; -+ else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */ -+ fuzzy = 0; - else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ - fstrncmp = strncasecmp; - fstrstr = cistrstr; --- -2.22.0 - diff --git a/suckless/dmenu/dmenu-password-4.9.diff b/suckless/dmenu/dmenu-password-4.9.diff new file mode 100644 index 00000000..55871a61 --- /dev/null +++ b/suckless/dmenu/dmenu-password-4.9.diff @@ -0,0 +1,88 @@ +diff -up dmenu-4.9/dmenu.1 dmenu-4.9-orig/dmenu.1 +--- dmenu-4.9/dmenu.1 2019-09-25 12:55:42.666319316 -0600 ++++ dmenu-4.9-orig/dmenu.1 2019-09-25 12:48:38.848249931 -0600 +@@ -3,7 +3,7 @@ + dmenu \- dynamic menu + .SH SYNOPSIS + .B dmenu +-.RB [ \-bfivP ] ++.RB [ \-bfiv ] + .RB [ \-l + .IR lines ] + .RB [ \-m +@@ -47,9 +47,6 @@ is faster, but will lock up X until stdi + .B \-i + dmenu matches menu items case insensitively. + .TP +-.B \-P +-dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +-.TP + .BI \-l " lines" + dmenu lists items vertically, with the given number of lines. + .TP +diff -up dmenu-4.9/dmenu.c dmenu-4.9-orig/dmenu.c +--- dmenu-4.9/dmenu.c 2019-09-25 12:48:55.756173240 -0600 ++++ dmenu-4.9-orig/dmenu.c 2019-09-25 12:48:38.848249931 -0600 +@@ -37,7 +37,7 @@ struct item { + static char text[BUFSIZ] = ""; + static char *embed; + static int bh, mw, mh; +-static int inputw = 0, promptw, passwd = 0; ++static int inputw = 0, promptw; + static int lrpad; /* sum of left and right padding */ + static size_t cursor; + static struct item *items = NULL; +@@ -132,7 +132,6 @@ drawmenu(void) + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; +- char *censort; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); +@@ -144,12 +143,7 @@ drawmenu(void) + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); +- if (passwd) { +- censort = ecalloc(1, sizeof(text)); +- memset(censort, '.', strlen(text)); +- drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); +- free(censort); +- } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); ++ drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { +@@ -531,11 +525,6 @@ readstdin(void) + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + +- if(passwd){ +- inputw = lines = 0; +- return; +- } +- + /* read each line from stdin and add it to the item list */ + for (i = 0; fgets(buf, sizeof buf, stdin); i++) { + if (i + 1 >= size / sizeof *items) +@@ -693,7 +682,7 @@ setup(void) + static void + usage(void) + { +- fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" ++ fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); + exit(1); + } +@@ -716,9 +705,7 @@ main(int argc, char *argv[]) + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; +- } else if (!strcmp(argv[i], "-P")) /* is the input a password */ +- passwd = 1; +- else if (i + 1 == argc) ++ } else if (i + 1 == argc) + usage(); + /* these options take one argument */ + else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ diff --git a/suckless/dmenu/dmenu.1 b/suckless/dmenu/dmenu.1 index 30a3ee28..84e70240 100644 --- a/suckless/dmenu/dmenu.1 +++ b/suckless/dmenu/dmenu.1 @@ -3,7 +3,7 @@ dmenu \- dynamic menu .SH SYNOPSIS .B dmenu -.RB [ \-bfiv ] +.RB [ \-bfivP ] .RB [ \-l .IR lines ] .RB [ \-h @@ -63,6 +63,9 @@ is faster, but will lock up X until stdin reaches end\-of\-file. .B \-i dmenu matches menu items case insensitively. .TP +.B \-P +dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +.TP .BI \-l " lines" dmenu lists items vertically, with the given number of lines. .TP diff --git a/suckless/dmenu/dmenu.c b/suckless/dmenu/dmenu.c index c76de848..460643b4 100644 --- a/suckless/dmenu/dmenu.c +++ b/suckless/dmenu/dmenu.c @@ -41,7 +41,7 @@ static int hplength = 0; static char text[BUFSIZ] = ""; static char *embed; static int bh, mw, mh; -static int inputw = 0, promptw; +static int inputw = 0, promptw, passwd = 0; static int lrpad; /* sum of left and right padding */ static size_t cursor; static struct item *items = NULL; @@ -53,6 +53,7 @@ static Atom clip, utf8; static Display *dpy; static Window root, parentwin, win; static XIC xic; +char *censort; static Drw *drw; static Clr *scheme[SchemeLast]; @@ -222,7 +223,14 @@ drawmenu(void) /* draw input field */ w = (lines > 0 || !matches) ? mw - x : inputw; drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + if (passwd) { + censort = ecalloc(1, sizeof(text)); + memset(censort, '*', strlen(text)); + drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); + free(censort); + } else { + drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + } curpos = TEXTW(text) - TEXTW(&text[cursor]); if ((curpos += lrpad / 2 - 1) < w) { @@ -699,6 +707,10 @@ readstdin(void) size_t i, imax = 0, size = 0; unsigned int tmpmax = 0; + if(passwd){ + inputw = lines = 0; + return; + } /* read each line from stdin and add it to the item list */ for (i = 0; fgets(buf, sizeof buf, stdin); i++) { if (i + 1 >= size / sizeof *items) @@ -890,6 +902,8 @@ main(int argc, char *argv[]) else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; + } else if (!strcmp(argv[i], "-P")){ /* is the input a password */ + passwd = 1; } else if (i + 1 == argc) usage(); /* these options take one argument */ diff --git a/suckless/dmenu/dmenu-fuzzyhighlight-4.9.diff b/suckless/dmenu/patches/dmenu-fuzzyhighlight-4.9.diff similarity index 100% rename from suckless/dmenu/dmenu-fuzzyhighlight-4.9.diff rename to suckless/dmenu/patches/dmenu-fuzzyhighlight-4.9.diff diff --git a/suckless/dmenu/dmenu-fuzzymatch-4.9.diff b/suckless/dmenu/patches/dmenu-fuzzymatch-4.9.diff similarity index 100% rename from suckless/dmenu/dmenu-fuzzymatch-4.9.diff rename to suckless/dmenu/patches/dmenu-fuzzymatch-4.9.diff diff --git a/suckless/dmenu/dmenu-highpriority-4.9.diff b/suckless/dmenu/patches/dmenu-highpriority-4.9.diff similarity index 100% rename from suckless/dmenu/dmenu-highpriority-4.9.diff rename to suckless/dmenu/patches/dmenu-highpriority-4.9.diff diff --git a/suckless/dmenu/dmenu-lineheight-5.0.diff b/suckless/dmenu/patches/dmenu-lineheight-5.0.diff similarity index 100% rename from suckless/dmenu/dmenu-lineheight-5.0.diff rename to suckless/dmenu/patches/dmenu-lineheight-5.0.diff diff --git a/suckless/dmenu/dmenu-xyw-5.0.diff b/suckless/dmenu/patches/dmenu-xyw-5.0.diff similarity index 100% rename from suckless/dmenu/dmenu-xyw-5.0.diff rename to suckless/dmenu/patches/dmenu-xyw-5.0.diff diff --git a/suckless/dwm/rules.h b/suckless/dwm/rules.h index d3e8f311..8ead2390 100644 --- a/suckless/dwm/rules.h +++ b/suckless/dwm/rules.h @@ -27,7 +27,7 @@ static const Rule rules[] = { RULE(.instance = "spsxiv", .tags = SPTAG(1), .isfloating = 1) RULE(.instance = "spmutt", .tags = SPTAG(2), .isfloating = 1) RULE(.class = "ranger", 0, .isfloating = 1) - RULE(.class = "vim", 0, .isfloating = 1) + RULE(.class = "vim", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "mpv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.class = "Sxiv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 1000W 700H")