aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-26 13:52:30 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-26 13:57:04 +0200
commit676e68e3394eeb07a02745d1cf191db9fee9e610 (patch)
tree973c57072eb9b784adab83fab8748d05a7ffc9c3 /patches
parent98de2045a749b25d031b174c940096b4f5406b9d (diff)
downloadNix-676e68e3394eeb07a02745d1cf191db9fee9e610.tar.gz
Nix-676e68e3394eeb07a02745d1cf191db9fee9e610.tar.zst
Nix-676e68e3394eeb07a02745d1cf191db9fee9e610.zip
Use overlays for package overrides
Diffstat (limited to 'patches')
-rw-r--r--patches/dwm_config.h98
-rw-r--r--patches/pass-fix-pass-init.patch42
2 files changed, 0 insertions, 140 deletions
diff --git a/patches/dwm_config.h b/patches/dwm_config.h
deleted file mode 100644
index b1587e8..0000000
--- a/patches/dwm_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
1/* See LICENSE file for copyright and license details. */
2
3/* appearance */
4static const unsigned int borderpx = 1; /* border pixel of windows */
5static const unsigned int snap = 32; /* snap pixel */
6static const int showbar = 1; /* 0 means no bar */
7static const int topbar = 1; /* 0 means bottom bar */
8static const char *fonts[] = { "monospace:size=10" };
9static const char dmenufont[] = "monospace:size=10";
10static const char col_gray1[] = "#222222";
11static const char col_gray2[] = "#444444";
12static const char col_gray3[] = "#bbbbbb";
13static const char col_gray4[] = "#eeeeee";
14static const char col_cyan[] = "#005577";
15static const char *colors[][3] = {
16 /* fg bg border */
17 [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
18 [SchemeSel] = { col_gray4, col_cyan, col_cyan },
19};
20
21/* tagging */
22static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
23
24static const Rule rules[] = {
25 /* xprop(1):
26 * WM_CLASS(STRING) = instance, class
27 * WM_NAME(STRING) = title
28 */
29 /* class instance title tags mask isfloating monitor */
30 { "Nextcloud", NULL, NULL, 9 << 8, 0, -1 },
31};
32
33/* layout(s) */
34static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
35static const int nmaster = 1; /* number of clients in master area */
36static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
37
38static const Layout layouts[] = {
39 /* symbol arrange function */
40 { "[M]", monocle }, /* first entry is default */
41 { "[]=", tile },
42 { "><>", NULL }, /* no layout function means floating behavior */
43};
44
45/* key definitions */
46#define MODKEY Mod1Mask
47#define TAGKEYS(KEY,TAG) \
48 { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
49 { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
50 { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
51 { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
52
53/* helper for spawning shell commands in the pre dwm-5.0 fashion */
54#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
55
56/* commands */
57static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
58static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
59static const char *termcmd[] = { "st", NULL };
60
61static Key keys[] = {
62 /* modifier key function argument */
63 { MODKEY, XK_p, spawn, {.v = dmenucmd } },
64 { MODKEY, XK_t, spawn, {.v = termcmd } },
65 { MODKEY, XK_Tab, view, {0} },
66 { MODKEY|ShiftMask, XK_c, killclient, {0} },
67 { MODKEY, XK_j, focusstack, {.i = +1 } },
68 { MODKEY, XK_k, focusstack, {.i = -1 } },
69 { MODKEY, XK_Return, zoom, {0} },
70 TAGKEYS( XK_1, 0)
71 TAGKEYS( XK_2, 1)
72 TAGKEYS( XK_3, 2)
73 TAGKEYS( XK_4, 3)
74 TAGKEYS( XK_5, 4)
75 TAGKEYS( XK_6, 5)
76 TAGKEYS( XK_7, 6)
77 TAGKEYS( XK_8, 7)
78 TAGKEYS( XK_9, 8)
79 { MODKEY|ShiftMask, XK_q, quit, {0} },
80};
81
82/* button definitions */
83/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
84static Button buttons[] = {
85 /* click event mask button function argument */
86 { ClkLtSymbol, 0, Button1, setlayout, {0} },
87 { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
88 { ClkWinTitle, 0, Button2, zoom, {0} },
89 { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
90 { ClkClientWin, MODKEY, Button1, movemouse, {0} },
91 { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
92 { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
93 { ClkTagBar, 0, Button1, view, {0} },
94 { ClkTagBar, 0, Button3, toggleview, {0} },
95 { ClkTagBar, MODKEY, Button1, tag, {0} },
96 { ClkTagBar, MODKEY, Button3, toggletag, {0} },
97};
98
diff --git a/patches/pass-fix-pass-init.patch b/patches/pass-fix-pass-init.patch
deleted file mode 100644
index 10a76c1..0000000
--- a/patches/pass-fix-pass-init.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 33e8f1cd0065639a948d7b5ba3f93d43bdf7f3be Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
3Date: Sun, 11 Nov 2018 19:47:33 +0100
4Subject: [PATCH] Fix pass init for some gpg keys
5
6This fixes the pass init for gpg keys which have their main key as
7encryption key. This may happen for instance with RSA keys and specific
8configuration.
9---
10 src/password-store.sh | 2 +-
11 tests/t0300-reencryption.sh | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/password-store.sh b/src/password-store.sh
15index d89d455..44d122e 100755
16--- a/src/password-store.sh
17+++ b/src/password-store.sh
18@@ -124,7 +124,7 @@ reencrypt_path() {
19 IFS=";" eval 'GPG_RECIPIENTS+=( $group )' # http://unix.stackexchange.com/a/92190
20 unset "GPG_RECIPIENTS[$index]"
21 done
22- gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/^sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)"
23+ gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/^[ps]ub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)"
24 fi
25 current_keys="$(LC_ALL=C $GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | sed -n 's/^gpg: public key is \([A-F0-9]\+\)$/\1/p' | LC_ALL=C sort -u)"
26
27diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh
28index 3c88987..57d873f 100755
29--- a/tests/t0300-reencryption.sh
30+++ b/tests/t0300-reencryption.sh
31@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
32 INITIAL_PASSWORD="will this password live? a big question indeed..."
33
34 canonicalize_gpg_keys() {
35- $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u
36+ $GPG --list-keys --with-colons "$@" | sed -n 's/[ps]ub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u
37 }
38 gpg_keys_from_encrypted_file() {
39 $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | grep "public key is" | cut -d ' ' -f 5 | LC_ALL=C sort -u
40--
412.19.1
42
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 11:38:07 +0000