diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-05-04 12:48:27 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-05-04 12:48:27 +0200 |
commit | 074d24c8feaa986966d9deffd8f6414f9649093c (patch) | |
tree | 66383209458700fc033476a2e8a9637de600fa6f | |
parent | 9abb75066eb50eba9ccd117e6f5bbc56ee95600f (diff) | |
download | nixos-074d24c8feaa986966d9deffd8f6414f9649093c.tar nixos-074d24c8feaa986966d9deffd8f6414f9649093c.tar.gz nixos-074d24c8feaa986966d9deffd8f6414f9649093c.tar.bz2 nixos-074d24c8feaa986966d9deffd8f6414f9649093c.tar.xz nixos-074d24c8feaa986966d9deffd8f6414f9649093c.zip |
bump
-rw-r--r-- | _sources/generated.json | 254 | ||||
-rw-r--r-- | _sources/generated.nix | 12 | ||||
-rw-r--r-- | accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs | 2 | ||||
-rw-r--r-- | accounts/gkleen@sif/xmonad/xmonad.hs | 10 | ||||
-rw-r--r-- | flake.lock | 36 |
5 files changed, 152 insertions, 162 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index c0e62d6c..0f9eb31f 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
@@ -1,196 +1,186 @@ | |||
1 | { | 1 | { |
2 | "xcompose": { | 2 | "afew": { |
3 | "cargoLocks": null, | ||
4 | "extract": null, | ||
5 | "name": "afew", | ||
6 | "passthru": null, | ||
3 | "pinned": false, | 7 | "pinned": false, |
4 | "cargoLock": null, | ||
5 | "name": "xcompose", | ||
6 | "src": { | 8 | "src": { |
7 | "deepClone": false, | 9 | "deepClone": false, |
8 | "owner": "kragen", | 10 | "fetchSubmodules": false, |
11 | "leaveDotGit": true, | ||
9 | "name": null, | 12 | "name": null, |
10 | "repo": "xcompose", | 13 | "owner": "gkleen", |
11 | "type": "github", | 14 | "repo": "afew", |
12 | "sha256": "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=", | 15 | "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", |
13 | "rev": "150c47fabb9f45e81138f71347dc75f69b5dd987", | 16 | "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=", |
14 | "leaveDotGit": false, | 17 | "type": "github" |
15 | "fetchSubmodules": false | ||
16 | }, | 18 | }, |
17 | "version": "150c47fabb9f45e81138f71347dc75f69b5dd987", | 19 | "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109" |
18 | "passthru": null, | 20 | }, |
21 | "emacs-scratch_el": { | ||
22 | "cargoLocks": null, | ||
19 | "extract": null, | 23 | "extract": null, |
20 | "rustGitDeps": null | 24 | "name": "emacs-scratch_el", |
25 | "passthru": null, | ||
26 | "pinned": false, | ||
27 | "src": { | ||
28 | "deepClone": false, | ||
29 | "fetchSubmodules": false, | ||
30 | "leaveDotGit": false, | ||
31 | "name": null, | ||
32 | "owner": "ffevotte", | ||
33 | "repo": "scratch.el", | ||
34 | "rev": "0077334cc299aa7885f804d88f52cdb1b35caf71", | ||
35 | "sha256": "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=", | ||
36 | "type": "github" | ||
37 | }, | ||
38 | "version": "0077334cc299aa7885f804d88f52cdb1b35caf71" | ||
21 | }, | 39 | }, |
22 | "fast-cli": { | 40 | "fast-cli": { |
23 | "pinned": false, | 41 | "cargoLocks": null, |
24 | "cargoLock": null, | 42 | "extract": null, |
25 | "name": "fast-cli", | 43 | "name": "fast-cli", |
44 | "passthru": null, | ||
45 | "pinned": false, | ||
26 | "src": { | 46 | "src": { |
27 | "deepClone": false, | 47 | "deepClone": false, |
28 | "owner": "gesquive", | 48 | "fetchSubmodules": false, |
49 | "leaveDotGit": false, | ||
29 | "name": null, | 50 | "name": null, |
51 | "owner": "gesquive", | ||
30 | "repo": "fast-cli", | 52 | "repo": "fast-cli", |
31 | "type": "github", | ||
32 | "sha256": "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=", | ||
33 | "rev": "v0.2.10", | 53 | "rev": "v0.2.10", |
34 | "leaveDotGit": false, | 54 | "sha256": "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=", |
35 | "fetchSubmodules": false | 55 | "type": "github" |
36 | }, | 56 | }, |
37 | "version": "v0.2.10", | 57 | "version": "v0.2.10" |
38 | "passthru": null, | ||
39 | "extract": null, | ||
40 | "rustGitDeps": null | ||
41 | }, | 58 | }, |
42 | "mpv-createchapter": { | 59 | "mpv-autosave": { |
60 | "cargoLocks": null, | ||
61 | "extract": null, | ||
62 | "name": "mpv-autosave", | ||
63 | "passthru": null, | ||
43 | "pinned": false, | 64 | "pinned": false, |
44 | "cargoLock": null, | ||
45 | "name": "mpv-createchapter", | ||
46 | "src": { | 65 | "src": { |
47 | "deepClone": false, | 66 | "deepClone": false, |
48 | "owner": "shinchiro", | 67 | "fetchSubmodules": false, |
49 | "name": null, | ||
50 | "repo": "mpv-createchapter", | ||
51 | "type": "github", | ||
52 | "sha256": "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=", | ||
53 | "rev": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", | ||
54 | "leaveDotGit": false, | 68 | "leaveDotGit": false, |
55 | "fetchSubmodules": false | 69 | "name": null, |
70 | "rev": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", | ||
71 | "sha256": "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=", | ||
72 | "type": "git", | ||
73 | "url": "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git" | ||
56 | }, | 74 | }, |
57 | "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", | 75 | "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704" |
58 | "passthru": null, | ||
59 | "extract": null, | ||
60 | "rustGitDeps": null | ||
61 | }, | 76 | }, |
62 | "v4l2loopback": { | 77 | "mpv-createchapter": { |
78 | "cargoLocks": null, | ||
79 | "extract": null, | ||
80 | "name": "mpv-createchapter", | ||
81 | "passthru": null, | ||
63 | "pinned": false, | 82 | "pinned": false, |
64 | "cargoLock": null, | ||
65 | "name": "v4l2loopback", | ||
66 | "src": { | 83 | "src": { |
67 | "deepClone": false, | 84 | "deepClone": false, |
68 | "owner": "umlaeute", | 85 | "fetchSubmodules": false, |
69 | "name": null, | ||
70 | "repo": "v4l2loopback", | ||
71 | "type": "github", | ||
72 | "sha256": "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk=", | ||
73 | "rev": "2199283ee936b9930038552b7a0890ec1736e7a2", | ||
74 | "leaveDotGit": false, | 86 | "leaveDotGit": false, |
75 | "fetchSubmodules": true | 87 | "name": null, |
88 | "owner": "shinchiro", | ||
89 | "repo": "mpv-createchapter", | ||
90 | "rev": "8dd33e2debbcb963a195ec1371e02c85b49e7faa", | ||
91 | "sha256": "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=", | ||
92 | "type": "github" | ||
76 | }, | 93 | }, |
77 | "version": "2199283ee936b9930038552b7a0890ec1736e7a2", | 94 | "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa" |
78 | "passthru": null, | ||
79 | "extract": null, | ||
80 | "rustGitDeps": null | ||
81 | }, | 95 | }, |
82 | "afew": { | 96 | "mpv-mpris": { |
97 | "cargoLocks": null, | ||
98 | "extract": null, | ||
99 | "name": "mpv-mpris", | ||
100 | "passthru": null, | ||
83 | "pinned": false, | 101 | "pinned": false, |
84 | "cargoLock": null, | ||
85 | "name": "afew", | ||
86 | "src": { | 102 | "src": { |
87 | "deepClone": false, | 103 | "deepClone": false, |
88 | "owner": "gkleen", | 104 | "fetchSubmodules": false, |
105 | "leaveDotGit": false, | ||
89 | "name": null, | 106 | "name": null, |
90 | "repo": "afew", | 107 | "owner": "hoyon", |
91 | "type": "github", | 108 | "repo": "mpv-mpris", |
92 | "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=", | 109 | "rev": "0.7.1", |
93 | "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", | 110 | "sha256": "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0=", |
94 | "leaveDotGit": true, | 111 | "type": "github" |
95 | "fetchSubmodules": false | ||
96 | }, | 112 | }, |
97 | "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", | 113 | "version": "0.7.1" |
98 | "passthru": null, | ||
99 | "extract": null, | ||
100 | "rustGitDeps": null | ||
101 | }, | 114 | }, |
102 | "mpv-reload": { | 115 | "mpv-reload": { |
103 | "pinned": false, | 116 | "cargoLocks": null, |
104 | "cargoLock": null, | 117 | "extract": null, |
105 | "name": "mpv-reload", | 118 | "name": "mpv-reload", |
106 | "src": { | ||
107 | "deepClone": false, | ||
108 | "owner": "4e6", | ||
109 | "name": null, | ||
110 | "repo": "mpv-reload", | ||
111 | "type": "github", | ||
112 | "sha256": "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=", | ||
113 | "rev": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", | ||
114 | "leaveDotGit": false, | ||
115 | "fetchSubmodules": false | ||
116 | }, | ||
117 | "version": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", | ||
118 | "passthru": null, | 119 | "passthru": null, |
119 | "extract": null, | ||
120 | "rustGitDeps": null | ||
121 | }, | ||
122 | "mpv-autosave": { | ||
123 | "pinned": false, | 120 | "pinned": false, |
124 | "cargoLock": null, | ||
125 | "name": "mpv-autosave", | ||
126 | "src": { | 121 | "src": { |
127 | "deepClone": false, | 122 | "deepClone": false, |
128 | "url": "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git", | 123 | "fetchSubmodules": false, |
129 | "name": null, | ||
130 | "type": "git", | ||
131 | "sha256": "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=", | ||
132 | "rev": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", | ||
133 | "leaveDotGit": false, | 124 | "leaveDotGit": false, |
134 | "fetchSubmodules": false | 125 | "name": null, |
126 | "owner": "4e6", | ||
127 | "repo": "mpv-reload", | ||
128 | "rev": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92", | ||
129 | "sha256": "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=", | ||
130 | "type": "github" | ||
135 | }, | 131 | }, |
136 | "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704", | 132 | "version": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92" |
137 | "passthru": null, | ||
138 | "extract": null, | ||
139 | "rustGitDeps": null | ||
140 | }, | 133 | }, |
141 | "uhk-agent": { | 134 | "uhk-agent": { |
142 | "pinned": false, | 135 | "cargoLocks": null, |
143 | "cargoLock": null, | 136 | "extract": null, |
144 | "name": "uhk-agent", | 137 | "name": "uhk-agent", |
138 | "passthru": null, | ||
139 | "pinned": false, | ||
145 | "src": { | 140 | "src": { |
146 | "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage", | ||
147 | "name": null, | 141 | "name": null, |
142 | "sha256": "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=", | ||
148 | "type": "url", | 143 | "type": "url", |
149 | "sha256": "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=" | 144 | "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage" |
150 | }, | 145 | }, |
151 | "version": "1.5.17", | 146 | "version": "1.5.17" |
152 | "passthru": null, | ||
153 | "extract": null, | ||
154 | "rustGitDeps": null | ||
155 | }, | 147 | }, |
156 | "mpv-mpris": { | 148 | "v4l2loopback": { |
149 | "cargoLocks": null, | ||
150 | "extract": null, | ||
151 | "name": "v4l2loopback", | ||
152 | "passthru": null, | ||
157 | "pinned": false, | 153 | "pinned": false, |
158 | "cargoLock": null, | ||
159 | "name": "mpv-mpris", | ||
160 | "src": { | 154 | "src": { |
161 | "deepClone": false, | 155 | "deepClone": false, |
162 | "owner": "hoyon", | 156 | "fetchSubmodules": true, |
163 | "name": null, | ||
164 | "repo": "mpv-mpris", | ||
165 | "type": "github", | ||
166 | "sha256": "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g=", | ||
167 | "rev": "0.7", | ||
168 | "leaveDotGit": false, | 157 | "leaveDotGit": false, |
169 | "fetchSubmodules": false | 158 | "name": null, |
159 | "owner": "umlaeute", | ||
160 | "repo": "v4l2loopback", | ||
161 | "rev": "d01c20cca58772e7b29faef6da393c919a4d531b", | ||
162 | "sha256": "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU=", | ||
163 | "type": "github" | ||
170 | }, | 164 | }, |
171 | "version": "0.7", | 165 | "version": "d01c20cca58772e7b29faef6da393c919a4d531b" |
172 | "passthru": null, | ||
173 | "extract": null, | ||
174 | "rustGitDeps": null | ||
175 | }, | 166 | }, |
176 | "emacs-scratch_el": { | 167 | "xcompose": { |
168 | "cargoLocks": null, | ||
169 | "extract": null, | ||
170 | "name": "xcompose", | ||
171 | "passthru": null, | ||
177 | "pinned": false, | 172 | "pinned": false, |
178 | "cargoLock": null, | ||
179 | "name": "emacs-scratch_el", | ||
180 | "src": { | 173 | "src": { |
181 | "deepClone": false, | 174 | "deepClone": false, |
182 | "owner": "ffevotte", | 175 | "fetchSubmodules": false, |
183 | "name": null, | ||
184 | "repo": "scratch.el", | ||
185 | "type": "github", | ||
186 | "sha256": "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=", | ||
187 | "rev": "0077334cc299aa7885f804d88f52cdb1b35caf71", | ||
188 | "leaveDotGit": false, | 176 | "leaveDotGit": false, |
189 | "fetchSubmodules": false | 177 | "name": null, |
178 | "owner": "kragen", | ||
179 | "repo": "xcompose", | ||
180 | "rev": "150c47fabb9f45e81138f71347dc75f69b5dd987", | ||
181 | "sha256": "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=", | ||
182 | "type": "github" | ||
190 | }, | 183 | }, |
191 | "version": "0077334cc299aa7885f804d88f52cdb1b35caf71", | 184 | "version": "150c47fabb9f45e81138f71347dc75f69b5dd987" |
192 | "passthru": null, | ||
193 | "extract": null, | ||
194 | "rustGitDeps": null | ||
195 | } | 185 | } |
196 | } \ No newline at end of file | 186 | } \ No newline at end of file |
diff --git a/_sources/generated.nix b/_sources/generated.nix index 221543dd..58a1ff0a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
@@ -61,13 +61,13 @@ | |||
61 | }; | 61 | }; |
62 | mpv-mpris = { | 62 | mpv-mpris = { |
63 | pname = "mpv-mpris"; | 63 | pname = "mpv-mpris"; |
64 | version = "0.7"; | 64 | version = "0.7.1"; |
65 | src = fetchFromGitHub ({ | 65 | src = fetchFromGitHub ({ |
66 | owner = "hoyon"; | 66 | owner = "hoyon"; |
67 | repo = "mpv-mpris"; | 67 | repo = "mpv-mpris"; |
68 | rev = "0.7"; | 68 | rev = "0.7.1"; |
69 | fetchSubmodules = false; | 69 | fetchSubmodules = false; |
70 | sha256 = "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g="; | 70 | sha256 = "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0="; |
71 | }); | 71 | }); |
72 | }; | 72 | }; |
73 | mpv-reload = { | 73 | mpv-reload = { |
@@ -91,13 +91,13 @@ | |||
91 | }; | 91 | }; |
92 | v4l2loopback = { | 92 | v4l2loopback = { |
93 | pname = "v4l2loopback"; | 93 | pname = "v4l2loopback"; |
94 | version = "2199283ee936b9930038552b7a0890ec1736e7a2"; | 94 | version = "d01c20cca58772e7b29faef6da393c919a4d531b"; |
95 | src = fetchFromGitHub ({ | 95 | src = fetchFromGitHub ({ |
96 | owner = "umlaeute"; | 96 | owner = "umlaeute"; |
97 | repo = "v4l2loopback"; | 97 | repo = "v4l2loopback"; |
98 | rev = "2199283ee936b9930038552b7a0890ec1736e7a2"; | 98 | rev = "d01c20cca58772e7b29faef6da393c919a4d531b"; |
99 | fetchSubmodules = true; | 99 | fetchSubmodules = true; |
100 | sha256 = "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk="; | 100 | sha256 = "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU="; |
101 | }); | 101 | }); |
102 | }; | 102 | }; |
103 | xcompose = { | 103 | xcompose = { |
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs index 729941aa..998c533e 100644 --- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs +++ b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs | |||
@@ -137,7 +137,7 @@ connParser = do | |||
137 | sshPrompt :: [Override] -> XPConfig -> X () | 137 | sshPrompt :: [Override] -> XPConfig -> X () |
138 | sshPrompt o c = do | 138 | sshPrompt o c = do |
139 | sc <- io sshComplList | 139 | sc <- io sshComplList |
140 | mkXPrompt Ssh c (mkComplFunFromList sc) $ ssh o | 140 | mkXPrompt Ssh c (mkComplFunFromList c sc) $ ssh o |
141 | 141 | ||
142 | ssh :: [Override] -> String -> X () | 142 | ssh :: [Override] -> String -> X () |
143 | ssh overrides str = do | 143 | ssh overrides str = do |
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs index 7a71ca56..8f66bf39 100644 --- a/accounts/gkleen@sif/xmonad/xmonad.hs +++ b/accounts/gkleen@sif/xmonad/xmonad.hs | |||
@@ -235,7 +235,7 @@ hostFromName h | |||
235 | , hWsp = hWsp | 235 | , hWsp = hWsp |
236 | , hCoWsp = hCoWsp | 236 | , hCoWsp = hCoWsp |
237 | , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) | 237 | , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) |
238 | , (xK_d, [fromString browser, "google-chrome", "notmuch-links"]) | 238 | , (xK_d, [fromString browser, "google-chrome" {- , "notmuch-links" -}]) |
239 | , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ]) | 239 | , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ]) |
240 | , (xK_g, ["pidgin"]) | 240 | , (xK_g, ["pidgin"]) |
241 | , (xK_s, ["skype"]) | 241 | , (xK_s, ["skype"]) |
@@ -249,10 +249,10 @@ hostFromName h | |||
249 | , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)" | 249 | , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)" |
250 | , "alacritty --class media -e tmuxp load /var/media" | 250 | , "alacritty --class media -e tmuxp load /var/media" |
251 | ]) | 251 | ]) |
252 | , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'" | 252 | {- , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'" |
253 | , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'" | 253 | , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'" |
254 | , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\"" | 254 | , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\"" |
255 | ]) | 255 | ]) -} |
256 | , (xK_Return, ["keynav start,windowzoom", "keynav start"]) | 256 | , (xK_Return, ["keynav start,windowzoom", "keynav start"]) |
257 | , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime]) | 257 | , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime]) |
258 | , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix]) | 258 | , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix]) |
@@ -411,7 +411,7 @@ hostFromName h | |||
411 | (first : rest) = filter (not . null) $ lines result | 411 | (first : rest) = filter (not . null) $ lines result |
412 | notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc" | 412 | notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc" |
413 | void $ Notify.display notification | 413 | void $ Notify.display notification |
414 | synergyCompl = mkComplFunFromList' ["mathw86"] | 414 | synergyCompl = mkComplFunFromList' xPConfigMonospace ["mathw86"] |
415 | synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"] | 415 | synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"] |
416 | synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"] | 416 | synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"] |
417 | 417 | ||
@@ -603,7 +603,7 @@ main = do | |||
603 | userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id | 603 | userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id |
604 | | otherwise = return () | 604 | | otherwise = return () |
605 | handle _ = return () | 605 | handle _ = return () |
606 | handle shutdown $ launch myConfig | 606 | handle shutdown $ launch myConfig =<< getDirectories |
607 | 607 | ||
608 | secs :: Int -> Int | 608 | secs :: Int -> Int |
609 | secs = (* 1000000) | 609 | secs = (* 1000000) |
@@ -28,11 +28,11 @@ | |||
28 | "flake-compat": { | 28 | "flake-compat": { |
29 | "flake": false, | 29 | "flake": false, |
30 | "locked": { | 30 | "locked": { |
31 | "lastModified": 1648199409, | 31 | "lastModified": 1650374568, |
32 | "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", | 32 | "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", |
33 | "owner": "edolstra", | 33 | "owner": "edolstra", |
34 | "repo": "flake-compat", | 34 | "repo": "flake-compat", |
35 | "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", | 35 | "rev": "b4a34015c698c7793d592d66adbab377907a2be8", |
36 | "type": "github" | 36 | "type": "github" |
37 | }, | 37 | }, |
38 | "original": { | 38 | "original": { |
@@ -44,11 +44,11 @@ | |||
44 | }, | 44 | }, |
45 | "flake-utils": { | 45 | "flake-utils": { |
46 | "locked": { | 46 | "locked": { |
47 | "lastModified": 1638122382, | 47 | "lastModified": 1649676176, |
48 | "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", | 48 | "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", |
49 | "owner": "numtide", | 49 | "owner": "numtide", |
50 | "repo": "flake-utils", | 50 | "repo": "flake-utils", |
51 | "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", | 51 | "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", |
52 | "type": "github" | 52 | "type": "github" |
53 | }, | 53 | }, |
54 | "original": { | 54 | "original": { |
@@ -64,11 +64,11 @@ | |||
64 | ] | 64 | ] |
65 | }, | 65 | }, |
66 | "locked": { | 66 | "locked": { |
67 | "lastModified": 1648366999, | 67 | "lastModified": 1651652192, |
68 | "narHash": "sha256-Sdm0lI2ZBc70EnMMmvfDVY7gIM3M4c2L86EdQ9tKRE4=", | 68 | "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=", |
69 | "owner": "nix-community", | 69 | "owner": "nix-community", |
70 | "repo": "home-manager", | 70 | "repo": "home-manager", |
71 | "rev": "888eac32bd657bfe0d024c8770130d80d1c02cd3", | 71 | "rev": "267462dfb36d447421c789a3adf9d460cd09c147", |
72 | "type": "github" | 72 | "type": "github" |
73 | }, | 73 | }, |
74 | "original": { | 74 | "original": { |
@@ -80,11 +80,11 @@ | |||
80 | }, | 80 | }, |
81 | "nixpkgs": { | 81 | "nixpkgs": { |
82 | "locked": { | 82 | "locked": { |
83 | "lastModified": 1648550259, | 83 | "lastModified": 1651654660, |
84 | "narHash": "sha256-IXQb7TB3u5L/yh4o6tgQ8J961Ogedm0sn7cUVExM22E=", | 84 | "narHash": "sha256-ZuQ3wQwIEwqBAEOeL/mY5dV0pxuz7OIz/lzeLBIskAE=", |
85 | "owner": "NixOS", | 85 | "owner": "NixOS", |
86 | "repo": "nixpkgs", | 86 | "repo": "nixpkgs", |
87 | "rev": "6d630c2dbc4fa2968bece12b508b0310bb2c7607", | 87 | "rev": "c04ef155994d060aceedf946eeba0ab756b19c01", |
88 | "type": "github" | 88 | "type": "github" |
89 | }, | 89 | }, |
90 | "original": { | 90 | "original": { |
@@ -105,11 +105,11 @@ | |||
105 | ] | 105 | ] |
106 | }, | 106 | }, |
107 | "locked": { | 107 | "locked": { |
108 | "lastModified": 1648145722, | 108 | "lastModified": 1650169042, |
109 | "narHash": "sha256-iC04ukXdms4XnvKh/o1LoYXDiAURD6y0vae8V6ovQfw=", | 109 | "narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=", |
110 | "owner": "berberman", | 110 | "owner": "berberman", |
111 | "repo": "nvfetcher", | 111 | "repo": "nvfetcher", |
112 | "rev": "daea67a8b6ec8aa89eb3a474c3d9e9ce2b2cc6f1", | 112 | "rev": "db780dba6923e531b5aedca502a36d3d9627fca9", |
113 | "type": "github" | 113 | "type": "github" |
114 | }, | 114 | }, |
115 | "original": { | 115 | "original": { |
@@ -136,11 +136,11 @@ | |||
136 | ] | 136 | ] |
137 | }, | 137 | }, |
138 | "locked": { | 138 | "locked": { |
139 | "lastModified": 1647279403, | 139 | "lastModified": 1649756291, |
140 | "narHash": "sha256-ZsHfMah9+TElcjaENsaOIFHBNNtSbXmyLFVbiJiAECs=", | 140 | "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", |
141 | "owner": "Mic92", | 141 | "owner": "Mic92", |
142 | "repo": "sops-nix", | 142 | "repo": "sops-nix", |
143 | "rev": "c01f48b055ac776f9831c9d4a0fff83e3b74dbe3", | 143 | "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", |
144 | "type": "github" | 144 | "type": "github" |
145 | }, | 145 | }, |
146 | "original": { | 146 | "original": { |