about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-27 16:55:44 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-27 16:55:44 +0000
commit027548af22217897d93d9e0412120944f6cf728e (patch)
treed3eea9fa96ff59eb299b8f5d8052064ba6b90677
parenta40d82c11622a60770fd6ec18b7dcc91dff94071 (diff)
downloadnixlib-027548af22217897d93d9e0412120944f6cf728e.tar
nixlib-027548af22217897d93d9e0412120944f6cf728e.tar.gz
nixlib-027548af22217897d93d9e0412120944f6cf728e.tar.bz2
nixlib-027548af22217897d93d9e0412120944f6cf728e.tar.lz
nixlib-027548af22217897d93d9e0412120944f6cf728e.tar.xz
nixlib-027548af22217897d93d9e0412120944f6cf728e.tar.zst
nixlib-027548af22217897d93d9e0412120944f6cf728e.zip
dictDBs.epo2eng: init at 1.0.1
-rw-r--r--modules/workstation/hardware/default.nix2
-rw-r--r--nixpkgs/pkgs/servers/dict/dictd-db.nix4
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix
index 18b43e6dc4f3..d2b13640277c 100644
--- a/modules/workstation/hardware/default.nix
+++ b/modules/workstation/hardware/default.nix
@@ -7,7 +7,7 @@ in
 {
   i18n.consoleUseXkbConfig = true;
   services.xserver.layout = "dvorak";
-  services.xserver.xkbOptions = "ctrl:nocaps";
+  services.xserver.xkbOptions = "ctrl:nocaps,compose:menu";
 
   environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout;
   environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions;
diff --git a/nixpkgs/pkgs/servers/dict/dictd-db.nix b/nixpkgs/pkgs/servers/dict/dictd-db.nix
index 065218a5b95d..c611f87346c7 100644
--- a/nixpkgs/pkgs/servers/dict/dictd-db.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix
@@ -56,6 +56,10 @@ in rec {
     url = mirror://sourceforge/freedict/eng-fra.tar.gz;
     sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";
   }) "eng-fra" "en_UK";
+  epo2eng = makeDictdDB (fetchurl {
+    url = https://download.freedict.org/dictionaries/epo-eng/1.0.1/freedict-epo-eng-1.0.1.dictd.tar.xz;
+    sha256 = "1j2nds35f9nw3wr29xay124xsp8455k2l3hqr537dcq69cvwwkkl";
+  }) "epo-eng" "epo-eng" "eo";
   mueller_eng2rus_pkg = makeDictdDB (fetchurl {
     url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz;
     sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";