From de3eedff9be7e8bd1f6cc28ab51c7d54e0d59e9f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 1 Mar 2023 14:48:25 +0100 Subject: chore(users/Profpatsch): remove failed aerc experiment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I didn’t ever get aerc to work, so let’s get rid of this. Change-Id: Ie59b23fe7d5af70ca82c1c624c1e11d21da735f4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8189 Autosubmit: Profpatsch Tested-by: BuildkiteCI Reviewed-by: Profpatsch Reviewed-by: sterni --- users/Profpatsch/aerc-no-config-perms.patch | 12 --- users/Profpatsch/aerc.dhall | 139 ---------------------------- users/Profpatsch/aerc.nix | 54 ----------- 3 files changed, 205 deletions(-) delete mode 100644 users/Profpatsch/aerc-no-config-perms.patch delete mode 100644 users/Profpatsch/aerc.dhall delete mode 100644 users/Profpatsch/aerc.nix diff --git a/users/Profpatsch/aerc-no-config-perms.patch b/users/Profpatsch/aerc-no-config-perms.patch deleted file mode 100644 index 86b41cd74b08..000000000000 --- a/users/Profpatsch/aerc-no-config-perms.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/config/config.go b/config/config.go -index 0472daf..5eed379 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -779,6 +779,7 @@ func (config *AercConfig) LoadBinds(binds *ini.File, baseName string, baseGroup - // checkConfigPerms checks for too open permissions - // printing the fix on stdout and returning an error - func checkConfigPerms(filename string) error { -+ return nil; - info, err := os.Stat(filename) - if err != nil { - return nil // disregard absent files diff --git a/users/Profpatsch/aerc.dhall b/users/Profpatsch/aerc.dhall deleted file mode 100644 index 2a02b418ddd6..000000000000 --- a/users/Profpatsch/aerc.dhall +++ /dev/null @@ -1,139 +0,0 @@ -let Lib = ./dhall/lib.dhall - -let List/map = Lib.List/map - -let Ini = ./ini/ini.dhall - -in λ ( imports - : { -- Take an aerc filter from the aerc distribution /share directory - aercFilter : Text → Text - , Ini/externs : Ini.Externs - } - ) → - { accounts = - imports.Ini/externs.renderIni - { globalSection = [] : Ini.Section - , sections = - [ { name = "mail" - , value = - [ { name = "archive", value = "Archive" } - , { name = "copy-to", value = "Sent" } - , { name = "default", value = "INBOX" } - , { name = "from", value = "Profpatsch " } - , { name = "source", value = "maildir://~/.Mail/mail" } - , { name = "postpone", value = "Drafts" } - ] - } - ] - } - , aerc = - imports.Ini/externs.renderIni - { globalSection = [] : Ini.Section - , sections = - [ { name = "filters" - , value = - [ { name = "text/html", value = imports.aercFilter "html" } - , let _ = "-- TODO: this awk should be taken from nix!" - - in { name = "text/*" - , value = "awk -f ${imports.aercFilter "plaintext"}" - } - ] - } - ] - } - , binds = - let - -- keybinding and command to run - Key = - { ctrl : Bool, key : Text, cmd : Text } - - in let - -- render a key to config format - renderKey = - λ(k : Key) → - if k.ctrl - then { name = "", value = k.cmd } - else { name = k.key, value = k.cmd } - - let - - -- render a list of keys to config format - renderKeys = - λ(keys : List Key) → - List/map Key (Ini.NameVal Text) renderKey keys - - let - -- create a section whith a name and a list of keys - sect = - λ(section : Text) → - λ(keys : List Key) → - { name = section, value = renderKeys keys } - - let - - -- set key without modifiers - key = - λ(key : Text) → { key } - - let - -- set special key without modifiers - special = - λ(key : Text) → { key = "<${key}>" } - - let - -- no modifier - none = - { ctrl = False } - - let - -- set control key - ctrl = - { ctrl = True } - - let - -- set a command to execute - cmd = - λ(cmd : Text) → { cmd = ":${cmd}" } - - let - -- set a command, but stay on the prompt - prompt = - λ(cmd : Text) → { cmd = ":${cmd}" } - - let config = - { globalSection = - renderKeys - [ ctrl ∧ key "p" ∧ cmd "prev-tab" - , ctrl ∧ key "n" ∧ cmd "next-tab" - , ctrl ∧ key "t" ∧ cmd "term" - ] - , sections = - [ sect - "messages" - [ ctrl ∧ key "q" ∧ cmd "quit" - , none ∧ special "Up" ∧ cmd "prev" - , none ∧ special "Down" ∧ cmd "next" - , none ∧ special "PgUp" ∧ cmd "prev 100%" - , none ∧ special "PgDn" ∧ cmd "next 100%" - , none ∧ key "g" ∧ cmd "select 0" - , none ∧ key "G" ∧ cmd "select -1" - , ctrl ∧ key "Up" ∧ cmd "prev-folder" - , ctrl ∧ key "Down" ∧ cmd "next-folder" - , none ∧ key "v" ∧ cmd "mark -t" - , none ∧ key "V" ∧ cmd "mark -v" - , none ∧ special "Enter" ∧ cmd "view" - , none ∧ key "c" ∧ cmd "compose" - , none ∧ key "|" ∧ prompt "pipe" - , none ∧ key "t" ∧ prompt "term" - , none ∧ key "/" ∧ prompt "search" - , none ∧ key "n" ∧ cmd "next-result" - , none ∧ key "N" ∧ cmd "prev-result" - , none ∧ special "Esc" ∧ cmd "clear" - ] - , sect "view" [ none ∧ key "q" ∧ cmd "close" ] - ] - } - - in imports.Ini/externs.renderIni config - } diff --git a/users/Profpatsch/aerc.nix b/users/Profpatsch/aerc.nix deleted file mode 100644 index 407f224e588a..000000000000 --- a/users/Profpatsch/aerc.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ depot, pkgs, lib, ... }: - -let - aerc-patched = pkgs.aerc.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - ./aerc-no-config-perms.patch - ]; - }); - - bins = depot.nix.getBins aerc-patched [ "aerc" ]; - - config = - depot.users.Profpatsch.importDhall.importDhall - { - root = ./.; - files = [ - "aerc.dhall" - "dhall/lib.dhall" - "ini/ini.dhall" - ]; - main = "aerc.dhall"; - deps = [ - ]; - } - { - aercFilter = name: "${aerc-patched}/share/aerc/filters/${name}"; - "Ini/externs" = depot.users.Profpatsch.ini.externs; - }; - - aerc-config = pkgs.linkFarm "alacritty-config" [ - { - name = "aerc/accounts.conf"; - path = pkgs.writeText "accounts.conf" config.accounts; - } - { - name = "aerc/aerc.conf"; - path = pkgs.writeText "aerc.conf" config.aerc; - } - { - name = "aerc/binds.conf"; - path = pkgs.writeText "binds.conf" config.binds; - } - ]; - - aerc = depot.nix.writeExecline "aerc" { } [ - "export" - "XDG_CONFIG_HOME" - aerc-config - bins.aerc - "$@" - ]; - -in -aerc -- cgit 1.4.1