Modifications qui seront validées :
modifié : ../../nixos/configuration.nix nouveau fichier : ../../nixos/virtualbox.nix supprimé : ../../nixos/vpn.nix modifié : init.el modifié : ../mails.nix modifié : ../packages.nix
This commit is contained in:
parent
6a4bfd0ba8
commit
6280c773da
|
@ -12,6 +12,7 @@
|
||||||
./services.nix
|
./services.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
# ./vpn.nix
|
# ./vpn.nix
|
||||||
|
# ./VPN.nix
|
||||||
../modules/prometheus-node.nix
|
../modules/prometheus-node.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -23,6 +24,10 @@
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
|
htop = {
|
||||||
|
enable = true;
|
||||||
|
settings.show_cpu_temperature = 1;
|
||||||
|
};
|
||||||
fish = {
|
fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
|
@ -115,7 +120,7 @@
|
||||||
unmanaged = [ "interface-name:ve-*" ];
|
unmanaged = [ "interface-name:ve-*" ];
|
||||||
};
|
};
|
||||||
firewall.enable = true;
|
firewall.enable = true;
|
||||||
firewall.allowedTCPPorts = [ 24800 6600 ];
|
firewall.allowedTCPPorts = [ 24800 6600 1194];
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.defaultLocale = "fr_FR.UTF-8";
|
i18n.defaultLocale = "fr_FR.UTF-8";
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
{ pkgs, ... }: {
|
||||||
|
virtualisation.virtualbox.host.enable = true;
|
||||||
|
virtualisation.virtualbox.host.enableExtensionPack = true;
|
||||||
|
users.extraGroups.vboxusers.members = [ "alexandre" ];
|
||||||
|
}
|
|
@ -1,15 +0,0 @@
|
||||||
{ pkgs, lib, config, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = [ pkgs.openvpn_24 ];
|
|
||||||
services.openvpn = {
|
|
||||||
servers = {
|
|
||||||
DRI = {
|
|
||||||
config = "config /home/alexandre/VPN/Serveur_VPN_pour_le_SI_DRI_alexandre_admin.ovpn";
|
|
||||||
updateResolvConf = true;
|
|
||||||
up = "ip route add default gw 192.168.248.73\nroute add -host 185.86.178.201 dev wlp2s0 gw 192.168.1.1\necho nameserver $nameserver | ${pkgs.openresolv}/sbin/resolvconf -m 0 -a $dev";
|
|
||||||
down = "ip route del default gw 192.168.248.73\nroute del -host 185.86.178.201 dev wlp2s0 gw 192.168.1.1\n${pkgs.openresolv}/sbin/resolvconf -d $dev";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
;; files with ".org" open in org-mode
|
;; files with ".org" open in org-mode
|
||||||
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
|
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
|
||||||
(setq org-agenda-files '("/home/alexandre/Nextcloud/PRIVE/13_Org/journal"))
|
(setq org-agenda-files '("/home/alexandre/Nextcloud/PRIVE/13_Org/journal"))
|
||||||
(setq org-directory (concat (getenv "HOME") "/Nextcloud/PRIVE/13_Org/"))
|
(setq org-directory (concat (getenv "HOME") "/Nextcloud/PRIVE/13_Org/notes"))
|
||||||
|
|
||||||
;; Org-Roam basic configuration
|
;; Org-Roam basic configuration
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,11 @@
|
||||||
tls.enable = false;
|
tls.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
mbsync.enable = true;
|
mbsync = {
|
||||||
|
enable = true;
|
||||||
|
create = "both";
|
||||||
|
expunge = "both";
|
||||||
|
};
|
||||||
notmuch.enable = true;
|
notmuch.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -67,6 +67,8 @@
|
||||||
networkmanager-openvpn
|
networkmanager-openvpn
|
||||||
python39Packages.grip
|
python39Packages.grip
|
||||||
linphone
|
linphone
|
||||||
|
graphviz
|
||||||
|
evince
|
||||||
];
|
];
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"ferdi-5.8.1"
|
"ferdi-5.8.1"
|
||||||
|
|
Loading…
Reference in New Issue