Compare commits
3 commits
20db71996c
...
38f3ac0ce5
Author | SHA1 | Date | |
---|---|---|---|
Bruno BELANYI | 38f3ac0ce5 | ||
Bruno BELANYI | 898523d079 | ||
Bruno BELANYI | cbba752b54 |
|
@ -157,7 +157,7 @@ in
|
|||
enable = false;
|
||||
};
|
||||
};
|
||||
# Because I stilll need to play sysadmin
|
||||
# Because I still need to play sysadmin
|
||||
ssh-server.enable = true;
|
||||
# Recipe manager
|
||||
tandoor-recipes = {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
" Use dark color scheme
|
||||
colorscheme dark
|
||||
|
||||
" Make tridactyl open Vim in my prefered terminal
|
||||
" Make tridactyl open Vim in my preferred terminal
|
||||
set editorcmd @editorcmd@
|
||||
|
||||
" Remove editor file after use
|
||||
|
|
|
@ -58,7 +58,7 @@ in
|
|||
{
|
||||
config.accounts.email.accounts = {
|
||||
personal = lib.mkMerge [
|
||||
# Common configuraton
|
||||
# Common configuration
|
||||
(mkConfig {
|
||||
domain = "belanyi.fr";
|
||||
address = "bruno";
|
||||
|
@ -70,7 +70,7 @@ in
|
|||
];
|
||||
|
||||
gmail = lib.mkMerge [
|
||||
# Common configuraton
|
||||
# Common configuration
|
||||
(mkConfig {
|
||||
domain = "gmail.com";
|
||||
address = "brunobelanyi";
|
||||
|
|
|
@ -30,7 +30,7 @@ in
|
|||
});
|
||||
|
||||
default = { ${config.my.home.terminal.program} = { }; };
|
||||
defaultText = litteralExpression ''
|
||||
defaultText = literalExpression ''
|
||||
{ ''${config.my.home.terminal.program} = { }; };
|
||||
'';
|
||||
example = { xterm-256color = { }; };
|
||||
|
|
|
@ -100,6 +100,9 @@ in
|
|||
# Shell
|
||||
bash-language-server
|
||||
shfmt
|
||||
|
||||
# Generic
|
||||
typos-lsp
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
" Basic configuraion {{{
|
||||
" Basic configuration {{{
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Use UTF-8
|
||||
set encoding=utf-8
|
||||
|
|
|
@ -42,7 +42,7 @@ end
|
|||
|
||||
--- shared LSP configuration callback
|
||||
--- @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)
|
||||
-- Format on save
|
||||
lsp_format.on_attach(client, bufnr)
|
||||
|
|
|
@ -84,3 +84,11 @@ 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
|
||||
|
|
|
@ -58,7 +58,7 @@ in
|
|||
service = "some-service-name";
|
||||
}
|
||||
];
|
||||
description = "list of block configurations, merged with the defauls";
|
||||
description = "list of block configurations, merged with the defaults";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
cfg = config.my.home.wm.screen-lock;
|
||||
|
||||
notficationCmd =
|
||||
notificationCmd =
|
||||
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"
|
||||
notficationCmd
|
||||
notificationCmd
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@ in
|
|||
enable = true;
|
||||
# File types
|
||||
mime.enable = true;
|
||||
# File associatons
|
||||
# File associations
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
@ -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 exectuted
|
||||
# Append commands to history as they are executed
|
||||
setopt inc_append_history_time
|
||||
# Remove useless whitespace from commands
|
||||
setopt hist_reduce_blanks
|
||||
|
|
|
@ -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 overriden
|
||||
# for the `ScrollMethod` configuration to not be overridden
|
||||
inputClassSections = lib.mkAfter [
|
||||
# MX Ergo
|
||||
''
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# A low-ressource, full-featured git forge.
|
||||
# A low-resource, full-featured git forge.
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.forgejo;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# A low-ressource, full-featured git forge.
|
||||
# A low-resource, full-featured git forge.
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.gitea;
|
||||
|
|
|
@ -59,14 +59,12 @@ let
|
|||
|
||||
extraConfig = mkOption {
|
||||
type = types.attrs; # FIXME: forward type of virtualHosts
|
||||
example = litteralExample ''
|
||||
{
|
||||
locations."/socket" = {
|
||||
proxyPass = "http://127.0.0.1:8096/";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
locations."/socket" = {
|
||||
proxyPass = "http://127.0.0.1:8096/";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Any extra configuration that should be applied to this virtual host.
|
||||
|
@ -100,26 +98,24 @@ in
|
|||
virtualHosts = mkOption {
|
||||
type = types.attrsOf virtualHostOption;
|
||||
default = { };
|
||||
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;
|
||||
};
|
||||
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;
|
||||
};
|
||||
};
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
List of virtual hosts to set-up using default settings.
|
||||
'';
|
||||
|
@ -163,25 +159,21 @@ in
|
|||
};
|
||||
};
|
||||
});
|
||||
example = litteralExample ''
|
||||
{
|
||||
alice = {
|
||||
passwordHashFile = "/var/lib/nginx-sso/alice/password-hash.txt";
|
||||
totpSecretFile = "/var/lib/nginx-sso/alice/totp-secret.txt";
|
||||
};
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
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 = litteralExample ''
|
||||
{
|
||||
root = [ "alice" ];
|
||||
users = [ "alice" "bob" ];
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
root = [ "alice" ];
|
||||
users = [ "alice" "bob" ];
|
||||
};
|
||||
description = "Groups of users";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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 authentification.
|
||||
definition for Podgrab's authentication.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ in
|
|||
service = {
|
||||
# Only allow registration of users through the CLI
|
||||
enableregistration = false;
|
||||
# Ues the host's timezone
|
||||
# Use the host's timezone
|
||||
timezone = config.time.timeZone;
|
||||
# Use UNIX socket for serving the API
|
||||
unixsocket = socketPath;
|
||||
|
|
|
@ -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 {
|
||||
networking.wg-quick.interfaces."${cfg.internal.name}" = mkInterface [
|
||||
"${cfg.net.v4.subnet}.0/${toString cfg.net.v4.mask}"
|
||||
|
|
|
@ -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 wih unbound.
|
||||
The files have been modified for easy use with unbound.
|
||||
'';
|
||||
homepage = "https://github.com/StevenBlack/hosts";
|
||||
license = licenses.mit;
|
||||
|
|
Loading…
Reference in a new issue