Merge branch 'master' of github.com:aciceri/nixfleet

hosts/hs/configuration.nix

@@ -165,6 +165,8 @@
       guiAddress = "0.0.0.0:8384";
       dataDir = "/mnt/archivio/syncthing";
       user = "ccr";
+      overrideDevices = false;
+      overrideFolders = false;
       folders = {
         "/mnt/archivio/syncthing/camera" = {
           id = "camera";

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

@@ -57,7 +57,8 @@
 (defalias 'yes-or-no-p 'y-or-n-p)
 (setq use-dialog-box nil
       display-time-format "%H:%M"
-      mouse-autoselect-window 't
+      column-number-mode t
+      mouse-autoselect-window t
       inhibit-startup-screen t)
 (menu-bar-mode -1)
 (tool-bar-mode -1)

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

@@ -4,7 +4,11 @@
     (require 'org-protocol)
   :custom
   (org-startup-folded 'fold)
+<<<<<<< HEAD
   (org-startup-indented nil)
+=======
+  (org-startup-indented f)
+>>>>>>> 087566ed5f0d08df2e0b36e4c80398f5c0d26c22
   (org-agenda-files '("~/roam/" "~/orgzly~"))
   (org-ellipsis "⤵")
   (org-pretty-entities t)