diff options
Diffstat (limited to '')
| -rw-r--r-- | .ecrc | 6 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | lib/my.nix | 2 | ||||
| -rw-r--r-- | modules/common/curl.nix | 3 | ||||
| -rw-r--r-- | modules/common/emacs/default.nix | 13 | ||||
| -rw-r--r-- | modules/common/emacs/doom/init.el | 4 | ||||
| -rw-r--r-- | modules/common/git.nix | 1 | ||||
| -rw-r--r-- | modules/common/profiles/headful.nix | 1 | ||||
| -rw-r--r-- | modules/common/vscode.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/common/secrets.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/firefox/userChrome.css | 2 | ||||
| -rw-r--r-- | modules/nixos/mpd.nix | 3 | ||||
| -rw-r--r-- | modules/nixos/profiles/headful.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/unbound.nix | 2 | ||||
| -rw-r--r-- | typos.toml | 5 |
15 files changed, 32 insertions, 22 deletions
diff --git a/.ecrc b/.ecrc new file mode 100644 index 0000000..2242b35 --- /dev/null +++ b/.ecrc @@ -0,0 +1,6 @@ +{ + "Exclude": ["\\.el", "\\.json$", "^LICENSE$", "^flake.lock$", "^secrets/"], + "Disable": { + "MaxLineLength": true + } +} diff --git a/flake.nix b/flake.nix index 0563808..855913d 100644 --- a/flake.nix +++ b/flake.nix @@ -295,14 +295,18 @@ hooks = { alejandra.enable = true; deadnix.enable = true; + editorconfig-checker.enable = true; prettier = { enable = true; - types = []; files = "\\.css"; }; shellcheck.enable = true; shfmt.enable = true; statix.enable = true; + typos = { + enable = true; + types = ["text"]; + }; }; settings.deadnix.edit = true; }; diff --git a/lib/my.nix b/lib/my.nix index fbd5462..17a7827 100644 --- a/lib/my.nix +++ b/lib/my.nix @@ -92,7 +92,7 @@ with lib; }; # TODO Automate filling of this from the NSD service module. - # Right now I need to copy domain defenitions from there to here + # Right now I need to copy domain definitions from there to here # manually. # # Something like taking `config.services.nsd.zones[$domain]` and diff --git a/modules/common/curl.nix b/modules/common/curl.nix index e7bee31..a48b93e 100644 --- a/modules/common/curl.nix +++ b/modules/common/curl.nix @@ -7,8 +7,7 @@ with lib; let cfg = config.nixfiles.modules.curl; in { - options.nixfiles.modules.curl.enable = - mkEnableOption "Wether to enable cURL."; + options.nixfiles.modules.curl.enable = mkEnableOption "cURL."; config = mkIf cfg.enable { hm.home.file.".curlrc".text = '' diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index bdbbf43..bc4acdc 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -29,7 +29,7 @@ in { # by the project's flake/shell. extraBins = with pkgs; [ - enchant # :checkers (spell +enchant) + (aspellWithDicts (p: with p; [en ru])) # :checkers (spell +aspell) (python3.withPackages (p: with p; [ black # :lang python :editor format @@ -61,6 +61,7 @@ in { json-language-server # :lang (json +lsp) nix-language-server # :lang (nix +lsp) nixfmt # :lang nix :editor format + nodePackages.eslint # :lang (json +lsp) nodePackages.js-beautify # :lang web nodePackages.prettier # :editor format nodePackages.stylelint # :lang web @@ -139,13 +140,13 @@ in { ]; onChange = with config.hm.programs; '' if [[ -x "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" ]]; then - oldpath="$PATH" - export PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" + oldpath="$PATH" + export PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" - "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" sync + "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" sync - export PATH="$oldpath" - unset oldpath + export PATH="$oldpath" + unset oldpath fi ''; }; diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el index cdab069..764c25e 100644 --- a/modules/common/emacs/doom/init.el +++ b/modules/common/emacs/doom/init.el @@ -49,9 +49,7 @@ :checkers syntax - (spell +enchant - +everywhere - +flyspell) + (spell +aspell +everywhere) grammar :tools diff --git a/modules/common/git.nix b/modules/common/git.nix index 2c1dd1f..2a0554f 100644 --- a/modules/common/git.nix +++ b/modules/common/git.nix @@ -80,7 +80,6 @@ in { ".DS_Store" ".cache/clangd/" ".ccls-cache/" - ".dir-locals.el" ".gdb_history" ".netrwhist" ".projectile" diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index eec14c5..1c1f43b 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -95,7 +95,6 @@ in { }; environment.systemPackages = with pkgs; [ - (aspellWithDicts (p: with p; [en ru])) arping dnsutils inetutils diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix index 92ce5b5..2d34788 100644 --- a/modules/common/vscode.nix +++ b/modules/common/vscode.nix @@ -110,7 +110,7 @@ in { external.linuxExec = if alacritty.enable then "${pkgs.alacritty}/bin/alacritty" - else "${pkgs.xterm}/bin/xterm}"; + else "${pkgs.xterm}/bin/xterm"; integrated = { inherit fontFamily fontSize; diff --git a/modules/nixos/common/secrets.nix b/modules/nixos/common/secrets.nix index c229882..2ee5753 100644 --- a/modules/nixos/common/secrets.nix +++ b/modules/nixos/common/secrets.nix @@ -21,7 +21,7 @@ with lib; { map (attr: attr.path) (filter (attr: attr.type == my.ssh.type) config.services.openssh.hostKeys); - # This can be used to auto-add all secrets, thus eleminating the need to + # This can be used to auto-add all secrets, thus eliminating the need to # specify path to each envrypted file. The drawback is that this will # expose *all* secrets to all machines and try to decrypt them all even on # machines where the secret will not be used. diff --git a/modules/nixos/firefox/userChrome.css b/modules/nixos/firefox/userChrome.css index 58e450e..14f486c 100644 --- a/modules/nixos/firefox/userChrome.css +++ b/modules/nixos/firefox/userChrome.css @@ -136,7 +136,7 @@ /* #urlbar { */ /* background: var(--background) !important; */ - /* color: var(--forground) !important; */ + /* color: var(--foreground) !important; */ /* font-family: var(--sans-serif-font-family) !important; */ /* font-size: var(--sans-serif-font-size) !important; */ /* border-color: transparent !important; */ diff --git a/modules/nixos/mpd.nix b/modules/nixos/mpd.nix index 4b49213..7540c14 100644 --- a/modules/nixos/mpd.nix +++ b/modules/nixos/mpd.nix @@ -7,8 +7,7 @@ with lib; let cfg = config.nixfiles.modules.mpd; in { - options.nixfiles.modules.mpd.enable = - mkEnableOption "Wether to enable MPD and its clients."; + options.nixfiles.modules.mpd.enable = mkEnableOption "MPD and its clients."; config = mkIf cfg.enable { hm = { diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix index 71addbf..d0ca777 100644 --- a/modules/nixos/profiles/headful.nix +++ b/modules/nixos/profiles/headful.nix @@ -39,7 +39,7 @@ in { # Hyperthreading altogether which will essentially put one's computer into # the stone age by not being able to to effectively utilise multi-core its # multicore capabilities. Secondly, by enabling mitigations, we introduce - # a plethora of performace overheads[1], which, albeit small, but still + # a plethora of performance overheads[1], which, albeit small, but still # contribute to the overall speed of things. This is however still poses a # security risk, which I am willing to take. # diff --git a/modules/nixos/unbound.nix b/modules/nixos/unbound.nix index 8c40291..103e375 100644 --- a/modules/nixos/unbound.nix +++ b/modules/nixos/unbound.nix @@ -175,7 +175,7 @@ in { >${adblock-conf} if [[ -f "${localControlSocketPath}" ]]; then - unbound-control reload + unbound-control reload fi ''; }; diff --git a/typos.toml b/typos.toml new file mode 100644 index 0000000..4270c91 --- /dev/null +++ b/typos.toml @@ -0,0 +1,5 @@ +[default.extend-identifiers] +gud = "gud" +iterm2 = "iterm2" +openpgp4fpr= "openpgp4fpr" +referer = "referer" |