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

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

@@ -311,7 +311,17 @@
                   ("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 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))
 
 ;; org-mode
 (require 'org)

hosts/dell-5590/nixpkgs/git.nix

@@ -30,6 +30,6 @@
       };
     };
     signing.key = "3C8ADB07A8217BD3";
-    signing.signByDefault = true;
+    signing.signByDefault = false;
   };
 }

hosts/x201/nixpkgs/configs/init.el

@@ -57,8 +57,8 @@
   :init (load-theme 'doom-nord t)
   :init (doom-themes-org-config))
 
-(use-package direnv
-  :config (direnv-mode))
+;;(use-package direnv
+;;  :config (direnv-mode))
 
 (use-package lsp-mode
   :config (setq lsp-keymap-prefix "C-c l")
@@ -67,13 +67,13 @@
   :config (lsp-enable-which-key-integration t)
   :hook (lsp-mode . electric-pair-mode))
 
-(use-package web-mode
-  :mode ("\\.json\\'" . web-mode)
-  :mode ("\\.html?\\'" . web-mode)
-  :mode ("\\.s?css\\'" . web-mode)
-  :mode ("\\.[jt]sx?\\'" . web-mode)
-  :hook (web-mode . lsp-deferred)
-  :hook (web-mode . default-web-indent-mode))
+;;(use-package web-mode
+;;  :mode ("\\.json\\'" . web-mode)
+;;  :mode ("\\.html?\\'" . web-mode)
+;;  :mode ("\\.s?css\\'" . web-mode)
+;;  :mode ("\\.[jt]sx?\\'" . web-mode)
+;;  :hook (web-mode . lsp-deferred)
+;;  :hook (web-mode . default-web-indent-mode))
 
 (use-package nix-mode
   :mode ("\\.nix\\'" . nix-mode)
@@ -105,39 +105,36 @@
 (use-package bbdb
   :init (bbdb-initialize 'gnus 'message)
   :init (bbdb-mua-auto-update-init 'gnus 'message)
-  :config (setq bbdb-file "~/Nextcloud/13_Org/contacts/bbdb")
+  :config (setq bbdb-file "~/Nextcloud2/13_Org/contacts/bbdb")
   :config (setq bbdb-mua-auto-update-p 'create))
 
 (use-package org
   :config
-  (setq org-agenda-files
-  	  "~/Nextcloud/13_Org/agenda.org")
+  (setq org-startup-folded t) 
+  (setq org-agenda-filesc "~/Nextcloud2/13_Org/DRI.org")
   (setq org-refile-use-outline-path 'file)
   (setq org-refile-targets
-	'(("~/Nextcloud/13_Org/DRI.org" :maxlevel . 3)
-	  ("~/Nextcloud/13_Org/perso.org" :level . 1)
-  	  ("~/Nextcloud/13_Org/pizajoffre.org" :level . 1)))
+	'(("~/Nextcloud2/13_Org/DRI.org" :maxlevel . 3)
+	  ("~/Nextcloud2/13_Org/perso.org" :level . 1)
+  	  ("~/Nextcloud2/13_Org/pizajoffre.org" :level . 1)))
   (setq org-todo-keywords
 	'((sequence "TODO(t)" "PENDING(p)" "|" "CANCELLED(c)" "DONE(d)")))
   (setq org-todo-keyword-faces
 	'(("TODO" . (:foreground "#c678dd" :weight bold))
 	  ("PENDING" . (:background "#3f444a" :foreground "#ff6c6b" :weight bold))))
   (setq org-capture-templates
-	'(("i" "Inbox" entry (file "~/Nextcloud/13_Org/DRI.org") "* TODO %i%?")
-	  ("a" "Agenda" entry (file "~/Nextcloud/13_Org/agenda.org") "* TODO %i%?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))")))
-  (setq org-agenda-custom-commands
-	'(("t" "Today" tags-todo "+LEVEL=1+CATEGORY=\"tasks\"|+SCHEDULED<=\"<today>\"|+DEADLINE<=\"<today>\""))))
+	'(("i" "Inbox" entry (file "~/Nextcloud2/13_Org/DRI.org") "* TODO %i%?")
 
 (use-package magit)
 
 (use-package ledger-mode)
 
-(use-package projectile
-  :init (projectile-global-mode)
-  :config (setq projectile-enable-caching nil)
-  :config (setq projectile-project-search-path (cddr (directory-files "~/code" t)))
-  :custom (projectile-completion-system 'ivy)
-  :bind-keymap ("C-c p" . projectile-command-map))
+;;(use-package projectile
+;;  :init (projectile-global-mode)
+;;  :config (setq projectile-enable-caching nil)
+;;  :config (setq projectile-project-search-path (cddr (directory-files "~/code" t)))
+;;  :custom (projectile-completion-system 'ivy)
+;;  :bind-keymap ("C-c p" . projectile-command-map))
 
 (use-package counsel-projectile
   :after (counsel projectile)

hosts/x201/nixpkgs/emacs.nix

@@ -29,6 +29,7 @@
         which-key
         elpaPackages.org
       ]));
+
   };
 
   home.file = {

hosts/x201/nixpkgs/home.nix

@@ -9,7 +9,6 @@
     ./mpd.nix
     ./emacs.nix
     ./i3status.nix
-    ./neovim.nix
     ./himalaya.nix
     ../../../modules/tmux.nix
   ];