From d818c16e8f518acde0f1351ec893c3322c50b8ae Mon Sep 17 00:00:00 2001 From: larstvei Date: Sun, 21 Jul 2024 15:35:08 +0200 Subject: [PATCH] Use hunspell instead of aspell --- flake.lock | 217 +++++++++++------------------------------------ modules/home.nix | 10 +-- 2 files changed, 50 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index 2a20828..578f6f1 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,13 @@ } }, "emacs-config": { - "inputs": { - "emacs-overlay": "emacs-overlay", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, + "flake": false, "locked": { - "lastModified": 1721434799, - "narHash": "sha256-BRP4bCKvgyJAoE/x2faWldh41t236YdwiOzcwBzQSe0=", + "lastModified": 1721497986, + "narHash": "sha256-Z3Lx7334AiV/g0VYMZw0QLaZbnyLbEhKUvc0uAOTgNo=", "owner": "larstvei", "repo": "dot-emacs", - "rev": "f82b34ffb2c5d6aa2cdc5ebae38a4f24d217ff2d", + "rev": "8d5c90d13f16e09e13ecffde45523b27134b6c6b", "type": "github" }, "original": { @@ -43,16 +39,17 @@ "emacs-larstvei": { "inputs": { "emacs-config": "emacs-config", - "emacs-overlay": "emacs-overlay_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4" + "emacs-overlay": "emacs-overlay", + "emacs-plus": "emacs-plus", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1721439609, - "narHash": "sha256-Xpq7IwxmXHsUqjvao+xj8mIZL1jSIjuuTeFT2a+DKmQ=", + "lastModified": 1721524893, + "narHash": "sha256-bI4wxmfDyA4Qb0EmqGNujsPxsKlrRxWl7X3xX1bRtZk=", "owner": "larstvei", "repo": "emacs-flake", - "rev": "239e4d5581e67ca874916b72f8ff45248ea756ec", + "rev": "a1bcb1220b072f38fb39a0843040c35c892d9751", "type": "github" }, "original": { @@ -68,11 +65,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720256942, - "narHash": "sha256-ohfS5d4yR+zdLTICE78rNJmqL/en0BNPGm5zCK6N0QA=", + "lastModified": 1721524329, + "narHash": "sha256-SyAHDx9l5cITXVfP48YFRZ9sfAh2dwIU4H3ed/T9Vrs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6d9837126e1be779c8f34ed9fdd609e676a1b891", + "rev": "717ae15d3131b195df37cc807ec3c4bff2342c06", "type": "github" }, "original": { @@ -81,23 +78,19 @@ "type": "github" } }, - "emacs-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2" - }, + "emacs-plus": { + "flake": false, "locked": { - "lastModified": 1721437571, - "narHash": "sha256-w+FGfufCj2mugklWPycL8j4lM3gKrKgP3Fr4ez4GyGo=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "b31005958cab83f8ea0683bfde0fa2df74d310a1", + "lastModified": 1721032571, + "narHash": "sha256-jKTOwbm0cNp8D5pinF4wtn5beQRlLmsnClg+8ooDkX0=", + "owner": "d12frosted", + "repo": "homebrew-emacs-plus", + "rev": "323d86b2685a2420341e648bbc6c7b7c02029fa9", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "emacs-overlay", + "owner": "d12frosted", + "repo": "homebrew-emacs-plus", "type": "github" } }, @@ -137,42 +130,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -194,70 +151,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1721379653, "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", @@ -273,13 +166,29 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs-stable": { "locked": { - "lastModified": 1721403608, - "narHash": "sha256-X5+QA5K3J2KA20YEaBJ+GKDj/XIb5PutHmphgYQUszA=", + "lastModified": 1721409541, + "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0111043c09f7d0f6b9f039882cbf350d4f7d49", + "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -289,13 +198,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { - "lastModified": 1721403608, - "narHash": "sha256-X5+QA5K3J2KA20YEaBJ+GKDj/XIb5PutHmphgYQUszA=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0111043c09f7d0f6b9f039882cbf350d4f7d49", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -310,7 +219,7 @@ "darwin": "darwin", "emacs-larstvei": "emacs-larstvei", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" } }, "systems": { @@ -342,36 +251,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/modules/home.nix b/modules/home.nix index 7c763ea..783feb5 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -2,12 +2,7 @@ home.packages = with pkgs; [ emacs-larstvei.defaultPackage.${pkgs.system} - (aspellWithDicts - (dpkgs: with dpkgs; [ - en - en-computers - nb - ])) + (hunspellWithDicts [ hunspellDicts.nb_NO ]) (python3.withPackages (python-packages: with python-packages; [ graphviz @@ -67,8 +62,7 @@ wget ]; - # Somehow related to: https://github.com/NixOS/nixpkgs/issues/1000 - home.file.".aspell.conf".text = "data-dir ${pkgs.aspell}/lib/aspell"; + home.file.".config/enchant/hunspell/".source = "${pkgs.hunspellDicts.nb_NO}/share/hunspell/"; home.file.karabiner = { target = ".config/karabiner/assets/complex_modifications/df_escape.json";