aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Andrea Ciceri 2022-01-24 13:58:46 +01:00
commit ef8529ad34
No known key found for this signature in database
GPG key ID: AAFD2423608B645B
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/hs/configuration.nix
View file

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

3
users/profiles/emacs/emacs.d/config/aesthetics.el
View file

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

4
users/profiles/emacs/emacs.d/config/config-org.el
View file

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