modifié : ../dell-5590/nixos/vpn.nix

modifié :         ../dell-5590/nixpkgs/configs/init.el
	modifié :         ../dell-5590/nixpkgs/emacs.nix
	modifié :         nextcloud.nix
main
Alexandre LUCAZEAU 2023-03-09 22:11:40 +01:00
parent d4618ce2e1
commit 9f96f8d62c
4 changed files with 34 additions and 8 deletions

View File

@ -1,9 +1,15 @@
{ pkgs, ... }: {
services.openvpn.servers = {
DRI = { config = '' config /home/alexandre/git/nixos-config/hosts/dell-5590/nixpkgs/VPN.conf ''; };
{ 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";
};
};
};
nixpkgs.config.allowUnfree = true;
virtualisation.virtualbox.host.enable = true;
virtualisation.virtualbox.host.enableExtensionPack = true;
users.extraGroups.vboxusers.members = [ "alexandre" ];
}

View File

@ -212,3 +212,13 @@
(setq org-journal-dir "~/Nextcloud/PRIVE/13_Org/journal/")
(global-set-key "\C-cnj" 'org-journal-new-entry)
(require 'org-journal)
;; tab bar
(when (< 26 emacs-major-version)
(tab-bar-mode 1) ;; enable tab bar
(setq tab-bar-show 1) ;; hide bar if <= 1 tabs open
(setq tab-bar-close-button-show nil) ;; hide tab close / X button
(setq tab-bar-new-tab-choice "*dashboard*");; buffer to show in new tabs
(setq tab-bar-tab-hints t) ;; show tab numbers
(setq tab-bar-format '(tab-bar-format-tabs tab-bar-separator)))
;; elements to include in bar

View File

@ -1,6 +1,9 @@
{ ... }:
{ pkgs, ... }:
{
home.packages = with pkgs; [
multimarkdown
];
services.emacs.enable = true;
programs.emacs = {
enable = true;

View File

@ -30,6 +30,13 @@ services.nginx = {
proxyPass = "http://127.0.0.1:${toString config.services.navidrome.settings.Port}/";
proxyWebsockets = true;
};
"bookmark.atlanticaweb.fr" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:8080/";
proxyWebsockets = true;
};
};
};
};