Merge branch 'main' of git.atlanticaweb.fr:alexandre/nixos-config

This commit is contained in:
Alexandre LUCAZEAU 2023-07-29 11:58:19 +02:00
commit 4ec119d7c6
5 changed files with 84 additions and 56 deletions

View File

@ -13,7 +13,8 @@
./network.nix
modules/common.nix
modules/smtp.nix
modules/starship.nix
# modules/starship.nix
modules/syncthing.nix
# modules/powermanagement.nix
];
@ -116,5 +117,7 @@
latitude = 47.77;
longitude = -1.164;
};
nix.settings.experimental-features = [ "nix-command" "flakes" ];
}

View File

@ -10,6 +10,7 @@
../modules/users.nix
# ../docker/appsmith.nix
../docker/kuma.nix
../modules/syncthing.nix
];
system.stateVersion = "21.11";

View File

@ -35,6 +35,11 @@ in
atlanticaweb.fr:2021 {
metrics
}
https://sync.atlanticaweb.fr {
reverse_proxy http://localhost:8384 {
header_up Host {upstream_hostport}
}
}
www.atlanticaweb.fr {
redir https://atlanticaweb.fr{uri}
}

View File

@ -8,7 +8,7 @@
tmux
lshw
bc
#neovim
neovim
ncdu
nixos-option
bat

View File

@ -4,64 +4,83 @@
enable = true;
# Configuration écrite dans ~/.config/starship.toml
settings = {
add_newline = false;
format = "$shlvl$shell$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character";
shlvl = {
disabled = false;
symbol = "";
style = "bright-red bold";
# add_newline = false;
# format = "$shlvl$shell$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character";
# shlvl = {
# disabled = false;
# symbol = "ﰬ";
# style = "bright-red bold";
# };
# shell = {
# disabled = false;
# format = "$indicator";
# fish_indicator = "";
# bash_indicator = "[BASH](bright-white) ";
# };
# username = {
# style_user = "bright-white bold";
# style_root = "bright-red bold";
# };
# hostname = {
# style = "bright-green bold";
# ssh_only = true;
# };
# nix_shell = {
# symbol = "";
# format = "[$symbol$name]($style) ";
# style = "bright-purple bold";
# };
# git_branch = {
# only_attached = true;
# format = "[$symbol$branch]($style) ";
# symbol = "שׂ";
# style = "bright-yellow bold";
# };
# git_commit = {
# only_detached = true;
# format = "[ﰖ$hash]($style) ";
# style = "bright-yellow bold";
# };
# git_state = {
# style = "bright-purple bold";
# };
# git_status = {
# style = "bright-green bold";
# };
# directory = {
# read_only = " ";
# truncation_length = 0;
# };
# cmd_duration = {
# format = "[$duration]($style) ";
# style = "bright-blue";
# };
# jobs = {
# style = "bright-green bold";
# };
# character = {
# success_symbol = "[\\$](bright-green bold)";
# error_symbol = "[\\$](bright-red bold)";
# };
# };
format = "[](#a3aed2) [](bg:#769ff0 fg:#a3aed2) $directory [](fg:#769ff0 bg:#394260) $git_branch $git_status [](fg:#394260 bg:#212736) $time [ ](fg:#1d2230)$character";
directory = {
style = "fg:#e3e5e5 bg:#769ff0";
format = "[ $path ]($style)";
truncation_length = 3;
truncation_symbol = "/";
};
shell = {
disabled = false;
format = "$indicator";
fish_indicator = "";
bash_indicator = "[BASH](bright-white) ";
};
username = {
style_user = "bright-white bold";
style_root = "bright-red bold";
};
hostname = {
style = "bright-green bold";
ssh_only = true;
};
nix_shell = {
symbol = "";
format = "[$symbol$name]($style) ";
style = "bright-purple bold";
directory.substitutions = {
"Documents" = "󰈙 ";
"Downloads" = " ";
"Music" = " ";
"Pictures" = " ";
};
git_branch = {
only_attached = true;
format = "[$symbol$branch]($style) ";
symbol = "";
style = "bright-yellow bold";
symbol = "";
style = "bg:#394260";
format = "[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)";
};
git_commit = {
only_detached = true;
format = "[$hash]($style) ";
style = "bright-yellow bold";
};
git_state = {
style = "bright-purple bold";
};
git_status = {
style = "bright-green bold";
};
directory = {
read_only = " ";
truncation_length = 0;
};
cmd_duration = {
format = "[$duration]($style) ";
style = "bright-blue";
};
jobs = {
style = "bright-green bold";
};
character = {
success_symbol = "[\\$](bright-green bold)";
error_symbol = "[\\$](bright-red bold)";
};
};
};
}