Emacs and inputs updated

- Added org-roam in Emacs
- Flake inputs updated
- Other little modifications

users/profiles/emacs/default.nix

@@ -12,9 +12,29 @@
   };
 
   home.packages = with pkgs; [
+<<<<<<< HEAD
+=======
+    python-language-server
+    python
+>>>>>>> 651ab71 (Emacs and inputs updated)
     fd
     ag
     nixpkgs-fmt
     rnix-lsp
+<<<<<<< HEAD
   ] ++ (if config.network.hostname != "mbp" then python-language-server else [ ]);
+=======
+    (
+      makeDesktopItem {
+        name = "org-protocol";
+        exec = "emacs %u";
+        #exec = "emacsclient %u";
+        comment = "Org protocol";
+        desktopName = "org-protocol";
+        type = "Application";
+        mimeType = "x-scheme-handler/org-protocol";
+      }
+    )
+  ];
+>>>>>>> 651ab71 (Emacs and inputs updated)
 }

users/profiles/emacs/emacs.d/config/aesthetics.el

@@ -9,8 +9,10 @@
 )  
 
 (use-package fira-code-mode
-  :custom (fira-code-mode-disabled-ligatures '(":")) ;; List of ligatures to turn off
-  :config (global-fira-code-mode))
+  :custom (fira-code-mode-disabled-ligatures '()) ;; List of ligatures to turn off
+  :config
+  (fira-code-mode-set-font)
+  (global-fira-code-mode))
 
 
 (defalias 'yes-or-no-p 'y-or-n-p)

users/profiles/emacs/emacs.d/config/config-org.el

@@ -1,10 +1,28 @@
 (use-package org
   :init
-  (setq fill-column 80)
+    (setq fill-column 80)
+    (require 'org-protocol)
   :hook 
   ((org-mode . refill-mode)
    (org-mode . (lambda () (org-superstar-mode 1)))
    (org-mode . prettify-symbols-mode)))
 
+(use-package org-roam
+  :init
+  (setq org-roam-v2-ack t)
+  :custom
+  (org-roam-directory (file-truename "~/roam/"))
+  (org-roam-graph-executable "dot")
+  :bind (("C-c n l" . org-roam-buffer-toggle)
+         ("C-c n f" . org-roam-node-find)
+         ("C-c n g" . org-roam-graph)
+         ("C-c n i" . org-roam-node-insert)
+         ("C-c n c" . org-roam-capture)
+         ;; Dailies
+         ("C-c n j" . org-roam-dailies-capture-today))
+  :config
+  (org-roam-db-autosync-mode)
+  ;; If using org-roam-protocol
+  (require 'org-roam-protocol))
 
 (provide 'config-org)

users/profiles/emacs/emacs.d/config/config-python.el

@@ -1,6 +1,6 @@
 (use-package lsp-python-ms
-  :ensure t
   :hook (python-mode . (lambda ()
+                         (setq indent-tabs-mode nil)  ; disable tabs
                          (require 'lsp-python-ms)
                          (lsp)))
   :init

users/profiles/emacs/emacs.d/config/nix.el

@@ -9,6 +9,9 @@
 
 (defun nixos-rebuild-test ()
   (interactive)
+  ;; async-shell command should be sufficient, to check why it isn't
   (sudo-utils-shell-command "nixos-rebuild test"))
 
+(global-set-key [f6] 'nixos-rebuild-test)
+
 (provide 'nix)