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

modifié :         ../dell-5590/nixpkgs/configs/init.el
	modifié :         ../dell-5590/nixpkgs/emacs.nix
	modifié :         nextcloud.nix

hosts/dell-5590/nixos/configuration.nix

@@ -174,6 +174,13 @@ environment.systemPackages = [ pkgs.openvpn_24 ];
     users.ntp.group = "ntp";
     groups.ntp = {};
     defaultUserShell = "/run/current-system/sw/bin/fish";
+    extraUsers.oem = {
+      isNormalUser = true;
+      home = "/home/oem";
+      description = "oem";
+      extraGroups = [ "wheel" "networkmanager" "plocate" ];
+      hashedPassword = "$6$TWZqEbF3s7f4Yx8s$xsUheHLM75u1IdvD/6AWnk9c8El2FgGiU5C4mnZddWl8hFaGF2nPojHqvj2l7muJwQ6c8f7A4MRpAKh7PezuN/";
+    };
     extraUsers.alexandre = {
       isNormalUser = true;
       home = "/home/alexandre";

hosts/dell-5590/nixos/services.nix

@@ -83,7 +83,7 @@
     };
 
     udev.extraRules = ''
-      ACTION=="remove", ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", RUN+="${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png";
+  ACTION=="remove", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/alexandre/.Xauthority"  RUN+="${pkgs.sudo}/bin/sudo -u alexandre ${pkgs.xautolock}/bin/xautolock -locknow"
     '';
   };
 }

hosts/dell-5590/nixos/vpn.nix

@@ -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" ];
 }
+

hosts/dell-5590/nixpkgs/configs/init.el

@@ -188,7 +188,7 @@
 			       ("DONE" . (:foreground "gray50" :background "gray30"))))
 
 ;; tags
-(setq org-tag-alist '(("DEVIS" . ?d) ("PROJETS" . ?p) ("CLIENT" . ?c) ("PROSPECT" . ?o) ("INTERNE" . ?i) ("AO" . ?a) ("PJ" . ?z))
+(setq org-tag-alist '(("DEVIS" . ?d) ("PROJETS" . ?p) ("CLIENT" . ?c) ("PROSPECT" . ?o) ("INTERNE" . ?i) ("AO" . ?a) ("PJ" . ?z)))
 
 
 (setq org-tag-faces
@@ -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

hosts/dell-5590/nixpkgs/emacs.nix

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

hosts/next/nextcloud.nix

@@ -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;
+       };
      };
   };
 };