From d99fd6a3e6e30853a943a50633eb17177af89ad3 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Sun, 5 Jun 2022 15:35:26 +0200
Subject: [PATCH] Things

- disabled auto mounting ccr.ydns.eu
- `hl-todo` mode for Emacs
---
 pkgs/emacs/default.nix                        | 13 ++--
 profiles/mount-nas/default.nix                | 66 ++++++++++---------
 .../emacs/emacs.d/config/aesthetics.el        |  3 +
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
index 2650b58..46c211f 100644
--- a/pkgs/emacs/default.nix
+++ b/pkgs/emacs/default.nix
@@ -8,13 +8,8 @@ emacsWithPackages (
     with epkgs.melpaStablePackages; [ ]
   ) ++ (
     with epkgs.melpaPackages; [
-      aggressive-indent
-      pkgs.emacs28Packages.tree-sitter-langs
-      tree-sitter
       # ts-fold
-      tree-edit
-      evil-tree-edit
-      pkgs.emacs28Packages.tsc
+      aggressive-indent
       all-the-icons
       company
       company-nixos-options
@@ -26,6 +21,7 @@ emacsWithPackages (
       envrc
       evil
       evil-collection
+      evil-tree-edit
       fira-code-mode
       go-translate
       good-scroll
@@ -36,6 +32,7 @@ emacsWithPackages (
       helm-nixos-options
       helm-projectile
       highlight-indent-guides
+      hl-todo
       lispy
       lsp-haskell
       lsp-mode
@@ -53,6 +50,8 @@ emacsWithPackages (
       org-roam-ui
       org-superstar
       origami
+      pkgs.emacs28Packages.tree-sitter-langs
+      pkgs.emacs28Packages.tsc
       projectile
       psc-ide
       psci
@@ -62,6 +61,8 @@ emacsWithPackages (
       scad-mode
       sudo-utils
       symex
+      tree-edit
+      tree-sitter
       treemacs
       treemacs-evil
       treemacs-icons-dired
diff --git a/profiles/mount-nas/default.nix b/profiles/mount-nas/default.nix
index b7b76aa..90f5924 100644
--- a/profiles/mount-nas/default.nix
+++ b/profiles/mount-nas/default.nix
@@ -1,3 +1,5 @@
+# FIXME: why this doesn't work anymore?
+
 { pkgs, ... }:
 {
   environment.systemPackages = [ pkgs.sshfs ];
@@ -23,37 +25,37 @@
       ];
     in
     {
-      "${target}/amule" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/amule";
-      };
-      "${target}/transmission" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/transmission";
-      };
-      "${target}/calibre" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/calibre";
-      };
-      "${target}/archivio" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/archivio";
-      };
-      "${target}/film" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/film/film";
-      };
-      "${target}/syncthing" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/syncthing";
-      };
-      "${target}/aria" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/archivio/aria2";
-      };
-      "${target}/musica" = {
-        inherit fsType options;
-        device = "${nasUser}@${nasHost}:/mnt/film/musica";
-      };
+      # "${target}/amule" = {
+      #   inherit fsType options;
+      #   device = "${nasUser}@${nasHost}:/mnt/archivio/amule/";
+      # };
+      # "${target}/transmission" = {
+      #   inherit fsType options;
+      #   device = "${nasUser}@${nasHost}:/mnt/archivio/transmission/";
+      # };
+      # "${target}/calibre" = {
+      #   inherit fsType options;
+      #   device = "${nasUser}@${nasHost}:/mnt/archivio/calibre/";
+      # };
+      # "${target}/archivio" = {
+      #   inherit fsType options;
+      #   device = "${nasUser}@${nasHost}:/mnt/archivio/archivio/";
+      # };
+      #   "${target}/film" = {
+      #     inherit fsType options;
+      #     device = "${nasUser}@${nasHost}:/mnt/film/film/";
+      #   };
+      #   "${target}/syncthing" = {
+      #     inherit fsType options;
+      #     device = "${nasUser}@${nasHost}:/mnt/archivio/syncthing/";
+      #   };
+      #   "${target}/aria" = {
+      #     inherit fsType options;
+      #     device = "${nasUser}@${nasHost}:/mnt/archivio/aria2/";
+      #   };
+      #   "${target}/musica" = {
+      #     inherit fsType options;
+      #     device = "${nasUser}@${nasHost}:/mnt/film/musica/";
+      #   };
     };
 }
diff --git a/users/profiles/emacs/emacs.d/config/aesthetics.el b/users/profiles/emacs/emacs.d/config/aesthetics.el
index a4b829c..2916349 100644
--- a/users/profiles/emacs/emacs.d/config/aesthetics.el
+++ b/users/profiles/emacs/emacs.d/config/aesthetics.el
@@ -51,6 +51,9 @@
 (use-package origami
   :hook ((prog-mode . origami-mode)))
 
+(use-package hl-todo
+  :hook ((prog-mode . hl-todo-mode)))
+
 ;; TODO: To move in a different config file
 (when (string-equal system-type "darwin")
   (set-face-attribute 'default nil :height 150)