From af9adc909c651e38d96674432a5420c07fe7ed58 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 11 Feb 2024 15:43:45 +0100 Subject: [PATCH 1/4] [CI] Forgejo tests --- .forgejo/workflows/build.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .forgejo/workflows/build.yaml diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml new file mode 100644 index 0000000..0db177d --- /dev/null +++ b/.forgejo/workflows/build.yaml @@ -0,0 +1,7 @@ +on: [push] +jobs: + test: + runs-on: nix + steps: + - uses: actions/checkout@v3 + - run: nix --version From 893ea2f870aa9402a9463566a322a1b3f5bbc7b0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 11 Feb 2024 15:43:45 +0100 Subject: [PATCH 2/4] [CI] Forgejo tests --- .forgejo/workflows/build.yaml | 7 ++++--- checks/default.nix | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 0db177d..c58ee9b 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,7 +1,8 @@ on: [push] jobs: test: - runs-on: nix + runs-on: nix steps: - - uses: actions/checkout@v3 - - run: nix --version + - uses: actions/checkout@v4 + - run: cat /nix/store/cscv53kqarckmbz6729ngmyxg3y53n9c-push-to-cache.sh + - run: nix-fast-build --no-nom diff --git a/checks/default.nix b/checks/default.nix index 3629929..c671778 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -1,7 +1,10 @@ { - perSystem = {config, ...}: { + perSystem = {config, pkgs, ...}: { checks = { inherit (config.packages) ccrEmacs; + test = pkgs.hello.overrideDerivation (_: { + name = "test"; + }); }; }; } From 5af3e2982e87ed5d56a83727cca9a39575e18679 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 24 Feb 2024 17:06:46 +0100 Subject: [PATCH 3/4] Things --- flake.lock | 6 +++--- init.el | 9 ++++++--- packages/packages.nix | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c94d79c..08ee5d1 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "extra-package-copilot": { "flake": false, "locked": { - "lastModified": 1707055282, - "narHash": "sha256-Drx2bB/Uiq0Alm8d575eucQrK6erFy4Z0KXsL5RsFaY=", + "lastModified": 1708330768, + "narHash": "sha256-2hLO2JLZZMgXcPEb7pVRUpVrUJsUMUdJcPoE4TC7edk=", "owner": "zerolfx", "repo": "copilot.el", - "rev": "22f0446a17753716456e0cb8ee33f47731fc4ec3", + "rev": "0e24423cfef2993b3a9633c8cbb654079f2652a9", "type": "github" }, "original": { diff --git a/init.el b/init.el index 307efde..e6f3758 100644 --- a/init.el +++ b/init.el @@ -345,8 +345,8 @@ posframe (vertico-posframe-poshandler . posframe-poshandler-frame-center) (vertico-posframe-fallback-mode . vertico-buffer-mode)))) - (vertico-posframe-min-height 0) - (vertico-posframe-min-width 80) + (vertico-posframe-min-height 1) + ;; (vertico-posframe-min-width 80) (vertico-posframe-parameters '((alpha-background . 80))) ) @@ -736,7 +736,10 @@ This is meant to be an helper to be called from the window manager." (set-face-attribute 'org-special-keyword nil :inherit 'fixed-pitch) (set-face-attribute 'org-table nil :inherit 'fixed-pitch) (set-face-attribute 'org-tag nil :inherit 'fixed-pitch :weight 'bold :height 0.8) - (set-face-attribute 'org-verbatim nil :inherit 'fixed-pitch)) + (set-face-attribute 'org-verbatim nil :inherit 'fixed-pitch) + + (org-babel-do-load-languages + 'org-babel-load-languages '((haskell . t)))) (use-package org-agenda :custom diff --git a/packages/packages.nix b/packages/packages.nix index 863ebb3..8a3ec27 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -5,7 +5,7 @@ pkgs: epkgs: let depsPerPackage = { indent-bars = [elpaPackages.compat]; chatgpt = [melpaPackages.polymode]; - copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s]; + copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f]; notmuch-notify = [melpaPackages.alert melpaPackages.notmuch]; }; @@ -94,10 +94,12 @@ pkgs: epkgs: let eldoc-box go-translate notmuch + poly-org ]) ++ (with elpaPackages; [ delight kind-icon vertico-posframe + ef-themes ]) ++ (with nongnuPackages; [ eat corfu-terminal From e0705223de341091e46cffe0a61a968c434e2b6c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 9 Mar 2024 01:14:46 +0100 Subject: [PATCH 4/4] [CI] Forgejo action to update the lockfile --- .forgejo/workflows/update-flake-lock.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .forgejo/workflows/update-flake-lock.yaml diff --git a/.forgejo/workflows/update-flake-lock.yaml b/.forgejo/workflows/update-flake-lock.yaml new file mode 100644 index 0000000..2958f60 --- /dev/null +++ b/.forgejo/workflows/update-flake-lock.yaml @@ -0,0 +1,17 @@ +name: update-flake-lock +on: + schedule: + - cron: '19 1 * * 6' + +jobs: + lockfile: + runs-on: nix + steps: + - uses: actions/checkout@v4 + - name: Update flake.lock + uses: DeterminateSystems/update-flake-lock@main + with: + pr-title: "Update flake.lock" # Title of PR to be created + pr-labels: | # Labels to be set on the PR + dependencies + automated