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

Compare commits

base: aciceri:24a80896a820f63d45587b3970281a3e54512603
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
..
compare: aciceri:22b1484026f9a6ef02d460fd0eac03a56d2bad43
Branches Tags
aciceri:update-flake-lock
aciceri:master
aciceri:aaa
aciceri:wip
aciceri:test

No commits in common. "24a80896a820f63d45587b3970281a3e54512603" and "22b1484026f9a6ef02d460fd0eac03a56d2bad43" have entirely different histories.
24a80896a8 ... 22b1484026

7 changed files with 20 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

70
hmModules/emacs/init.el
View file

@ -927,7 +927,7 @@ This is meant to be an helper to be called from the window manager."
(require 'org-roam-protocol)
:custom
(org-roam-v2-ack t)
(org-roam-directory (file-truename "~/roam"))
(org-roam-directory (file-truename "~/org"))
(org-roam-complete-everywhere 't)
(org-roam-dailies-capture-templates
'(
@ -970,23 +970,23 @@ This is meant to be an helper to be called from the window manager."
"Check if node was created in given time range"
#'org-roam-node-date
#'(lambda (node-date start-date end-date)
(let ((node-date (condition-case nil
;; if the entry is not from the journal (i.e. the filename is not something like "2024-10-10.org")
;; then it's always discarded (the epoch time is given to it)
(encode-time (org-parse-time-string node-date))
(error (encode-time (org-parse-time-string "<1970-01-01>")))))
(start-date (encode-time (org-parse-time-string start-date)))
(end-date (encode-time (org-parse-time-string end-date))))
(and (time-less-p start-date node-date)
(time-less-p node-date end-date)))
))
(let ((node-date (condition-case nil
;; if the entry is not from the journal (i.e. the filename is not something like "2024-10-10.org")
;; then it's always discarded (the epoch time is given to it)
(encode-time (org-parse-time-string node-date))
(error (encode-time (org-parse-time-string "<1970-01-01>")))))
(start-date (encode-time (org-parse-time-string start-date)))
(end-date (encode-time (org-parse-time-string end-date))))
(and (time-less-p start-date node-date)
(time-less-p node-date end-date)))
))
(defun ccr/org-roam-spent-hours (client &optional date-start date-end)
"Return the total spent hours on something (usually a client)"
(let* ((query-tags `(tags ,client "billable"))
(query (if (and date-start date-end)
`(and ,query-tags (date-range ,date-start ,date-end))
query-tags)))
(query (if (and date-start date-end)
`(and ,query-tags (date-range ,date-start ,date-end))
query-tags)))
(apply #'+(mapcar #'org-roam-node-spent (org-roam-ql-nodes query))))))
(use-package org-roam-ql
@ -1027,13 +1027,6 @@ This is meant to be an helper to be called from the window manager."
org-roam-ui-update-on-save t
org-roam-ui-open-on-start nil))
(use-package org-download
:after org
:custom (org-download-image-dir (concat org-roam-directory "/images"))
:bind
(:map org-mode-map
(("M-p" . org-download-clipboard))))
(use-package gptel
:custom
(gptel-model 'google/gemini-2.5-flash-preview)
@ -1064,7 +1057,7 @@ This is meant to be an helper to be called from the window manager."
(defun ccr/edit-buffer (buffer-name old-string new-string)
"In BUFFER-NAME, replace OLD-STRING with NEW-STRING."
(with-current-buffer buffer-name
(let ((case-fold-search nil)) ;; Case-sensitive search
(let ((case-fold-search nil)) ;; Case-sensitive search
(save-excursion
(goto-char (point-min))
(let ((count 0))
@ -1159,23 +1152,6 @@ This is meant to be an helper to be called from the window manager."
:type string
:description "The text to append to the buffer."))
:category "emacs")
,(gptel-make-tool
:function (lambda (buffer text)
(with-current-buffer (get-buffer-create buffer)
(save-excursion
(goto-char (point-max))
(insert text)))
(format "Appended text to buffer %s" buffer))
:name "append_to_buffer"
:description "Append text to an Emacs buffer. If the buffer does not exist, it will be created."
:confirm t
:args (list '(:name "buffer"
:type string
:description "The name of the buffer to append text to.")
'(:name "text"
:type string
:description "The text to append to the buffer."))
:category "emacs")
,(gptel-make-tool
:name "EditBuffer"
:function #'ccr/edit-buffer
@ -1209,22 +1185,6 @@ This is meant to be an helper to be called from the window manager."
:description "Content to write to the buffer"
:required t))
:category "edit")
,(gptel-make-tool
:function (lambda (title body)
(org-roam-capture-
:templates `(("d" "" plain "%?" :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" ,(concat "#+title: ${title}\n\n" body)))) ; override default template
:node (org-roam-node-create :title title)
:props '(:unnarrowed 't :tags "gptel"))
)
:name "create_org_roam_note"
:description "Create a new org-roam note."
:args (list '(:name "title"
:type string
:description "The name of the note to create. Try to automatically infere it and ask only if dubious.")
'(:name "body"
:type string
:description "The body of the note write in an org language, aovoid starting with an headline as first line. Feel free to exploit the org syntax."))
:category "org-roam")
))

24
hmModules/unison/default.nix
View file

@ -1,24 +0,0 @@
{ pkgs, lib, ... }:
{
home.packages = [ pkgs.unison ];
services.unison = {
enable = true;
pairs = {
"roam" = {
roots = [
# Pair of roots to synchronize
"/home/ccr/roam"
"ssh://root@sisko.wg.aciceri.dev//mnt/hd/roam"
];
commandOptions = {
auto = "true";
batch = "true";
log = "false";
repeat = "watch";
sshcmd = lib.getExe pkgs.openssh;
ui = "text";
};
};
};
};
}

2
hosts/kirk/default.nix
View file

@ -28,11 +28,13 @@
"pam"
"wireguard-client"
"greetd"
"syncthing"
"mount-sisko"
"adb"
"binfmt"
"prometheus-exporters"
"alloy"
"syncthing"
"zerotier"
]
++ [ ./disko.nix ];

2
hosts/picard/default.nix
View file

@ -31,6 +31,7 @@
"wireguard-client"
"binfmt"
"greetd"
"syncthing"
"hass-poweroff"
"forgejo-runners"
"teamviewer"
@ -98,7 +99,6 @@
"pantalaimon"
"moonlight"
"gimp"
"unison"
];
extraGroups = [ "plugdev" ];
backupPaths = [ ];

1
hosts/pike/default.nix
View file

@ -29,6 +29,7 @@
"wireguard-client"
"binfmt"
"greetd"
# "syncthing"
"teamviewer"
"sunshine"
"mount-sisko"

2
hosts/sisko/default.nix
View file

@ -26,6 +26,7 @@
"atuin"
"immich"
"paperless"
"syncthing"
"atticd"
"jellyfin"
"matrix"
@ -113,7 +114,6 @@
environment.systemPackages = with pkgs; [
cifs-utils
unison
];
powerManagement.scsiLinkPolicy = "med_power_with_dipm";

1
packages/emacs/packages.nix
View file

@ -188,7 +188,6 @@ let
org-roam
org-roam-ql
org-roam-ui
org-download
visual-fill-column
consult-org-roam
pass