diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-12 00:25:56 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-12 00:25:56 +0100 |
commit | 45cbd03cf9c4732fa0746a97e9c0cd93806725db (patch) | |
tree | 2f0ce8c6c6fb950d606d4a09ee165d326c1e35ca | |
parent | 2307570f3f0b6cc630589195ef18ad8ed4cddbf0 (diff) | |
download | Nix-45cbd03cf9c4732fa0746a97e9c0cd93806725db.tar.gz Nix-45cbd03cf9c4732fa0746a97e9c0cd93806725db.tar.zst Nix-45cbd03cf9c4732fa0746a97e9c0cd93806725db.zip |
Add vnc server programs
-rw-r--r-- | default.nix | 7 | ||||
-rw-r--r-- | patches/dwm_config.h | 98 |
2 files changed, 105 insertions, 0 deletions
diff --git a/default.nix b/default.nix index 5268565..444d29d 100644 --- a/default.nix +++ b/default.nix | |||
@@ -618,6 +618,12 @@ let | |||
618 | '') zippedFiles)} | 618 | '') zippedFiles)} |
619 | ''; | 619 | ''; |
620 | 620 | ||
621 | mypkgs.dwm = dwm.overrideAttrs(old: rec { | ||
622 | postPatch = '' | ||
623 | cp ${./patches/dwm_config.h} ./config.h | ||
624 | ''; | ||
625 | }); | ||
626 | |||
621 | # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh | 627 | # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh |
622 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks | 628 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks |
623 | in | 629 | in |
@@ -680,4 +686,5 @@ in | |||
680 | inherit fetchmail; | 686 | inherit fetchmail; |
681 | inherit bc; | 687 | inherit bc; |
682 | inherit cpulimit; | 688 | inherit cpulimit; |
689 | inherit dmenu st; | ||
683 | } | 690 | } |
diff --git a/patches/dwm_config.h b/patches/dwm_config.h new file mode 100644 index 0000000..b1587e8 --- /dev/null +++ b/patches/dwm_config.h | |||
@@ -0,0 +1,98 @@ | |||
1 | /* See LICENSE file for copyright and license details. */ | ||
2 | |||
3 | /* appearance */ | ||
4 | static const unsigned int borderpx = 1; /* border pixel of windows */ | ||
5 | static const unsigned int snap = 32; /* snap pixel */ | ||
6 | static const int showbar = 1; /* 0 means no bar */ | ||
7 | static const int topbar = 1; /* 0 means bottom bar */ | ||
8 | static const char *fonts[] = { "monospace:size=10" }; | ||
9 | static const char dmenufont[] = "monospace:size=10"; | ||
10 | static const char col_gray1[] = "#222222"; | ||
11 | static const char col_gray2[] = "#444444"; | ||
12 | static const char col_gray3[] = "#bbbbbb"; | ||
13 | static const char col_gray4[] = "#eeeeee"; | ||
14 | static const char col_cyan[] = "#005577"; | ||
15 | static 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 */ | ||
22 | static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; | ||
23 | |||
24 | static 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) */ | ||
34 | static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ | ||
35 | static const int nmaster = 1; /* number of clients in master area */ | ||
36 | static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ | ||
37 | |||
38 | static 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 */ | ||
57 | static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ | ||
58 | static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; | ||
59 | static const char *termcmd[] = { "st", NULL }; | ||
60 | |||
61 | static 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 */ | ||
84 | static 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 | |||