Compare commits

..

3 commits

Author SHA1 Message Date
Bruno BELANYI 38f3ac0ce5 home: vim: lspconfig: add 'typos-lsp'
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2024-09-27 14:11:03 +00:00
Bruno BELANYI 898523d079 treewide: fix typos 2024-09-27 13:49:29 +00:00
Bruno BELANYI cbba752b54 nixos: services: nginx: remove 'literalExample'
Those examples do not use functions or any other "difficult to render"
expression.
2024-09-27 13:44:40 +00:00
21 changed files with 63 additions and 60 deletions

View file

@ -157,7 +157,7 @@ in
enable = false; enable = false;
}; };
}; };
# Because I stilll need to play sysadmin # Because I still need to play sysadmin
ssh-server.enable = true; ssh-server.enable = true;
# Recipe manager # Recipe manager
tandoor-recipes = { tandoor-recipes = {

View file

@ -4,7 +4,7 @@
" Use dark color scheme " Use dark color scheme
colorscheme dark colorscheme dark
" Make tridactyl open Vim in my prefered terminal " Make tridactyl open Vim in my preferred terminal
set editorcmd @editorcmd@ set editorcmd @editorcmd@
" Remove editor file after use " Remove editor file after use

View file

@ -58,7 +58,7 @@ in
{ {
config.accounts.email.accounts = { config.accounts.email.accounts = {
personal = lib.mkMerge [ personal = lib.mkMerge [
# Common configuraton # Common configuration
(mkConfig { (mkConfig {
domain = "belanyi.fr"; domain = "belanyi.fr";
address = "bruno"; address = "bruno";
@ -70,7 +70,7 @@ in
]; ];
gmail = lib.mkMerge [ gmail = lib.mkMerge [
# Common configuraton # Common configuration
(mkConfig { (mkConfig {
domain = "gmail.com"; domain = "gmail.com";
address = "brunobelanyi"; address = "brunobelanyi";

View file

@ -30,7 +30,7 @@ in
}); });
default = { ${config.my.home.terminal.program} = { }; }; default = { ${config.my.home.terminal.program} = { }; };
defaultText = litteralExpression '' defaultText = literalExpression ''
{ ''${config.my.home.terminal.program} = { }; }; { ''${config.my.home.terminal.program} = { }; };
''; '';
example = { xterm-256color = { }; }; example = { xterm-256color = { }; };

View file

@ -100,6 +100,9 @@ in
# Shell # Shell
bash-language-server bash-language-server
shfmt shfmt
# Generic
typos-lsp
]; ];
}; };

View file

@ -1,4 +1,4 @@
" Basic configuraion {{{ " Basic configuration {{{
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Use UTF-8 " Use UTF-8
set encoding=utf-8 set encoding=utf-8

View file

@ -42,7 +42,7 @@ end
--- shared LSP configuration callback --- shared LSP configuration callback
--- @param client native client configuration --- @param client native client configuration
--- @param bufnr int? buffer number of the attched client --- @param bufnr int? buffer number of the attached client
M.on_attach = function(client, bufnr) M.on_attach = function(client, bufnr)
-- Format on save -- Format on save
lsp_format.on_attach(client, bufnr) lsp_format.on_attach(client, bufnr)

View file

@ -84,3 +84,11 @@ if utils.is_executable("starpls") then
on_attach = lsp.on_attach, on_attach = lsp.on_attach,
}) })
end end
-- Generic
if utils.is_executable("typos-lsp") then
lspconfig.typos_lsp.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end

View file

@ -58,7 +58,7 @@ in
service = "some-service-name"; service = "some-service-name";
} }
]; ];
description = "list of block configurations, merged with the defauls"; description = "list of block configurations, merged with the defaults";
}; };
}; };
}; };

View file

@ -2,7 +2,7 @@
let let
cfg = config.my.home.wm.screen-lock; cfg = config.my.home.wm.screen-lock;
notficationCmd = notificationCmd =
let let
duration = toString (cfg.notify.delay * 1000); duration = toString (cfg.notify.delay * 1000);
notifyCmd = "${lib.getExe pkgs.libnotify} -u critical -t ${duration}"; notifyCmd = "${lib.getExe pkgs.libnotify} -u critical -t ${duration}";
@ -48,7 +48,7 @@ in
"-notify" "-notify"
"${toString cfg.notify.delay}" "${toString cfg.notify.delay}"
"-notifier" "-notifier"
notficationCmd notificationCmd
]; ];
}; };
}; };

View file

@ -11,7 +11,7 @@ in
enable = true; enable = true;
# File types # File types
mime.enable = true; mime.enable = true;
# File associatons # File associations
mimeApps = { mimeApps = {
enable = true; enable = true;
}; };

View file

@ -12,7 +12,7 @@ setopt rc_quotes
setopt auto_resume setopt auto_resume
# Show history expansion before running a command # Show history expansion before running a command
setopt hist_verify setopt hist_verify
# Append commands to history as they are exectuted # Append commands to history as they are executed
setopt inc_append_history_time setopt inc_append_history_time
# Remove useless whitespace from commands # Remove useless whitespace from commands
setopt hist_reduce_blanks setopt hist_reduce_blanks

View file

@ -11,7 +11,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.xserver = { services.xserver = {
# This section must be *after* the one configured by `libinput` # This section must be *after* the one configured by `libinput`
# for the `ScrollMethod` configuration to not be overriden # for the `ScrollMethod` configuration to not be overridden
inputClassSections = lib.mkAfter [ inputClassSections = lib.mkAfter [
# MX Ergo # MX Ergo
'' ''

View file

@ -1,4 +1,4 @@
# Configuration that spans accross system and home, or are almagations of modules # Configuration that spans across system and home, or are almagations of modules
{ ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
# A low-ressource, full-featured git forge. # A low-resource, full-featured git forge.
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.my.services.forgejo; cfg = config.my.services.forgejo;

View file

@ -1,4 +1,4 @@
# A low-ressource, full-featured git forge. # A low-resource, full-featured git forge.
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.my.services.gitea; cfg = config.my.services.gitea;

View file

@ -59,14 +59,12 @@ let
extraConfig = mkOption { extraConfig = mkOption {
type = types.attrs; # FIXME: forward type of virtualHosts type = types.attrs; # FIXME: forward type of virtualHosts
example = litteralExample '' example = {
{ locations."/socket" = {
locations."/socket" = { proxyPass = "http://127.0.0.1:8096/";
proxyPass = "http://127.0.0.1:8096/"; proxyWebsockets = true;
proxyWebsockets = true; };
}; };
}
'';
default = { }; default = { };
description = '' description = ''
Any extra configuration that should be applied to this virtual host. Any extra configuration that should be applied to this virtual host.
@ -100,26 +98,24 @@ in
virtualHosts = mkOption { virtualHosts = mkOption {
type = types.attrsOf virtualHostOption; type = types.attrsOf virtualHostOption;
default = { }; default = { };
example = litteralExample '' example = {
{ gitea = {
gitea = { subdomain = "git";
subdomain = "git"; port = 8080;
port = 8080; };
}; dev = {
dev = { root = "/var/www/dev";
root = "/var/www/dev"; };
}; jellyfin = {
jellyfin = { port = 8096;
port = 8096; extraConfig = {
extraConfig = { locations."/socket" = {
locations."/socket" = { proxyPass = "http://127.0.0.1:8096/";
proxyPass = "http://127.0.0.1:8096/"; proxyWebsockets = true;
proxyWebsockets = true;
};
}; };
}; };
} };
''; };
description = '' description = ''
List of virtual hosts to set-up using default settings. List of virtual hosts to set-up using default settings.
''; '';
@ -163,25 +159,21 @@ in
}; };
}; };
}); });
example = litteralExample '' example = {
{ alice = {
alice = { passwordHashFile = "/var/lib/nginx-sso/alice/password-hash.txt";
passwordHashFile = "/var/lib/nginx-sso/alice/password-hash.txt"; totpSecretFile = "/var/lib/nginx-sso/alice/totp-secret.txt";
totpSecretFile = "/var/lib/nginx-sso/alice/totp-secret.txt"; };
}; };
}
'';
description = "Definition of users"; description = "Definition of users";
}; };
groups = mkOption { groups = mkOption {
type = with types; attrsOf (listOf str); type = with types; attrsOf (listOf str);
example = litteralExample '' example = {
{ root = [ "alice" ];
root = [ "alice" ]; users = [ "alice" "bob" ];
users = [ "alice" "bob" ]; };
}
'';
description = "Groups of users"; description = "Groups of users";
}; };
}; };

View file

@ -13,7 +13,7 @@ in
example = "/run/secrets/password.env"; example = "/run/secrets/password.env";
description = '' description = ''
The path to a file containing the PASSWORD environment variable The path to a file containing the PASSWORD environment variable
definition for Podgrab's authentification. definition for Podgrab's authentication.
''; '';
}; };

View file

@ -41,7 +41,7 @@ in
service = { service = {
# Only allow registration of users through the CLI # Only allow registration of users through the CLI
enableregistration = false; enableregistration = false;
# Ues the host's timezone # Use the host's timezone
timezone = config.time.timeZone; timezone = config.time.timeZone;
# Use UNIX socket for serving the API # Use UNIX socket for serving the API
unixsocket = socketPath; unixsocket = socketPath;

View file

@ -206,7 +206,7 @@ in
]; ];
} }
# Additional inteface is only used to get access to "LAN" from wireguard # Additional interface is only used to get access to "LAN" from wireguard
(lib.mkIf cfg.internal.enable { (lib.mkIf cfg.internal.enable {
networking.wg-quick.interfaces."${cfg.internal.name}" = mkInterface [ networking.wg-quick.interfaces."${cfg.internal.name}" = mkInterface [
"${cfg.net.v4.subnet}.0/${toString cfg.net.v4.mask}" "${cfg.net.v4.subnet}.0/${toString cfg.net.v4.mask}"

View file

@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
description = "Unified host lists, ready to be used by unbound"; description = "Unified host lists, ready to be used by unbound";
longDescription = '' longDescription = ''
This is a simple derivation based on StevenBlack's unified hosts list. This is a simple derivation based on StevenBlack's unified hosts list.
The files have been modified for easy use wih unbound. The files have been modified for easy use with unbound.
''; '';
homepage = "https://github.com/StevenBlack/hosts"; homepage = "https://github.com/StevenBlack/hosts";
license = licenses.mit; license = licenses.mit;