hosts/dell-5590/nixos/configuration.nix

@@ -12,7 +12,6 @@
       ./services.nix
       ./packages.nix
 #      ./vpn.nix
-#      ./VPN.nix
       ../modules/prometheus-node.nix
     ];
 
@@ -24,10 +23,6 @@
 
  programs = {
     zsh.enable = true;
-    htop = {
-      enable = true;
-      settings.show_cpu_temperature = 1;
-      };
     fish = {
       enable = true;
       shellAliases = {
@@ -120,7 +115,7 @@
       unmanaged = [ "interface-name:ve-*" ];
     };
     firewall.enable = true;
-    firewall.allowedTCPPorts = [ 24800 6600 1194];
+    firewall.allowedTCPPorts = [ 24800 6600 ];
   };
 
   i18n.defaultLocale = "fr_FR.UTF-8";

hosts/dell-5590/nixos/virtualbox.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-   virtualisation.virtualbox.host.enable = true;
-   virtualisation.virtualbox.host.enableExtensionPack = true;
-   users.extraGroups.vboxusers.members = [ "alexandre" ];
-}

hosts/dell-5590/nixos/vpn.nix

@@ -0,0 +1,15 @@
+{ 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";
+      };
+    };
+  };
+}
+

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

@@ -13,9 +13,15 @@
 
 
 (column-number-mode 't) ; show current column in status bar
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
 (set-fringe-mode 10)
 
+;;;; Indent 4 spaces by default. Use the "BSD" style for C-like languages.
+;;(setq c-default-style
+;;      (quote ((java-mode . "java")
+;;              (awk-mode . "awk")
+;;              (other . "bsd")))
+;;      c-basic-offset 4)
+
 ;; Use 4 spaces for one tab visually.
 (setq tab-width 4)
 
@@ -103,6 +109,20 @@
    "Major mode for editing GitHub Flavored Markdown files" t)
 (add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
 
+(use-package org-caldav
+    :ensure t
+    :config
+    (setq org-caldav-url "https://next20.produhost.net/remote.php/dav/calendars/alexandre")
+    (setq org-caldav-calendars
+         '((:calendar-id "alexandre-dri" :files ("~/Nextcloud/PRIVE/13_Org/agenda.org")
+            :inbox "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org")
+       )
+    )     
+    (setq org-caldav-delete-org-entries 'never)
+    (setq org-caldav-delete-calenda-entries 'never)
+    (setq org-icalendar-timezone "Europe/Paris")
+)
+
 ;; org-mode
 (require 'org)
 (require 'org-mouse)
@@ -110,36 +130,40 @@
       org-pretty-entities t
       org-hide-emphasis-markers t
       org-startup-with-inline-images t
-      org-agenda-include-deadlines t
       org-image-actual-width '(300))
 ;; files with ".org" open in org-mode
 (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
-(setq org-agenda-files '("/home/alexandre/Nextcloud/PRIVE/13_Org/journal"))
-(setq org-directory (concat (getenv "HOME") "/Nextcloud/PRIVE/13_Org/notes"))
+(setq org-agenda-files '("~/Nextcloud/PRIVE/13_Org/journal"))
+;;;;;;
 
 ;; Org-Roam basic configuration
+  (setq org-directory (concat (getenv "HOME") "/Nextcloud/PRIVE/13_Org/notes"))
 
-(use-package org-roam
-  :after org
-  :init (setq org-roam-v2-ack t) ;; Acknowledge V2 upgrade
-  :custom
-  (org-roam-directory (file-truename org-directory))
-  :config
-  (org-roam-setup)
-  (org-roam-db-autosync-mode)
-  :bind (("C-c n f" . org-roam-node-find)
-         ("C-c n r" . org-roam-node-random)		    
-         (:map org-mode-map
-               (("C-c n i" . org-roam-node-insert)
-                ("C-c n o" . org-id-get-create)
-                ("C-c n t" . org-roam-tag-add)
-                ("C-c n a" . org-roam-alias-add)
-                ("C-c n l" . org-roam-buffer-toggle)
-                ("C-c n o" . org-open-at-point)
-      	        ("C-M-i" . completion-at-point)))))
-      ;;   (:map org-roam-dailies-map
-      ;; 	  (("Y" . org-roam-dailies-capture-yesterday)
-      ;; 	   ("T" . org-roam-dailies-capture-tomorrow))))
+  (use-package org-roam
+    :after org
+    :init (setq org-roam-v2-ack t) ;; Acknowledge V2 upgrade
+    :custom
+    (org-roam-directory (file-truename org-directory))
+    :config
+    (org-roam-setup)
+    :bind (("C-c n f" . org-roam-node-find)
+           ("C-c n r" . org-roam-node-random)		    
+           (:map org-mode-map
+                 (("C-c n i" . org-roam-node-insert)
+                  ("C-c n o" . org-id-get-create)
+                  ("C-c n t" . org-roam-tag-add)
+                  ("C-c n a" . org-roam-alias-add)
+                  ("C-c n l" . org-roam-buffer-toggle)
+                  ("C-c n o" . org-open-at-point)
+		  ("C-M-i" . completion-at-point))))
+	   (:map org-roam-dailies-map
+         	  (("Y" . org-roam-dailies-capture-yesterday)
+         	   ("T" . org-roam-dailies-capture-tomorrow)))
+     :bind-keymap
+     ("C-c n d" . org-roam-dailies-map)
+     :config
+     (require 'org-roam-dailies) ;; Ensure the keymap is available
+     (org-roam-db-autosync-mode))
 
 
 ;; one file org
@@ -157,16 +181,14 @@
 
 ;; This seems like a good basic set of keywords to start out with:
 
-(setq org-todo-keywords '((type "TODO" "En cours" "WAIT" "CANCELED" "DONE")))
+(setq org-todo-keywords '((type "TODO" "WAIT" "DONE")))
 
 (setf org-todo-keyword-faces '(("TODO" . (:foreground "cyan" :background "steelblue" :bold t :weight bold))
-			       ("En cours" . (:foreground "yellow" :background "red" :bold t :weight bold))
 			       ("WAIT" . (:foreground "yellow" :background "magenta2" :bold t :weight bold))
-			       ("CANCELED" . (:foreground "gray" :background "dime grey" :bold t :weight bold))
 			       ("DONE" . (:foreground "gray50" :background "gray30"))))
 
 ;; tags
-(setq org-tag-alist '(("DEVIS" . ?d) ("PROJETS" . ?p) ("CLIENT" . ?c) ("PROSPECT" . ?o) ("INTERNE" . ?i) ("AO" . ?a) ("PJ" . ?z) ("AVV" . ?v)))
+(setq org-tag-alist '(("DEVIS" . ?d) ("PROJETS" . ?p) ("CLIENT" . ?c) ("PROSPECT" . ?o) ("INTERNE" . ?i) ("AO" . ?a) ("PJ" . ?z)))
 
 
 (setq org-tag-faces
@@ -183,11 +205,20 @@
 ;;; Org-journal
 ;; https://github.com/bastibe/org-journal
 ;; C-c C-j
-(require 'org-journal)
-(setq org-journal-date-prefix "#+TITLE: "
-      org-journal-carryover-items "-TODO=\"DONE\""
-      org-journal-time-prefix "* "
-      org-journal-date-format "%a, %Y-%m-%d"
-      org-journal-file-format "%Y-%m-%d-journal.org"
-      org-journal-dir "/home/alexandre/Nextcloud/PRIVE/13_Org/journal/")
+(setq org-journal-date-prefix "#+TITLE: ")
+(setq org-journal-time-prefix "* ")
+(setq org-journal-date-format "%a, %Y-%m-%d")
+(setq org-journal-file-format "%Y-%m-%d-journal.org")
+(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/mails.nix

@@ -23,11 +23,7 @@
         tls.enable = false;
       };
 
-      mbsync = {
-        enable = true;
-	create = "both";
-	expunge = "both";
-	};
+      mbsync.enable = true;
       notmuch.enable = true;
       };
     };

hosts/dell-5590/nixpkgs/packages.nix

@@ -67,8 +67,6 @@
     networkmanager-openvpn
     python39Packages.grip
     linphone
-    graphviz
-    evince
   ];
   nixpkgs.config.permittedInsecurePackages = [
     "ferdi-5.8.1"