Compare commits
No commits in common. "2a1db15b8cfd97e9b7f50641cba60ba46f1beb9a" and "3885f590831e17db307f1623bf1e68dec8a60ce3" have entirely different histories.
2a1db15b8c
...
3885f59083
4 changed files with 39 additions and 59 deletions
52
flake.lock
generated
52
flake.lock
generated
|
|
@ -68,11 +68,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768923567,
|
"lastModified": 1763651264,
|
||||||
"narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=",
|
"narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28",
|
"rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -105,15 +105,15 @@
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767039857,
|
"lastModified": 1747046372,
|
||||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||||
"owner": "NixOS",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -165,11 +165,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763988335,
|
"lastModified": 1763319842,
|
||||||
"narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
|
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
|
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -249,11 +249,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769187349,
|
"lastModified": 1763906693,
|
||||||
"narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=",
|
"narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb",
|
"rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -334,11 +334,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769018530,
|
"lastModified": 1763678758,
|
||||||
"narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
|
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
|
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -398,11 +398,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764374374,
|
"lastModified": 1763553727,
|
||||||
"narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=",
|
"narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6a49303095abc094ee77dc243a9e351b642e8e75",
|
"rev": "094318ea16502a7a81ce90dd3638697020f030a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -475,11 +475,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769069492,
|
"lastModified": 1763741496,
|
||||||
"narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
|
"narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
|
"rev": "20e71a403c5de9ce5bd799031440da9728c1cda1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -526,11 +526,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766321686,
|
"lastModified": 1763564778,
|
||||||
"narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
|
"narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
|
"rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,7 @@ in
|
||||||
|
|
||||||
programs.emacs = {
|
programs.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages =
|
extraPackages = epkgs: with epkgs; [ vterm ];
|
||||||
epkgs: with epkgs; [
|
|
||||||
vterm
|
|
||||||
mu4e
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.emacs = {
|
services.emacs = {
|
||||||
|
|
|
||||||
|
|
@ -107,8 +107,7 @@
|
||||||
org-agenda-include-diary t
|
org-agenda-include-diary t
|
||||||
org-agenda-sticky t
|
org-agenda-sticky t
|
||||||
org-todo-keywords '(
|
org-todo-keywords '(
|
||||||
;; (sequence "TODO" "NEXT" "WAIT" "|" "DONE" "CNCL")
|
(sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
|
||||||
(sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
|
|
||||||
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
|
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
|
||||||
)
|
)
|
||||||
org-tag-alist '(
|
org-tag-alist '(
|
||||||
|
|
@ -243,32 +242,18 @@
|
||||||
:after org
|
:after org
|
||||||
:demand t
|
:demand t
|
||||||
:init
|
:init
|
||||||
(setq! org-gtd-update-ack "4.0.0")
|
(setq! org-gtd-update-ack "3.0.0")
|
||||||
(setq! org-gtd-directory org-directory)
|
|
||||||
(setopt org-todo-keywords
|
|
||||||
'(
|
|
||||||
(sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
|
|
||||||
))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
:config
|
:config
|
||||||
(setopt org-gtd-keyword-mapping
|
|
||||||
'((todo . "TODO") ;; tasks not ready to be acted upon
|
|
||||||
(next . "NEXT") ;; tasks ready to act on immediately
|
|
||||||
(wait . "WAIT") ;; tasks blocked or delegated
|
|
||||||
(done . "DONE") ;; tasks successfully completed
|
|
||||||
(canceled . "CNCL"))) ;; tasks that won't be completed
|
|
||||||
|
|
||||||
(setq org-agenda-files (list org-gtd-directory))
|
|
||||||
(setf org-gtd-id--generate #'org-id-get-create)
|
(setf org-gtd-id--generate #'org-id-get-create)
|
||||||
|
(setq! org-gtd-directory org-directory)
|
||||||
(setq! org-gtd-default-file-name "actionable")
|
(setq! org-gtd-default-file-name "actionable")
|
||||||
(setq! org-gtd-refile-to-any-target nil)
|
(setq! org-gtd-refile-to-any-target nil)
|
||||||
(setq! org-gtd-engage-prefix-width 40)
|
(setq! org-gtd-engage-prefix-width 40)
|
||||||
(setq! org-edna-use-inheritance t)
|
(setq! org-edna-use-inheritance t)
|
||||||
;; (setq org-gtd-areas-of-focus '("house" "haskell" "foss"))
|
;; (setq org-gtd-areas-of-focus '("house" "haskell" "foss"))
|
||||||
;; (setq org-gtd-organize-hooks nil)
|
(setq org-gtd-organize-hooks nil)
|
||||||
(org-edna-mode 1)
|
(org-edna-mode)
|
||||||
(map! :leader
|
(map! :leader
|
||||||
:desc "Capture" "X" #'org-gtd-capture
|
:desc "Capture" "X" #'org-gtd-capture
|
||||||
(:prefix-map ("d" . "GTD")
|
(:prefix-map ("d" . "GTD")
|
||||||
|
|
|
||||||
|
|
@ -211,14 +211,11 @@ in
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
# main site
|
# main site
|
||||||
"thrall.failco.de" = {
|
"failco.de" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
root = "/srv/www/failco.de";
|
root = "/srv/www/failco.de";
|
||||||
serverAliases = [
|
serverAliases = [ "www.failco.de" ];
|
||||||
"failco.de"
|
|
||||||
"www.failco.de"
|
|
||||||
];
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
add_header X-Frame-Options 'SAMEORIGIN';
|
add_header X-Frame-Options 'SAMEORIGIN';
|
||||||
'';
|
'';
|
||||||
|
|
@ -325,17 +322,19 @@ in
|
||||||
services.paperless = {
|
services.paperless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
address = "127.0.0.1";
|
address = "127.0.0.1";
|
||||||
domain = "docs.failco.de";
|
|
||||||
port = 3002;
|
port = 3002;
|
||||||
consumptionDirIsPublic = true;
|
consumptionDirIsPublic = true;
|
||||||
configureTika = true;
|
configureTika = true;
|
||||||
exporter.enable = true;
|
|
||||||
settings = {
|
settings = {
|
||||||
PAPERLESS_OCR_LANGUAGE = "deu+eng";
|
PAPERLESS_OCR_LANGUAGE = "deu+eng";
|
||||||
PAPERLESS_OCR_USER_ARGS = ''{"invalidate_digital_signatures": true}'';
|
PAPERLESS_OCR_USER_ARGS = ''{"invalidate_digital_signatures": true}'';
|
||||||
PAPERLESS_URL = "https://docs.failco.de";
|
PAPERLESS_URL = "https://docs.failco.de";
|
||||||
PAPERLESS_CONSUMER_RECURSIVE = true;
|
PAPERLESS_CONSUMER_RECURSIVE = true;
|
||||||
PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS = true;
|
PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS = true;
|
||||||
|
|
||||||
|
# workaround for classification getting stuck, see
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/240591#issuecomment-1915678490
|
||||||
|
OMP_NUM_THREADS = 1;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -467,7 +466,7 @@ in
|
||||||
"charlie@kobjolke.de" = "alex@kobjolke.de";
|
"charlie@kobjolke.de" = "alex@kobjolke.de";
|
||||||
};
|
};
|
||||||
|
|
||||||
x509.useACMEHost = config.mailserver.fqdn;
|
certificateScheme = "acme-nginx";
|
||||||
|
|
||||||
enableImapSsl = true;
|
enableImapSsl = true;
|
||||||
enableManageSieve = true;
|
enableManageSieve = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue