fiddlerwoaroof/dotfiles - Change I4PAHRPH6Q5ZXCJ4A6XZTXS43MFLZJG75VHXF7KFQ7D7MA4BMA6AC

refactor: move tool flake to tools

Created by Edward Langley on March 15, 2025

I4PAHRPH6Q5ZXCJ4A6XZTXS43MFLZJG75VHXF7KFQ7D7MA4BMA6AC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

File deletion: tools.asd

BF:BFD[5.79] → [6.6005:6038]

BF:BFD[6.6038] → [6.5569:5569]

B:BD[6.5569] → [6.5570:5661]

∅:D[7.496] → [6.5661:5792]

∅:D[8.1100] → [6.5661:5792]

B:BD[6.5661] → [6.5661:5792]

∅:D[8.1231] → [6.5792:5820]

B:BD[6.5792] → [6.5792:5820]

∅:D[9.145] → [6.5842:5868]

B:BD[6.5842] → [6.5842:5868]

∅:D[9.412] → [6.5868:5906]

B:BD[6.5868] → [6.5868:5906]

∅:D[9.437] → [6.5957:5969]

B:BD[6.5957] → [6.5957:5969]

B:BD[6.5969] → [9.438:469]

∅:D[10.553] → [8.1313:1867]

B:BD[9.469] → [8.1313:1867]

B:BD[8.1954] → [8.1954:2103]

B:BD[9.469] → [10.152:553]

B:BD[6.5906] → [9.413:437]

B:BD[6.5868] → [9.146:329]

∅:D[11.181] → [9.357:412]

B:BD[9.357] → [9.357:412]

B:BD[9.329] → [8.1232:1312]

∅:D[8.1312] → [11.85:181]

B:BD[9.329] → [11.85:181]

B:BD[6.5820] → [9.85:145]

B:BD[6.5792] → [8.1101:1231]

B:BD[6.5661] → [7.326:496]

B:BD[7.496] → [8.288:996]

B:BD[8.1057] → [8.1057:1100]

;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; Package: ASDF-USER -*-
(in-package :asdf-user)
(defsystem :tools/zenburn
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :depends-on (#:alexandria
               #:serapeum
               #:net.didierverna.clon
  :serial t
  :components ((:file "cls")))
(defsystem :tools/git-pick-patch
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :build-pathname "git-pick-patch"
  :entry-point "git-pick-patch:main"
  :depends-on (#:alexandria
               #:serapeum
               #:cl-ppcre)
  :output-files (program-op (o c)
                            (let* ((exe-name (asdf/system:component-build-pathname c))
                                   (result (merge-pathnames exe-name
                                                            (user-homedir-pathname))))
                              (values (list result)
                                      t)))
  :serial t
  :components ((:file "git-pick-patch")))
(defsystem :tools/json-formatter
  :description "json formatter"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :class fw-tool-system
  :build-pathname "json-formatter"
  :entry-point "fwoar.json-formatter:main"
  :depends-on (#:alexandria
               #:serapeum
               #:com.inuoe.jzon
               #:net.didierverna.clon)
  :serial t
  :components ((:file "json-formatter")))
               #:yason)
               #:uiop)
  :serial t
  :components ((:file "zenburn")))
(defsystem :tools/cls
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
               #:data-lens
               #:local-time
  :class fw-tool-system
  :build-pathname "cls"
  :entry-point "fwoar.cls:main"
  :depends-on ((:require :sb-posix)
               (:require :uiop)
               #:alexandria
               #:dufy
               #:net.didierverna.clon
  ;; :defsystem-depends-on (:tool-system)
  :class fw-tool-system
  :build-pathname "zenburn"
  :entry-point "fwoar.zenburn:main"
(defsystem :tools
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :depends-on ()
  :serial t
  :components ())
(defclass asdf-user::fw-tool-system (asdf:system)
  ())
(defmethod asdf:perform :before ((o program-op) (c fw-tool-system))
  (flet ((package-name-for-system ()
           (let* ((primary-name (asdf:primary-system-name c)))
             (format nil "fwoar.~a"
                     (subseq (asdf:component-name c)
                             (1+ (length primary-name)))))))
    (uiop:symbol-call (string-upcase (package-name-for-system))
                      :prepare-dump)))
(defmethod asdf:output-files ((o program-op) (c fw-tool-system))
  (let* ((exe-name (asdf/system:component-build-pathname c))
         (result (merge-pathnames exe-name
                                  (user-homedir-pathname))))
    (values (list result)
            t)))

File addition: fwoar-tools.asd (----------)

[5.79]

;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; Package: ASDF-USER -*-
(in-package :asdf-user)
(defsystem :fwoar-tools
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :depends-on ()
  :serial t
  :components ())
(defclass asdf-user::fw-tool-system (asdf:system)
  ())
(defmethod asdf:perform :before ((o program-op) (c fw-tool-system))
  (flet ((package-name-for-system ()
           (let* ((primary-name (asdf:primary-system-name c)))
             (format nil "fwoar.~a"
                     (subseq (asdf:component-name c)
                             (1+ (length primary-name)))))))
    (uiop:symbol-call (string-upcase (package-name-for-system))
                      :prepare-dump)))
(defmethod asdf:output-files ((o program-op) (c fw-tool-system))
  (let* ((exe-name (asdf/system:component-build-pathname c))
         (result (merge-pathnames exe-name
                                  (user-homedir-pathname))))
    (values (list result)
            t)))
(defsystem :fwoar-tools/zenburn
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  ;; :defsystem-depends-on (:tool-system)
  :class fw-tool-system
  :build-pathname "zenburn"
  :entry-point "fwoar.zenburn:main"
  :depends-on (#:alexandria
               #:dufy
               #:net.didierverna.clon
               #:serapeum
               #:uiop)
  :serial t
  :components ((:file "zenburn")))
(defsystem :fwoar-tools/cls
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :class fw-tool-system
  :build-pathname "cls"
  :entry-point "fwoar.cls:main"
  :depends-on ((:require :sb-posix)
               (:require :uiop)
               #:alexandria
               #:data-lens
               #:local-time
               #:net.didierverna.clon
               #:yason)
  :serial t
  :components ((:file "cls")))
(defsystem :fwoar-tools/json-formatter
  :description "json formatter"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :class fw-tool-system
  :build-pathname "json-formatter"
  :entry-point "fwoar.json-formatter:main"
  :depends-on (#:alexandria
               #:serapeum
               #:com.inuoe.jzon
               #:net.didierverna.clon)
  :serial t
  :components ((:file "json-formatter")))
(defsystem :fwoar-tools/git-pick-patch
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :build-pathname "git-pick-patch"
  :entry-point "git-pick-patch:main"
  :depends-on (#:alexandria
               #:serapeum
               #:cl-ppcre)
  :output-files (program-op (o c)
                            (let* ((exe-name (asdf/system:component-build-pathname c))
                                   (result (merge-pathnames exe-name
                                                            (user-homedir-pathname))))
                              (values (list result)
                                      t)))
  :serial t
  :components ((:file "git-pick-patch")))

File addition: default.nix (----------)

[5.79]

{nixpkgs, ...}: let
  mkTool = {
    name,
    lispDeps,
    system,
  }: let
    pkgs = nixpkgs.legacyPackages.${system};
    sbcl = pkgs.sbcl.withPackages lispDeps;
  in
    pkgs.stdenv.mkDerivation {
      inherit system name;
      src = ./.;
      builder = ../build.sh;
      dontStrip = true;
      buildInputs = [
        pkgs.makeWrapper
        pkgs.openssl.dev
        sbcl
        pkgs.which
        pkgs.zsh
      ];
    };
in
  system: {
    zenburn = mkTool {
      inherit system;
      name = "zenburn";
      lispDeps = ps:
        with ps; [
          alexandria
          dufy
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          serapeum
          #uiop
        ];
    };
    cls = mkTool {
      inherit system;
      name = "cls";
      lispDeps = ps:
        with ps; [
          alexandria
          data-lens
          local-time
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          yason
          #uiop
        ];
    };
    git-pick-patch = mkTool {
      inherit system;
      name = "git-pick-patch";
      lispDeps = ps:
        with ps; [
          alexandria
          serapeum
          cl-ppcre
        ];
    };
    json-formatter = mkTool {
      inherit system;
      name = "json-formatter";
      lispDeps = ps:
        with ps; [
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          alexandria
          serapeum
          com_dot_inuoe_dot_jzon
        ];
    };
  }

Replacement in nix/packages/iterm.nix at line 6 [12.1705]
B:BD[12.1752] → [12.1752:1759]
```
  hash
```
[12.1752]
[12.1759]
```
  hash,
```

Replacement in nix/packages/default.nix at line 1 [2.187]

B:BD[2.187] → [2.188:1551]

{nixpkgs, ...}: let
  mkTool = {
    name,
    lispDeps,
  }: system: let
    pkgs = nixpkgs.legacyPackages.${system};
    sbcl = pkgs.sbcl.withPackages lispDeps;
  in
    pkgs.stdenv.mkDerivation {
      inherit system name;
      src = ../../tools;
      builder = ../../build.sh;
      dontStrip = true;
      buildInputs = [
        pkgs.makeWrapper
        pkgs.openssl.dev
        sbcl
        pkgs.which
        pkgs.zsh
      ];
    };
  mkZenburn = mkTool {
    name = "zenburn";
    lispDeps = ps:
      with ps; [
        alexandria
        dufy
        net_dot_didierverna_dot_clon
        net_dot_didierverna_dot_clon_dot_termio
        serapeum
        #uiop
      ];
  };
  mkCls = mkTool {
    name = "cls";
    lispDeps = ps:
      with ps; [
        alexandria
        data-lens
        local-time
        net_dot_didierverna_dot_clon
        net_dot_didierverna_dot_clon_dot_termio
        yason
        #uiop
      ];
  };
  mkGitPickPatch = mkTool {
    name = "git-pick-patch";
    lispDeps = ps:
      with ps; [
        alexandria
        serapeum
        cl-ppcre
      ];
  };
  mkJsonFormatter = mkTool {
    name = "json-formatter";
    lispDeps = ps:
      with ps; [
        net_dot_didierverna_dot_clon
        net_dot_didierverna_dot_clon_dot_termio
        alexandria
        serapeum
        com_dot_inuoe_dot_jzon
      ];
  };

[2.187]

[2.1551]

{nixpkgs, ...} @ inputs: let

Replacement in nix/packages/default.nix at line 13 [2.187]

B:BD[2.1836] → [2.1836:2069]

  mkTools = system: {
    zenburn = mkZenburn system;
    cls = mkCls system;
    git-pick-patch = mkGitPickPatch system;
    json-formatter = mkJsonFormatter system;
    mycurl = mkCurl system;
    gsed = mkPrefixedSed system;
  };

[2.1836]

[2.2069]

  tools = import ../../tools inputs;
  mkTools = system:
    {
      mycurl = mkCurl system;
      gsed = mkPrefixedSed system;
    }
    // tools system;

Replacement in flake.lock at line 136 [7.4542]

B:BD[13.6808] → [13.6808:6918]

        "lastModified": 1741379970,
        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",

[13.6808]

[7.4703]

        "lastModified": 1741513245,
        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",

Replacement in flake.lock at line 140 [7.4542]

B:BD[7.4756] → [13.6919:6978]

        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",

[7.4756]

[7.4815]

        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",

Replacement in build.sh at line 19 [7.5144]

B:BD[14.542] → [14.542:599]

B:BD[14.599] → [15.923:973]

B:BD[15.973] → [8.3044:3100]

       --eval '(asdf:load-asd (truename "tools.asd"))' \
       --eval "(asdf:load-system :tools/$name)" \
       --eval "(asdf:operate :program-op :tools/$name)"

[14.542]

[7.5763]

       --eval '(asdf:load-asd (truename "fwoar-tools.asd"))' \
       --eval "(asdf:load-system :fwoar-tools/$name)" \
       --eval "(asdf:operate :program-op :fwoar-tools/$name)"

File addition: fwoar-tools.asd (----------)

[5.79]

;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; Package: ASDF-USER -*-
(in-package :asdf-user)
(defsystem :fwoar-tools
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :depends-on ()
  :serial t
  :components ())
(defclass asdf-user::fw-tool-system (asdf:system)
  ())
(defmethod asdf:perform :before ((o program-op) (c fw-tool-system))
  (flet ((package-name-for-system ()
           (let* ((primary-name (asdf:primary-system-name c)))
             (format nil "fwoar.~a"
                     (subseq (asdf:component-name c)
                             (1+ (length primary-name)))))))
    (uiop:symbol-call (string-upcase (package-name-for-system))
                      :prepare-dump)))
(defmethod asdf:output-files ((o program-op) (c fw-tool-system))
  (let* ((exe-name (asdf/system:component-build-pathname c))
         (result (merge-pathnames exe-name
                                  (user-homedir-pathname))))
    (values (list result)
            t)))
(defsystem :fwoar-tools/zenburn
  :description "Tool for generating colored text"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  ;; :defsystem-depends-on (:tool-system)
  :class fw-tool-system
  :build-pathname "zenburn"
  :entry-point "fwoar.zenburn:main"
  :depends-on (#:alexandria
               #:dufy
               #:net.didierverna.clon
               #:serapeum
               #:uiop)
  :serial t
  :components ((:file "zenburn")))
(defsystem :fwoar-tools/cls
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :class fw-tool-system
  :build-pathname "cls"
  :entry-point "fwoar.cls:main"
  :depends-on ((:require :sb-posix)
               (:require :uiop)
               #:alexandria
               #:data-lens
               #:local-time
               #:net.didierverna.clon
               #:yason)
  :serial t
  :components ((:file "cls")))
(defsystem :fwoar-tools/json-formatter
  :description "json formatter"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :class fw-tool-system
  :build-pathname "json-formatter"
  :entry-point "fwoar.json-formatter:main"
  :depends-on (#:alexandria
               #:serapeum
               #:com.inuoe.jzon
               #:net.didierverna.clon)
  :serial t
  :components ((:file "json-formatter")))
(defsystem :fwoar-tools/git-pick-patch
  :description "list files as json"
  :author "Ed L <el-l@elangley.org>"
  :license "MIT"
  :build-pathname "git-pick-patch"
  :entry-point "git-pick-patch:main"
  :depends-on (#:alexandria
               #:serapeum
               #:cl-ppcre)
  :output-files (program-op (o c)
                            (let* ((exe-name (asdf/system:component-build-pathname c))
                                   (result (merge-pathnames exe-name
                                                            (user-homedir-pathname))))
                              (values (list result)
                                      t)))
  :serial t
  :components ((:file "git-pick-patch")))

File addition: default.nix (----------)

[5.79]

{nixpkgs, ...}: let
  mkTool = {
    name,
    lispDeps,
    system,
  }: let
    pkgs = nixpkgs.legacyPackages.${system};
    sbcl = pkgs.sbcl.withPackages lispDeps;
  in
    pkgs.stdenv.mkDerivation {
      inherit system name;
      src = ./.;
      builder = ../build.sh;
      dontStrip = true;
      buildInputs = [
        pkgs.makeWrapper
        pkgs.openssl.dev
        sbcl
        pkgs.which
        pkgs.zsh
      ];
    };
in
  system: {
    zenburn = mkTool {
      inherit system;
      name = "zenburn";
      lispDeps = ps:
        with ps; [
          alexandria
          dufy
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          serapeum
          #uiop
        ];
    };
    cls = mkTool {
      inherit system;
      name = "cls";
      lispDeps = ps:
        with ps; [
          alexandria
          data-lens
          local-time
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          yason
          #uiop
        ];
    };
    git-pick-patch = mkTool {
      inherit system;
      name = "git-pick-patch";
      lispDeps = ps:
        with ps; [
          alexandria
          serapeum
          cl-ppcre
        ];
    };
    json-formatter = mkTool {
      inherit system;
      name = "json-formatter";
      lispDeps = ps:
        with ps; [
          net_dot_didierverna_dot_clon
          net_dot_didierverna_dot_clon_dot_termio
          alexandria
          serapeum
          com_dot_inuoe_dot_jzon
        ];
    };
  }

refactor: move tool flake to tools

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

File deletion: tools.asd

File addition: fwoar-tools.asd (----------)

File addition: default.nix (----------)

Replacement in nix/packages/iterm.nix at line 6 [12.1705]

Replacement in nix/packages/default.nix at line 1 [2.187]

Replacement in nix/packages/default.nix at line 13 [2.187]

Replacement in flake.lock at line 136 [7.4542]

Replacement in flake.lock at line 140 [7.4542]

Replacement in build.sh at line 19 [7.5144]

File addition: fwoar-tools.asd (----------)

File addition: default.nix (----------)