From 4ef40b5971ad76eaacfde15941deb5399aeb0565 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 2 Feb 2023 17:30:01 +0100 Subject: [PATCH 1/3] drone: use official drone-scp image again Our PR got accepted and the flag we needed is available now: https://github.com/appleboy/drone-scp/pull/102 --- .drone.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2a9c496d..c554978e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -111,9 +111,8 @@ steps: - nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256 - name: "Publish ISO" - # custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/ - # docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 . - image: registry.greenbaum.cloud/library/drone-scp:v1.6.5 + # https://github.com/appleboy/drone-scp/pull/141 got merged, yay + image: appleboy/drone-scp:1.6.5-linux-amd64 volumes: - name: file-exchange path: /var/nix/iso-cache @@ -148,6 +147,6 @@ volumes: --- kind: signature -hmac: 0c0994f0878cdb49172772f78c9a772f5c75830b49c1c22bd15db385fe857e17 +hmac: d6187b243c1939eaf2803830e784aa89dd20edda9ba205940cf6caa2c615b6c6 ... From c8435976eb6124ba3d154240806d00e95257534c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 24 Feb 2023 17:58:21 +0100 Subject: [PATCH 2/3] nvim: fix file preview for names containing spaces --- modules/terminal-life/nvim/preview-file.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/terminal-life/nvim/preview-file.nix b/modules/terminal-life/nvim/preview-file.nix index bc9e9aa5..2a52bdd8 100644 --- a/modules/terminal-life/nvim/preview-file.nix +++ b/modules/terminal-life/nvim/preview-file.nix @@ -31,6 +31,6 @@ with self; '' --style="''${BAT_STYLE:-numbers}" \ --color=always \ --pager=never \ - --file-name=''$FILE \ + --file-name="''$FILE" \ --highlight-line=$CENTER '' From dff81759a87c7ebe595f308a5c3c6f6eda9a131c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 25 Feb 2023 19:20:16 +0100 Subject: [PATCH 3/3] bash: fix history widget (ctrl+r) unreadable selected entry --- profiles/base-user/session-variables.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix index 5bac79c1..fb816046 100644 --- a/profiles/base-user/session-variables.nix +++ b/profiles/base-user/session-variables.nix @@ -83,6 +83,9 @@ # TELEMETRY BS VUEDX_TELEMETRY = "off"; + + # FZF shell history widget default colors + FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7"; }; envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;