Compare commits
1 commit
master
...
update-fla
| Author | SHA1 | Date | |
|---|---|---|---|
| 51e77b05f5 |
16 changed files with 199 additions and 417 deletions
.forgejo/workflows
flake.lockhmModules
hosts/sisko
lib
modules
amule
arbi
dump1090
forgejo-runners
garmin-grafana
packages/emacs
|
|
@ -9,12 +9,6 @@ jobs:
|
|||
name: Checkout repository
|
||||
- name: Attic login
|
||||
run: attic login nixfleet http://sisko.wg.aciceri.dev:8081 ${{secrets.ATTIC_NIXFLEET_TOKEN}}
|
||||
- name: Setup SSH
|
||||
run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{secrets.FORGEJO_SSH_KEY}}" > ~/.ssh/id_ed25519
|
||||
chmod 600 ~/.ssh/id_ed25519
|
||||
ssh-keyscan github.com >> ~/.ssh/known_hosts
|
||||
- name: Build with nix
|
||||
run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --attic-cache "nixfleet" --skip-cached --result-file result.json || true
|
||||
- name: Report checks
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
name: update-flake-lock
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 15 * * 1" # weekly on Monday at 15:00
|
||||
- cron: "0 15 * * *" # daily at 15:00
|
||||
|
||||
jobs:
|
||||
lockfile:
|
||||
|
|
|
|||
112
flake.lock
generated
112
flake.lock
generated
|
|
@ -26,11 +26,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746175539,
|
||||
"narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=",
|
||||
"lastModified": 1747268376,
|
||||
"narHash": "sha256-JDcdINnB1bfbUAy1eEgwIXLrfZeuntxuxTu7UWcQrQY=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04",
|
||||
"rev": "7a6ccdeba6e761bec9601e2192983e6b9dff630c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -41,11 +41,11 @@
|
|||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1741481578,
|
||||
"narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
|
||||
"lastModified": 1746291859,
|
||||
"narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
|
||||
"rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -83,11 +83,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745812220,
|
||||
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
|
||||
"lastModified": 1747274630,
|
||||
"narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
|
||||
"rev": "ec7c109a4f794fce09aad87239eab7f66540b888",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -122,11 +122,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746240489,
|
||||
"narHash": "sha256-DWMG7jkpxrEGzTZZerDqaxT8X983tibFGfNeoWtX1yU=",
|
||||
"lastModified": 1747300110,
|
||||
"narHash": "sha256-mHePt7oDQepKT5jm4ZCjvohAIO0QPVVYZIIIn7VARKo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "66bb2d7a4df96d0c1e63648850b7aed1b2e8d683",
|
||||
"rev": "d8949f8c77eadcc7b268f994361fd2055cfbf2cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -191,11 +191,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -282,11 +282,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"lastModified": 1746537231,
|
||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -387,11 +387,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746243165,
|
||||
"narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=",
|
||||
"lastModified": 1747279714,
|
||||
"narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2",
|
||||
"rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -448,11 +448,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745271491,
|
||||
"narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=",
|
||||
"lastModified": 1747056319,
|
||||
"narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba",
|
||||
"rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -464,11 +464,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1746186329,
|
||||
"narHash": "sha256-MLz0MjeVCaqvIvf5szUwNwYEiXC/lKWL0I2VS+6V/e0=",
|
||||
"lastModified": 1747273354,
|
||||
"narHash": "sha256-LUzJQ0T6XtlZLuFZ9ovLLCdzaCc4YhotPlMLoMcGD5w=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f",
|
||||
"revCount": 17824,
|
||||
"rev": "b7ce00fc55dea4fa1e282921beebff25e6b2d1f0",
|
||||
"revCount": 17889,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -489,11 +489,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742945498,
|
||||
"narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
|
||||
"lastModified": 1746839253,
|
||||
"narHash": "sha256-pRwi8Wn8Yofj459gq+3oIRy8F3SXeEJ6mzfIAUgM9nA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
|
||||
"revCount": 138,
|
||||
"rev": "58baedd53f9da81fd728a4f3b08c378e5ba9ae58",
|
||||
"revCount": 142,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
},
|
||||
|
|
@ -554,11 +554,11 @@
|
|||
"nmd": "nmd"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725658585,
|
||||
"narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=",
|
||||
"lastModified": 1747158007,
|
||||
"narHash": "sha256-uwRCd2RAAdMOvReceeaWHGp8RoGjFyIouQN053MsMSk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-on-droid",
|
||||
"rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc",
|
||||
"rev": "7f68d674b30997434868c9e93784724fdbf37367",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -569,11 +569,11 @@
|
|||
},
|
||||
"nixosHardware": {
|
||||
"locked": {
|
||||
"lastModified": 1745955289,
|
||||
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -647,11 +647,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1746183838,
|
||||
"narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
|
||||
"lastModified": 1746957726,
|
||||
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bf3287dac860542719fe7554e21e686108716879",
|
||||
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -711,11 +711,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1746141548,
|
||||
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -742,11 +742,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1746141548,
|
||||
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -821,11 +821,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741379162,
|
||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
||||
"lastModified": 1746537231,
|
||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -906,11 +906,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741573199,
|
||||
"narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
|
||||
"lastModified": 1747017456,
|
||||
"narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
|
||||
"rev": "5b07506ae89b025b14de91f697eba23b48654c52",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1009,11 +1009,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746216483,
|
||||
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||
"lastModified": 1747299117,
|
||||
"narHash": "sha256-JGjCVbxS+9t3tZ2IlPQ7sdqSM4c+KmIJOXVJPfWmVOU=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||
"rev": "e758f27436367c23bcd63cd973fa5e39254b530e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -566,10 +566,7 @@
|
|||
:mode "\\.hs\\'"
|
||||
:config
|
||||
(add-to-list 'eglot-server-programs
|
||||
'(haskell-ts-mode . ("haskell-language-server" "--lsp"))))
|
||||
|
||||
(use-package tidal
|
||||
:custom ((tidal-interpreter "tidal")))
|
||||
'(haskell-ts-mode . ("haskell-language-server-wrapper" "--lsp"))))
|
||||
|
||||
(use-package purescript-mode
|
||||
:custom ((project-vc-extra-root-markers '("spago.dhall")))
|
||||
|
|
@ -599,15 +596,6 @@
|
|||
(use-package gptscript-mode
|
||||
:mode "\\.gpt\\'")
|
||||
|
||||
(use-package gptscript-mode
|
||||
:mode "\\.gpt\\'")
|
||||
|
||||
(use-package typst-ts-mode
|
||||
:config
|
||||
(add-to-list 'eglot-server-programs
|
||||
'(typst-ts-mode . ("tinymist" "lsp")))
|
||||
:mode "\\.typ\\'")
|
||||
|
||||
;; FIXME
|
||||
;; (use-package mmm-mode
|
||||
;; :config
|
||||
|
|
@ -1039,7 +1027,7 @@ This is meant to be an helper to be called from the window manager."
|
|||
)
|
||||
(gptel-default-mode 'org-mode)
|
||||
(gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it
|
||||
(gptel-use-tools 't)
|
||||
(gptel-use-tools nil)
|
||||
|
||||
:bind
|
||||
("C-c a a" . gptel-add)
|
||||
|
|
@ -1054,139 +1042,56 @@ This is meant to be an helper to be called from the window manager."
|
|||
;; (add-hook 'gptel-post-response-functions 'gptel-end-of-response)
|
||||
;; (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll)
|
||||
|
||||
(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
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(let ((count 0))
|
||||
(while (search-forward old-string nil t)
|
||||
(setq count (1+ count)))
|
||||
(if (= count 0)
|
||||
(format "Error: Could not find text to replace in buffer %s" buffer-name)
|
||||
(if (> count 1)
|
||||
(format "Error: Found %d matches for the text to replace in buffer %s" count buffer-name)
|
||||
(goto-char (point-min))
|
||||
(search-forward old-string)
|
||||
(replace-match new-string t t)
|
||||
(format "Successfully edited buffer %s" buffer-name))))))))
|
||||
|
||||
(defun ccr/replace-buffer (buffer-name content)
|
||||
"Completely replace contents of BUFFER-NAME with CONTENT."
|
||||
(with-current-buffer buffer-name
|
||||
(erase-buffer)
|
||||
(setq gptel-tools (mapcar (lambda (tool) (apply #'gptel-make-tool tool))
|
||||
'((
|
||||
:name "create_file"
|
||||
:function (lambda (path filename content)
|
||||
(let ((full-path (expand-file-name filename path)))
|
||||
(with-temp-buffer
|
||||
(insert content)
|
||||
(format "Buffer replaced: %s" buffer-name)))
|
||||
|
||||
(setq gptel-tools `(
|
||||
,(gptel-make-tool
|
||||
:function (lambda (url)
|
||||
(with-current-buffer (url-retrieve-synchronously url)
|
||||
(goto-char (point-min))
|
||||
(forward-paragraph)
|
||||
(let ((dom (libxml-parse-html-region (point) (point-max))))
|
||||
(run-at-time 0 nil #'kill-buffer (current-buffer))
|
||||
(with-temp-buffer
|
||||
(shr-insert-document dom)
|
||||
(buffer-substring-no-properties (point-min) (point-max))))))
|
||||
:name "read_url"
|
||||
:description "Fetch and read the contents of a URL"
|
||||
:args (list '(:name "url"
|
||||
(write-file full-path))
|
||||
(format-read "Created file %s in %s" filename path)))
|
||||
:description "Create a new file with the specified content"
|
||||
:args (list '(:name "path"
|
||||
:type string
|
||||
:description "The URL to read"))
|
||||
:category "web")
|
||||
,(gptel-make-tool
|
||||
:function (lambda (filepath)
|
||||
(with-temp-buffer
|
||||
(insert-file-contents (expand-file-name filepath))
|
||||
(buffer-string)))
|
||||
:name "read_file"
|
||||
:description "Read and display the contents of a file"
|
||||
:args (list '(:name "filepath"
|
||||
:description "The directory where to create the file")
|
||||
'(:name "filename"
|
||||
:type string
|
||||
:description "Path to the file to read. Supports relative paths and ~."))
|
||||
:category "filesystem")
|
||||
,(gptel-make-tool
|
||||
:function (lambda (directory)
|
||||
(mapconcat #'identity
|
||||
(directory-files directory)
|
||||
"\n"))
|
||||
:name "list_directory"
|
||||
:description "List the contents of a given directory"
|
||||
:args (list '(:name "directory"
|
||||
:description "The name of the file to create")
|
||||
'(:name "content"
|
||||
:type string
|
||||
:description "The path to the directory to list"))
|
||||
:category "filesystem")
|
||||
,(gptel-make-tool
|
||||
:function (lambda () (mapcar 'buffer-name (buffer-list)))
|
||||
:name "list_buffers"
|
||||
:description "Return a list containing all the Emacs buffers"
|
||||
:category "emacs")
|
||||
,(gptel-make-tool
|
||||
:function (lambda (buffer)
|
||||
(unless (buffer-live-p (get-buffer buffer))
|
||||
(error "Error: buffer %s is not live." buffer))
|
||||
(with-current-buffer buffer
|
||||
(buffer-substring-no-properties (point-min) (point-max))))
|
||||
:name "read_buffer"
|
||||
:description "Return the contents of an Emacs buffer"
|
||||
:args (list '(:name "buffer"
|
||||
:description "The content to write to the file"))
|
||||
:category "filesystem"
|
||||
)
|
||||
;; (
|
||||
;; :name "run_command"
|
||||
;; :confirm 't
|
||||
;; :function (lambda (command)
|
||||
;; (shell-command-to-string command))
|
||||
;; :description "Run arbitrary commands"
|
||||
;; :args (list '(:name "command"
|
||||
;; :type string
|
||||
;; :description "The content to run e.g. 'ls *' or 'fd <pattern> <path>'"))
|
||||
;; )
|
||||
(
|
||||
:name "get_weather"
|
||||
:function (lambda (location)
|
||||
(url-retrieve-synchronously "api.weather.com/..."
|
||||
location unit))
|
||||
:description "Get the current weather in a given location"
|
||||
:args (list '(:name "location"
|
||||
:type string
|
||||
:description "The name of the buffer whose contents are to be retrieved"))
|
||||
: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"
|
||||
:description "The city and state, e.g. San Francisco, CA")
|
||||
'(:name "unit"
|
||||
: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
|
||||
:description "Edits Emacs buffers"
|
||||
:confirm t
|
||||
:args '((:name "buffer_name"
|
||||
:type string
|
||||
:description "Name of the buffer to modify"
|
||||
:required t)
|
||||
(:name "old_string"
|
||||
:type string
|
||||
:description "Text to replace (must match exactly)"
|
||||
:required t)
|
||||
(:name "new_string"
|
||||
:type string
|
||||
:description "Text to replace old_string with"
|
||||
:required t))
|
||||
:category "edit")
|
||||
,
|
||||
(gptel-make-tool
|
||||
:name "ReplaceBuffer"
|
||||
:function #'ccr/replace-buffer
|
||||
:description "Completely overwrites buffer contents"
|
||||
:confirm t
|
||||
:args '((:name "buffer_name"
|
||||
:type string
|
||||
:description "Name of the buffer to overwrite"
|
||||
:required t)
|
||||
(:name "content"
|
||||
:type string
|
||||
:description "Content to write to the buffer"
|
||||
:required t))
|
||||
:category "edit")
|
||||
:enum ["celsius" "farenheit"]
|
||||
:description
|
||||
"The unit of temperature, either 'celsius' or 'fahrenheit"
|
||||
:optional t
|
||||
))
|
||||
|
||||
)
|
||||
))
|
||||
)
|
||||
|
||||
(defun ccr/suggest-eshell-command ()
|
||||
(interactive)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentry.package = pkgs.pinentry-rofi.override {
|
||||
pinentryPackage = pkgs.pinentry-rofi.override {
|
||||
rofi = pkgs.rofi-wayland;
|
||||
};
|
||||
extraConfig = ''
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
|
||||
"palette": {
|
||||
"os": "#ACB0BE",
|
||||
"closer": "p:os",
|
||||
"pink": "#F5C2E7",
|
||||
"lavender": "#B4BEFE",
|
||||
"blue": "#89B4FA"
|
||||
},
|
||||
"blocks": [
|
||||
{
|
||||
"alignment": "left",
|
||||
"segments": [
|
||||
{
|
||||
"foreground": "p:blue",
|
||||
"style": "plain",
|
||||
"template": "{{ .UserName }}@{{ .HostName }} ",
|
||||
"type": "session"
|
||||
},
|
||||
{
|
||||
"foreground": "p:pink",
|
||||
"properties": {
|
||||
"folder_icon": "..\ue5fe..",
|
||||
"home_icon": "~",
|
||||
"style": "agnoster_short"
|
||||
},
|
||||
"style": "plain",
|
||||
"template": "{{ .Path }} ",
|
||||
"type": "path"
|
||||
},
|
||||
{
|
||||
"foreground": "p:lavender",
|
||||
"properties": {
|
||||
"branch_icon": "\ue725 ",
|
||||
"cherry_pick_icon": "\ue29b ",
|
||||
"commit_icon": "\uf417 ",
|
||||
"fetch_status": false,
|
||||
"fetch_upstream_icon": false,
|
||||
"merge_icon": "\ue727 ",
|
||||
"no_commits_icon": "\uf0c3 ",
|
||||
"rebase_icon": "\ue728 ",
|
||||
"revert_icon": "\uf0e2 ",
|
||||
"tag_icon": "\uf412 "
|
||||
},
|
||||
"template": "{{ .HEAD }} ",
|
||||
"style": "plain",
|
||||
"type": "git"
|
||||
},
|
||||
{
|
||||
"style": "plain",
|
||||
"foreground": "p:closer",
|
||||
"template": "\uf105",
|
||||
"type": "text"
|
||||
}
|
||||
],
|
||||
"type": "prompt"
|
||||
}
|
||||
],
|
||||
"final_space": true,
|
||||
"version": 3
|
||||
}
|
||||
|
|
@ -84,12 +84,7 @@
|
|||
programs.thefuck.enable = true;
|
||||
programs.oh-my-posh = {
|
||||
enable = true;
|
||||
# same as "captuccin_mocha" but without the OS logo
|
||||
settings = lib.mkForce (
|
||||
builtins.fromJSON (
|
||||
builtins.unsafeDiscardStringContext (builtins.readFile ./catppuccin_mocha.omp.json)
|
||||
)
|
||||
);
|
||||
useTheme = "catppuccin_mocha";
|
||||
};
|
||||
|
||||
programs.zellij.enableBashIntegration = false;
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@ in
|
|||
{
|
||||
home.packages = [ spotify-adblocked ];
|
||||
|
||||
# systemd.user.services.spotify-adblocked = {
|
||||
# Install.WantedBy = [ "graphical-session.target" ];
|
||||
systemd.user.services.spotify-adblocked = {
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
|
||||
# Unit = {
|
||||
# Description = "Spotify";
|
||||
# PartOf = [ "graphical-session.target" ];
|
||||
# };
|
||||
Unit = {
|
||||
Description = "Spotify";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
# Service = {
|
||||
# ExecStart = lib.getExe spotify-adblocked;
|
||||
# Restart = "on-failure";
|
||||
# RestartSec = 3;
|
||||
# };
|
||||
# };
|
||||
Service = {
|
||||
ExecStart = lib.getExe spotify-adblocked;
|
||||
Restart = "on-failure";
|
||||
RestartSec = 3;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@
|
|||
"amule"
|
||||
"adguard-home"
|
||||
"garmin-grafana"
|
||||
# "dump1090"
|
||||
"arbi"
|
||||
]
|
||||
++ [
|
||||
./disko.nix
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
ccr-ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIm9Sl/I+5G4g4f6iE4oCUJteP58v+wMIew9ZuLB+Gea";
|
||||
oneplus8t = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8da1Mf11vXFF0kVDgxocVoGwpHHMEs9emS9T+v8hLb oneplus8t";
|
||||
hercules-ci-agent = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPupm00BiveTIYF6CNwuMijF5VvEaPDMjvt+vMlAy+N hercules-ci-agent";
|
||||
forgejo-ci = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5mbqLoZ/0J45J7J+17XMGv/dXs3DGABJsnvDv4rgC9 forgjeo-ci";
|
||||
};
|
||||
hosts = {
|
||||
kirk = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAH49KzayIro3L1bteR7nwupMM/vKlDh05t5/DFD9/uz";
|
||||
|
|
|
|||
|
|
@ -1,46 +1,34 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
rev = "966199fe1dccc9c6c7016bdb1d9582f27797bc02";
|
||||
amule-flake = builtins.getFlake "github:NixOS/nixpkgs/${rev}";
|
||||
inherit (amule-flake.legacyPackages.${pkgs.system}) amule-daemon amule-web;
|
||||
in
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
disabledModules = [ "services/networking/amuled.nix" ];
|
||||
documentation.nixos.enable = false;
|
||||
|
||||
imports = [ "${amule-flake}/nixos/modules/services/networking/amuled.nix" ];
|
||||
users.users.amule = {
|
||||
isSystemUser = true;
|
||||
group = "amule";
|
||||
extraGroups = [ "amule" ];
|
||||
home = config.services.amule.dataDir;
|
||||
};
|
||||
|
||||
users.groups.amule = { };
|
||||
services.amule = {
|
||||
dataDir = "/mnt/hd/amule";
|
||||
enable = true;
|
||||
package = amule-daemon;
|
||||
amuleWebPackage = amule-web;
|
||||
openPeerPorts = true;
|
||||
openWebServerPort = true;
|
||||
# TODO the service is accessible only from the VPN
|
||||
# however better using agenix
|
||||
ExternalConnectPasswordFile = pkgs.writeText "password" "pippo";
|
||||
WebServerPasswordFile = pkgs.writeText "password" "pippo";
|
||||
settings = {
|
||||
eMule = {
|
||||
IncomingDir = "/mnt/hd/amule";
|
||||
TempDir = "/mnt/hd/amule/Temp";
|
||||
};
|
||||
WebServer = {
|
||||
Enabled = 1;
|
||||
};
|
||||
};
|
||||
user = "amule";
|
||||
};
|
||||
|
||||
# sometimes the service crashes with a segfeault without any reason...
|
||||
systemd.services.amuled.serviceConfig.Restart = lib.mkForce "always";
|
||||
|
||||
environment.persistence."/persist".directories = [
|
||||
config.services.amule.dataDir
|
||||
];
|
||||
|
||||
services.nginx.virtualHosts."amule.sisko.wg.aciceri.dev" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "aciceri.dev";
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${builtins.toString config.services.amule.settings.WebServer.Port}";
|
||||
};
|
||||
serverAliases = [ "amule.sisko.zt.aciceri.dev" ];
|
||||
};
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [ 4662 ];
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 4665;
|
||||
to = 4672;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
rev = "d531730d9640160f0519ef4b3640f8da49dd96f8";
|
||||
arbi-flake = builtins.getFlake "git+ssh://git@github.com/aciceri/arbi.git?rev=${rev}";
|
||||
in
|
||||
{
|
||||
imports = [ arbi-flake.nixosModules.arbi ];
|
||||
|
||||
services.arbi = {
|
||||
enable = true;
|
||||
log_level = "debug";
|
||||
configFile = pkgs.writeText "arbi-config.kdl" ''
|
||||
endpoint "wss://eth-mainnet.g.alchemy.com/v2/<REDACTED>"
|
||||
pairs_file "pairs.json"
|
||||
concurrency 4
|
||||
'';
|
||||
};
|
||||
|
||||
environment.persistence."/persist".directories = [
|
||||
config.services.arbi.dataDir
|
||||
];
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
dump1090-flake = builtins.getFlake "github:NixOS/nixpkgs/541f05042033467730fb8cedb08355dc91b94c74";
|
||||
inherit (dump1090-flake.legacyPackages.${pkgs.system}) dump1090-fa;
|
||||
in
|
||||
{
|
||||
imports = [ "${dump1090-flake}/nixos/modules/services/misc/dump1090-fa.nix" ];
|
||||
|
||||
hardware.rtl-sdr.enable = true;
|
||||
|
||||
disabledModules = [ "services/misc/dump10190-fa.nix" ];
|
||||
documentation.nixos.enable = false;
|
||||
|
||||
services.dump1090-fa = {
|
||||
enable = true;
|
||||
package = dump1090-fa;
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."dump1090.sisko.wg.aciceri.dev" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "aciceri.dev";
|
||||
locations = {
|
||||
"/".alias = "${dump1090-fa}/share/dump1090/";
|
||||
"/data/".alias = "/run/dump1090-fa/";
|
||||
};
|
||||
serverAliases = [ "dump1090.sisko.zt.aciceri.dev" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,6 @@ let
|
|||
gnugrep
|
||||
gawk
|
||||
git
|
||||
openssh
|
||||
nix
|
||||
bash
|
||||
jq
|
||||
|
|
@ -39,6 +38,15 @@ let
|
|||
cp -a "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" $out/etc/ssl/certs/ca-bundle.crt
|
||||
'';
|
||||
numInstances = 1;
|
||||
pushToCache = pkgs.writeScript "push-to-cache.sh" ''
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
set -f # disable globbing
|
||||
export IFS=' '
|
||||
|
||||
echo "Uploading paths" $OUT_PATHS
|
||||
exec nix copy --to "s3://cache?profile=default®ion=eu-south-1&scheme=https&endpoint=cache.aciceri.dev" $OUT_PATHS
|
||||
'';
|
||||
in
|
||||
lib.mkMerge [
|
||||
{
|
||||
|
|
@ -72,6 +80,7 @@ lib.mkMerge [
|
|||
cat <<NIX_CONFIG > etc/nix/nix.conf
|
||||
accept-flake-config = true
|
||||
experimental-features = nix-command flakes
|
||||
post-build-hook = ${pushToCache}
|
||||
include access-tokens
|
||||
NIX_CONFIG
|
||||
|
||||
|
|
@ -112,9 +121,22 @@ lib.mkMerge [
|
|||
nix.settings.trusted-users = [ "nixuser" ];
|
||||
}
|
||||
{
|
||||
# Format of the token file:
|
||||
virtualisation = {
|
||||
podman.enable = true;
|
||||
};
|
||||
|
||||
# virtualisation.containers.storage.settings = {
|
||||
# storage.driver = "zfs";
|
||||
# storage.graphroot = "/var/lib/containers/storage";
|
||||
# storage.runroot = "/run/containers/storage";
|
||||
# storage.options.zfs.fsname = "zroot/root/podman";
|
||||
# };
|
||||
|
||||
# virtualisation.containers.containersConf.settings = {
|
||||
# # podman seems to not work with systemd-resolved
|
||||
# containers.dns_servers = [ "8.8.8.8" "8.8.4.4" ];
|
||||
# };
|
||||
}
|
||||
{
|
||||
systemd.services =
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
rev = "f24579d13ee035af96d4a68b765af2aa4b1018b6";
|
||||
garmin-grafana-flake = builtins.getFlake "github:NixOS/nixpkgs/${rev}";
|
||||
garmin-grafana-flake = builtins.getFlake "github:NixOS/nixpkgs/1f03fefb44665cd2377912033de22ffaba2be48d";
|
||||
inherit (garmin-grafana-flake.legacyPackages.${pkgs.system}) garmin-grafana;
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -206,7 +206,6 @@ let
|
|||
mixed-pitch
|
||||
visual-replace
|
||||
org-super-agenda
|
||||
tidal
|
||||
# org-re-reveal # FIXME very not nice hash mismatch when building
|
||||
]
|
||||
)
|
||||
|
|
@ -223,9 +222,6 @@ let
|
|||
eat
|
||||
corfu-terminal
|
||||
haskell-ts-mode
|
||||
])
|
||||
++ (with epkgs; [
|
||||
typst-ts-mode # why this doesn't seem to be in elpaPackages?
|
||||
]);
|
||||
in
|
||||
mainPackages ++ (builtins.attrValues extraPackages)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue