Compare commits

..

No commits in common. "38f3ac0ce5883f6aee526b91240bca153019584b" and "20db71996c678e75c999d733a713805691fa9991" have entirely different histories.

21 changed files with 60 additions and 63 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -84,11 +84,3 @@ if utils.is_executable("starpls") then
on_attach = lsp.on_attach,
})
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";
}
];
description = "list of block configurations, merged with the defaults";
description = "list of block configurations, merged with the defauls";
};
};
};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -206,7 +206,7 @@ in
];
}
# Additional interface is only used to get access to "LAN" from wireguard
# Additional inteface is only used to get access to "LAN" from wireguard
(lib.mkIf cfg.internal.enable {
networking.wg-quick.interfaces."${cfg.internal.name}" = mkInterface [
"${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";
longDescription = ''
This is a simple derivation based on StevenBlack's unified hosts list.
The files have been modified for easy use with unbound.
The files have been modified for easy use wih unbound.
'';
homepage = "https://github.com/StevenBlack/hosts";
license = licenses.mit;