From 3451b47e6a88ad6f8f7dc04caf32eadd1a263d38 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 09:58:47 +0100 Subject: [PATCH 01/20] Format --- hmModules/emacs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index 54ff7dc..112bbbe 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -62,12 +62,12 @@ in ); in lib.hm.dag.entryAfter [ "writeBoundary" ] '' - PATH=$PATH:${path} - if [ ! -d "$HOME/.config/emacs" ]; then - mkdir "$HOME/.config/emacs" - $DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el" - $DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs" - fi - $DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter" + PATH=$PATH:${path} + if [ ! -d "$HOME/.config/emacs" ]; then + mkdir "$HOME/.config/emacs" + $DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el" + $DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs" + fi + $DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter" ''; } From 0175810b04ff60d81f3a5766b0b220a6443d4fb0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 09:59:52 +0100 Subject: [PATCH 02/20] Not relevant anymore --- packages/emacs/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 2f30f68..695cf1f 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -107,7 +107,6 @@ let agenix solidity-mode # org-re-reveal # FIXME very not nice hash mismatch when building - # gptel # TODO uncomment when there will be a new release including GPT-4o ] ) ++ (with elpaPackages; [ From 9e4694d115f1da3633006417ec2df955ad262609 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:00:24 +0100 Subject: [PATCH 03/20] Add `telega` to Emacs packages --- packages/emacs/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 695cf1f..57ceee2 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -106,6 +106,7 @@ let gptel agenix solidity-mode + telega # org-re-reveal # FIXME very not nice hash mismatch when building ] ) From 13a40b624d443d8f1f08d2abb8e3d02c984ff6c7 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:01:01 +0100 Subject: [PATCH 04/20] Add `gptscript` to Emacs packages --- packages/emacs/packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 57ceee2..7b1d204 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -24,6 +24,16 @@ let }; deps = [ ]; }; + gptscript = buildEmacsPackage { + name = "gptscript"; + src = pkgs.fetchFromGitHub { + owner = "emacs-openai"; + repo = "gptscript-mode"; + rev = "d9c6272de1288d3f42a1cbac136e5fac57e185e2"; + hash = "sha256-RM0dptx8qm2b4fvW6oQ0Lq5kshRKcapeIW2piUMAZmw="; + }; + deps = [ ]; + }; }; # *List* containing emacs packages from (M)ELPA From 9f1eeca6b4a8e54a2bad6b1e516b8c912f8eefaf Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:01:29 +0100 Subject: [PATCH 05/20] New default name --- packages/deploy/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deploy/deploy.sh b/packages/deploy/deploy.sh index 045facb..5e1b791 100644 --- a/packages/deploy/deploy.sh +++ b/packages/deploy/deploy.sh @@ -1,4 +1,4 @@ -host=${1-mothership} +host=${1-picard} nixos-rebuild switch \ --flake ".#${host}" \ From f13e48aaaf41c2b926fdef2cca08993928263b8b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:01:41 +0100 Subject: [PATCH 06/20] Not using swayvnc anymore (sunshine is better) --- hmModules/hyprland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index bcc035e..884d68b 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -25,7 +25,7 @@ in ../gammastep # ../wezterm # ../wayvnc - ../swaync + # ../swaync ../foot ]; From 00f6fd9f6e76f96c0fee0de7ba70262a7f179fa6 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:02:04 +0100 Subject: [PATCH 07/20] Proof of concept work in progress darwin deployment script --- packages/deploy-darwin/default.nix | 9 +++++++++ packages/deploy-darwin/deploy-darwin.sh | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/deploy-darwin/default.nix create mode 100644 packages/deploy-darwin/deploy-darwin.sh diff --git a/packages/deploy-darwin/default.nix b/packages/deploy-darwin/default.nix new file mode 100644 index 0000000..3feba21 --- /dev/null +++ b/packages/deploy-darwin/default.nix @@ -0,0 +1,9 @@ +{ + writeShellApplication, + ... +}: +writeShellApplication { + name = "deploy-darwin"; + text = builtins.readFile ./deploy-darwin.sh; + runtimeInputs = [ ]; +} diff --git a/packages/deploy-darwin/deploy-darwin.sh b/packages/deploy-darwin/deploy-darwin.sh new file mode 100644 index 0000000..baf540b --- /dev/null +++ b/packages/deploy-darwin/deploy-darwin.sh @@ -0,0 +1,11 @@ +CLOSURE_DRV=$(nix eval .#darwinConfigurations.archer.config.system.build.toplevel.drvPath --raw) +echo "$CLOSURE_DRV" + +nix copy --to ssh://admin@macos-ventura "$CLOSURE_DRV" + +# shellcheck disable=SC2029 +ssh admin@macos-ventura "nix build $CLOSURE_DRV^out" +ssh admin@macos-ventura "./result/activate-user" +ssh admin@macos-ventura "echo admin | sudo -S ./result/activate" +# ssh admin@macos-ventura "./result/sw/bin/darwin-rebuild activate" +ssh admin@macos-ventura "nix profile install ./result" From fb1244edcf12c141a5bfef07f401aaf192e3ef3f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:02:22 +0100 Subject: [PATCH 08/20] Tridactyl uses emacsclient as external editor --- hmModules/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index bb04ac5..400341e 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -86,7 +86,7 @@ in }; xdg.configFile."tridactyl/tridactylrc".text = '' - set editorcmd footclient -e hx %f + set editorcmd emacsclient -c %f colors catppuccin ''; From 0eff21231ba6461cd4ef6996e2bcebffbc3df4f5 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:02:50 +0100 Subject: [PATCH 09/20] Packages renamed --- hmModules/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index 112bbbe..5eba7b8 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -44,8 +44,8 @@ in mediainfo unzipNLS nodejs_20 - pkgs.qadwaitadecorations - pkgs.kdePackages.qtwayland + qadwaitadecorations + kdePackages.qtwayland ] ++ (with hunspellDicts; [ en_US-large From 8f46975d54729807124405954bbaec9432cbcd54 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:03:02 +0100 Subject: [PATCH 10/20] Remove `rock5b` input --- flake.lock | 185 +---------------------------------------------------- flake.nix | 1 - 2 files changed, 2 insertions(+), 184 deletions(-) diff --git a/flake.lock b/flake.lock index a5198a6..b8a8446 100644 --- a/flake.lock +++ b/flake.lock @@ -132,22 +132,6 @@ "type": "github" } }, - "fan-control": { - "flake": false, - "locked": { - "lastModified": 1669548492, - "narHash": "sha256-qqPmOEF+r10VGz3izAnHZW6aJk1mOXy9BrpR9FvWSt0=", - "owner": "pymumu", - "repo": "fan-control-rock5b", - "rev": "8419990c6c0f47a3ed0b55255d7e3591cc5fdab9", - "type": "github" - }, - "original": { - "owner": "pymumu", - "repo": "fan-control-rock5b", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -277,24 +261,6 @@ "type": "indirect" } }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1678379998, - "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -547,23 +513,6 @@ "type": "github" } }, - "kernel-src": { - "flake": false, - "locked": { - "lastModified": 1676631659, - "narHash": "sha256-TjAF7BPSDy5iHSk8byp+vsKop0V+rqrmr+TXLqXLB2M=", - "owner": "radxa", - "repo": "kernel", - "rev": "a9583fb47e9b96c552f458a376207141602c0025", - "type": "github" - }, - "original": { - "owner": "radxa", - "repo": "kernel", - "rev": "a9583fb47e9b96c552f458a376207141602c0025", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -847,22 +796,6 @@ "type": "github" } }, - "nixpkgs-kernel": { - "locked": { - "lastModified": 1656239181, - "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1730504152, @@ -893,24 +826,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -1053,22 +968,6 @@ } }, "nixpkgs_8": { - "locked": { - "lastModified": 1678470307, - "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -1136,22 +1035,6 @@ "type": "github" } }, - "panfork": { - "flake": false, - "locked": { - "lastModified": 1670633863, - "narHash": "sha256-4eZHMiYS+sRDHNBtLZTA8ELZnLns7yT3USU5YQswxQ0=", - "owner": "panfork", - "repo": "mesa", - "rev": "120202c675749c5ef81ae4c8cdc30019b4de08f4", - "type": "gitlab" - }, - "original": { - "owner": "panfork", - "repo": "mesa", - "type": "gitlab" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1219,31 +1102,6 @@ "type": "github" } }, - "rock5b": { - "inputs": { - "fan-control": "fan-control", - "flake-parts": "flake-parts_5", - "kernel-src": "kernel-src", - "nixpkgs": "nixpkgs_8", - "nixpkgs-kernel": "nixpkgs-kernel", - "panfork": "panfork", - "tow-boot": "tow-boot", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1685695782, - "narHash": "sha256-zBQFjZhFWsxCA31jI4Ui3l8KhrqQaG0dHi/v/vIvZcM=", - "owner": "aciceri", - "repo": "rock5b-nixos", - "rev": "3868939df4a6d5292077e154c8cb36de1fde4d30", - "type": "github" - }, - "original": { - "owner": "aciceri", - "repo": "rock5b-nixos", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1266,8 +1124,7 @@ "nixThePlanet": "nixThePlanet", "nixosHardware": "nixosHardware", "nixpkgs": "nixpkgs_7", - "rock5b": "rock5b", - "treefmt-nix": "treefmt-nix_3", + "treefmt-nix": "treefmt-nix_2", "vscode-server": "vscode-server" } }, @@ -1375,23 +1232,6 @@ "type": "github" } }, - "tow-boot": { - "flake": false, - "locked": { - "lastModified": 1677346757, - "narHash": "sha256-3SKlcZhfUaNz1bd/l/1B3D66NUk3sALVIyP8DHv41SU=", - "owner": "aciceri", - "repo": "Tow-Boot", - "rev": "85d099f3473effdeca409bd165175d64dfb37ecc", - "type": "github" - }, - "original": { - "owner": "aciceri", - "ref": "rock5b", - "repo": "Tow-Boot", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1414,27 +1254,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "rock5b", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678277086, - "narHash": "sha256-fQ1G72KhLWWf2z+ug9+4ErTEayvlcVQMul0qusKKBgk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ec39cfa24342fdf0b04ae44592a191c4765f9c74", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1457,7 +1276,7 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index e62a744..de2ff34 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; agenix.url = "github:ryantm/agenix"; - rock5b.url = "github:aciceri/rock5b-nixos"; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; From 392e10d5c4634c50da4920ba33bbcdf8e165e49a Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:03:25 +0100 Subject: [PATCH 11/20] Use external (not committed) custom file --- hmModules/emacs/init.el | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 154a4bc..529cfd0 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -57,6 +57,7 @@ (focus-follows-mouse t) (mouse-autoselect-window t) (treesit-font-lock-level 4) + (custom-file "~/.config/emacs/custom.el") :config (set-face-background 'vertical-border (face-background 'default)) (set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃)) @@ -948,30 +949,3 @@ This is meant to be an helper to be called from the window manager." (provide 'init) ;;; init.el ends here -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(custom-safe-themes - '("5bafdfa3e21f921abf9b9fd77e1e0ce032e62e3a6f8f13ec8ce7945727c654e9" - "5f92b9fc442528b6f106eaefa18bb5e7bfa0d737164e18f1214410fef2a6678d" - "b7f70bd00f79099f11d67a25c592d70593377488a263bb3dd73dee99b0549dba" - "7d10494665024176a90895ff7836a8e810d9549a9872c17db8871900add93d5c" - "b5c3c59e2fff6877030996eadaa085a5645cc7597f8876e982eadc923f597aca" default)) - '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") - '(org-fold-catch-invisible-edits 'show-and-error nil nil "Customized with use-package org") - '(safe-local-variable-values - '((eval progn (require 'org-re-reveal) - (add-hook 'after-save-hook #'org-re-reveal-export-to-html nil t)) - (copilot-mode 0) (copilot-mode -1)))) - -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) -;; Local Variables: -;; byte-compile-warnings: (not free-vars noruntime unresolved) -;; End: From 0f3d872faf2cfa0de084d299f693f30d19ce09d3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:03:39 +0100 Subject: [PATCH 12/20] Fix org capture template --- hmModules/emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 529cfd0..5295c44 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -773,7 +773,7 @@ This is meant to be an helper to be called from the window manager." :target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>")) ("b" "Billable entry" entry "* TODO ${Entry} :billable:${Client}:\n:PROPERTIES:\n:SPENT: ${Spent}\n:END:\n%?" - :target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>") + :target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>") :create-id t)) ) :config From bcbbe829062bcd27594457d107b0af712ff7690b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:04:00 +0100 Subject: [PATCH 13/20] This has to be a symbol now apparently --- hmModules/emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 5295c44..7979853 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -860,7 +860,7 @@ This is meant to be an helper to be called from the window manager." (use-package gptel :custom (gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH")))) - (gptel-model "gpt-4o") + (gptel-model 'gpt-4o) :config (require 'gptel-curl) From e66b6653db8dbad34d3e786cbd3e306aff3439e9 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:04:20 +0100 Subject: [PATCH 14/20] Typo --- hmModules/emacs/init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 7979853..4c7c5cd 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -848,7 +848,6 @@ This is meant to be an helper to be called from the window manager." ("C-c n s" . consult-org-roam-search)) (use-package org-roam-ui - :straight :after org-roam :hook (after-init . org-roam-ui-mode) ;; don't care about startup time since I'm using Emacs daemonized :config From c71d2715a3235b875a8054037da123ef79da69f0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:04:32 +0100 Subject: [PATCH 15/20] Otherwise a firefox window pop up every time Emacs starts --- hmModules/emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 4c7c5cd..5cbd385 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -854,7 +854,7 @@ This is meant to be an helper to be called from the window manager." (setq org-roam-ui-sync-theme t org-roam-ui-follow t org-roam-ui-update-on-save t - org-roam-ui-open-on-start t)) + org-roam-ui-open-on-start nil)) (use-package gptel :custom From a031de90f48272f66c218cac4ea96785c8dc0546 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:05:12 +0100 Subject: [PATCH 16/20] Enable `gptsript-mode` for `.gpt` files --- hmModules/emacs/init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 5cbd385..adcb8c8 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -527,6 +527,8 @@ (use-package sh-mode :hook (sh-mode . tree-sitter-hl-mode)) +(use-package gptscript-mode + :mode "\\.gpt\\'") ;; FIXME ;; (use-package mmm-mode From ef177f1293c5df72122469227b0458bbfe1d4a42 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:05:43 +0100 Subject: [PATCH 17/20] `tree-sitter-hl-mode` doesn't exist anymore --- hmModules/emacs/init.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index adcb8c8..d69b69c 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -523,10 +523,11 @@ )) (use-package yaml-mode - :hook (yaml-mode . tree-sitter-hl-mode)) + :hook (yaml-mode . yaml-ts-mode)) (use-package sh-mode - :hook (sh-mode . tree-sitter-hl-mode)) + :hook (sh-mode . bash-ts-mode)) + (use-package gptscript-mode :mode "\\.gpt\\'") From 827f1d16d91236e83f35ea449dd3dc804aacb081 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:06:04 +0100 Subject: [PATCH 18/20] Trying to fix nix-on-droid --- hosts/archer/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/archer/default.nix b/hosts/archer/default.nix index de91621..6a4ac88 100644 --- a/hosts/archer/default.nix +++ b/hosts/archer/default.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { - environment.systemPackages = [ - pkgs.vim + environment.systemPackages = with pkgs; [ + helix + vim + git ]; nix.settings.experimental-features = "nix-command flakes"; @@ -10,5 +12,5 @@ services.nix-daemon.enable = true; - # nixpkgs.localSystem = "x86_64-darwin"; + system.stateVersion = 5; } From 159e7a7c72154a36de45a25ac03f9550754c09b5 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 15 Nov 2024 10:06:16 +0100 Subject: [PATCH 19/20] Make `pre-commit` re-use the same config for treefmt --- checks/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/checks/default.nix b/checks/default.nix index 376d792..741d164 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -11,19 +11,22 @@ ]; perSystem = - { ... }: + { config, ... }: { treefmt.config = { projectRootFile = ".git/config"; + flakeFormatter = true; + flakeCheck = true; programs = { nixfmt.enable = true; - deadnix.enable = false; }; }; - pre-commit.settings.hooks = { - nixfmt-rfc-style.enable = true; - deadnix.enable = false; + pre-commit.settings = { + hooks.treefmt = { + enable = true; + package = config.treefmt.build.wrapper; + }; }; }; From 457f369587f9dcfefe662b54699c15bb9ef919f1 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Thu, 14 Nov 2024 14:01:28 +0000 Subject: [PATCH 20/20] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'catppuccin': 'github:catppuccin/nix/191fbf2d81a63fad8f62f1233c0051f09b75d0ad' (2024-11-01) → 'github:catppuccin/nix/32359bf226fe874d3b7a0a5753d291a4da9616fe' (2024-11-10) • Updated input 'disko': 'github:nix-community/disko/856a2902156ba304efebd4c1096dbf7465569454' (2024-11-04) → 'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14) • Updated input 'dream2nix': 'github:nix-community/dream2nix/51943fca6b95cb9649236bacf5d7c8d9af4c3bec' (2024-11-04) → 'github:nix-community/dream2nix/44d41411686bc798876bd6d9f36a4c1143138d85' (2024-11-12) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/1febd5c1ad7e798543c886756c598e0fb8d473fd' (2024-11-05) → 'github:nix-community/emacs-overlay/4639038b0f5e66e7d0f3d103b8e44ded3ab7e337' (2024-11-14) • Updated input 'emacs-overlay/nixpkgs': 'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04) → 'github:NixOS/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12) • Updated input 'git-hooks-nix': 'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2' (2024-11-05) → 'github:cachix/git-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11) • Updated input 'homeManager': 'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661' (2024-11-03) → 'github:nix-community/home-manager/35b055009afd0107b69c286fca34d2ad98940d57' (2024-11-13) • Updated input 'impermanence': 'github:nix-community/impermanence/0d09341beeaa2367bac5d718df1404bf2ce45e6f' (2024-10-31) → 'github:nix-community/impermanence/3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a' (2024-11-10) • Updated input 'lix-eval-jobs': 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=42a160bce2fd9ffebc3809746bc80cc7208f9b08' (2024-08-13) → 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=57ddb99e781d19704f8a84036f9890e6ca554c41' (2024-11-09) • Updated input 'lix-eval-jobs/flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1' (2024-10-01) • Updated input 'lix-eval-jobs/treefmt-nix': 'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30) → 'github:numtide/treefmt-nix/aac86347fb5063960eccb19493e0cadcdb4205ca' (2024-10-22) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d' (2024-10-01) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) • Updated input 'mobile-nixos': 'github:NixOS/mobile-nixos/0516be85630befa2c1e8042ac873342ce186b2f6' (2024-10-30) → 'github:NixOS/mobile-nixos/2268e358ed407d9c0a4499ae767d105eeaeec586' (2024-11-06) • Updated input 'nixDarwin': 'github:LnL7/nix-darwin/0e3f3f017c14467085f15d42343a3aaaacd89bcb' (2024-11-05) → 'github:LnL7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116' (2024-11-12) • Updated input 'nixThePlanet': 'github:MatthewCroughan/NixThePlanet/2f622af217807da78e44a5a15f620743dac57f46' (2024-09-23) → 'github:MatthewCroughan/NixThePlanet/ef5fad336a55fcbb0680ad21aa58812b2f826435' (2024-11-09) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/2e78b1af8025108ecd6edaa3ab09695b8a4d3d55' (2024-11-05) → 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) --- flake.lock | 112 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index b8a8446..e48dcf3 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731232837, + "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1730751873, - "narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=", + "lastModified": 1731549112, + "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=", "owner": "nix-community", "repo": "disko", - "rev": "856a2902156ba304efebd4c1096dbf7465569454", + "rev": "5fd852c4155a689098095406500d0ae3d04654a8", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1730723587, - "narHash": "sha256-3ewuvm7VB/q3sxn9vzzQ0902PlSdqKqqagr8XbC1hIo=", + "lastModified": 1731424167, + "narHash": "sha256-nKKeRwq7mxcW8cBTmPKzSg0DR/inVrtuJudVM81GISU=", "owner": "nix-community", "repo": "dream2nix", - "rev": "51943fca6b95cb9649236bacf5d7c8d9af4c3bec", + "rev": "44d41411686bc798876bd6d9f36a4c1143138d85", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730826798, - "narHash": "sha256-QE7sHcAIolvAMbHSWZQ5nB2R17C2R/9YB5Q6CR70Hug=", + "lastModified": 1731574827, + "narHash": "sha256-QneOtCpfBNkgJCs32Y8LaKDpontw7W9ATQxIW4qb6qc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1febd5c1ad7e798543c886756c598e0fb8d473fd", + "rev": "4639038b0f5e66e7d0f3d103b8e44ded3ab7e337", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "impermanence": { "locked": { - "lastModified": 1730403150, - "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723579251, - "narHash": "sha256-xnHtfw0gRhV+2S9U7hQwvp2klTy1Iv7FlMMO0/WiMVc=", + "lastModified": 1731185443, + "narHash": "sha256-9qkRZFTgbMonlBaLqL+OW6iiHLWXuBJlThISMhwQuGg=", "ref": "refs/heads/main", - "rev": "42a160bce2fd9ffebc3809746bc80cc7208f9b08", - "revCount": 609, + "rev": "57ddb99e781d19704f8a84036f9890e6ca554c41", + "revCount": 613, "type": "git", "url": "https://git.lix.systems/lix-project/nix-eval-jobs" }, @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1727752861, - "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", "ref": "refs/heads/main", - "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", - "revCount": 116, + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", + "revCount": 117, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -609,11 +609,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1730307383, - "narHash": "sha256-EJYo2VPXVMGQbY+bI4Xav14fXXioBt3KICtXNI6i76o=", + "lastModified": 1730912712, + "narHash": "sha256-T5A9I6Tfh9zrv9sRWfu/ZKN6VkE670YQ6bjC5sbpTzk=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "0516be85630befa2c1e8042ac873342ce186b2f6", + "rev": "2268e358ed407d9c0a4499ae767d105eeaeec586", "type": "github" }, "original": { @@ -697,11 +697,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730779758, - "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", + "lastModified": 1731454423, + "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", + "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", "type": "github" }, "original": { @@ -720,11 +720,11 @@ "osx-kvm": "osx-kvm" }, "locked": { - "lastModified": 1727105240, - "narHash": "sha256-FEuqbcZ4TDUMwCpTA/E3J5L7pLD4U+zXPnZbmXSmaJo=", + "lastModified": 1731194612, + "narHash": "sha256-xOvzIdIFzy1LUgGLlOcimeHruZPLJpVdeEoHVOpH7sM=", "owner": "MatthewCroughan", "repo": "NixThePlanet", - "rev": "2f622af217807da78e44a5a15f620743dac57f46", + "rev": "ef5fad336a55fcbb0680ad21aa58812b2f826435", "type": "github" }, "original": { @@ -735,11 +735,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1730828750, - "narHash": "sha256-XrnZLkLiBYNlwV5gus/8DT7nncF1TS5la6Be7rdVOpI=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e78b1af8025108ecd6edaa3ab09695b8a4d3d55", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -828,11 +828,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -953,11 +953,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": {