fiddlerwoaroof/dotfiles - Change RPFVP5IZWNTLS5LWGU75TGBHMQGAVQTQG6L3KWAWBMFKMETSRJHQC

chore(nix): update configuration for ouranos

Created by Edward Langley on March 5, 2025

RPFVP5IZWNTLS5LWGU75TGBHMQGAVQTQG6L3KWAWBMFKMETSRJHQC

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: mac-apps
BF:BFD[5.165] → [6.173:192]
BF:BFD[6.192] → [6.172:172]

File deletion: default.nix

BF:BFD[6.172] → [6.2654:2689]

BF:BFD[6.2689] → [6.1821:1821]

B:BD[6.1821] → [6.1822:2653]

{
  lib,
  config,
  pkgs,
  ...
}: {
  home.packages = [
    pkgs.crawlTiles
    pkgs.fwoar.iterm2
    pkgs.emacs-git
  ];
  home.activation.install-apps = lib.hm.dag.entryAfter ["linkGeneration"] ''
    new_nix_apps="${config.home.homeDirectory}/Applications/Nix"
    rm -rfv "$new_nix_apps"
    mkdir -p "$new_nix_apps"
    find -H -L "$genProfilePath/home-files/Applications" -maxdepth 2 -name "*.app" -type d -print | while read -r app; do
      real_app=$(readlink -f "$app")
      app_name=$(basename "$app")
      target_app="$new_nix_apps/$app_name"
      echo "Link '$real_app' to '$target_app'"
      mkdir -p $target_app
      "${pkgs.xorg.lndir}"/bin/lndir "$real_app" "$target_app"
      rm "$target_app/Contents/Info.plist"
      cp "$real_app/Contents/Info.plist" "$target_app/Contents/Info.plist"
    done
  '';
}

File deletion: default.nix

BF:BFD[6.172] → [6.1027:1062]

BF:BFD[6.1062] → [6.194:194]

B:BD[6.194] → [6.195:461]

∅:D[7.200] → [6.489:828]

B:BD[6.489] → [6.489:828]

∅:D[7.279] → [6.891:1026]

B:BD[6.891] → [6.891:1026]

B:BD[6.828] → [7.201:279]

B:BD[6.461] → [7.173:200]

{
  lib,
  config,
  pkgs,
  ...
}: {
  home.packages = [
    pkgs.crawlTiles
    pkgs.fwoar.iterm2
    pkgs.emacs-git
  ];
  home.activation.install-apps = lib.hm.dag.entryAfter ["linkGeneration"] ''
    new_nix_apps="${config.home.homeDirectory}/Applications/Nix"
    mkdir -p "$new_nix_apps"
    find -H -L "$genProfilePath/home-files/Applications" -maxdepth 2 -name "*.app" -type d -print | while read -r app; do
      real_app=$(readlink -f "$app")
      app_name=$(basename "$app")
      target_app="$new_nix_apps/$app_name"
      echo "Link '$real_app' to '$target_app'"
      mkdir -p $target_app
      rm "$target_app/Contents/Info.plist"
      cp "$real_app/Contents/Info.plist" "$target_app/Contents/Info.plist"
    done
  '';
}
      "${pkgs.xorg.lndir}"/bin/lndir "$real_app" "$target_app" 2>&1>/dev/null
    rm -rf "$new_nix_apps"

File deletion: git-config.nix

BF:BFD[5.165] → [8.1057:1095]

BF:BFD[8.1095] → [8.175:175]

B:BD[8.175] → [8.176:1056]

{
  config,
  lib,
  ...
}: {
  home.activation.setup-allowed-signers = lib.hm.dag.entryAfter ["install-apps"] ''
    echo "* $(cat "$HOME"/.ssh/id_ed25519.pub)" > "$HOME"/.ssh/allowed_signers
  '';
  programs = {
    git = {
      enable = true;
      userEmail = "el-github@elangley.org";
      userName = "Edward Langley";
      lfs.enable = true;
      difftastic.enable = true;
      extraConfig = {
        commit = {gpgsign = true;};
        github = {user = "fiddlerwoaroof";};
        gpg = {
          format = "ssh";
          allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
        };
        init = {defaultBranch = "main";};
        merge = {autoStash = true;};
        pull = {rebase = false;};
        rebase = {autoStash = true;};
        user = {signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";};
      };
    };
  };
}

File deletion: git-config.nix

BF:BFD[5.165] → [8.2224:2262]

BF:BFD[8.2262] → [8.1342:1342]

B:BD[8.1342] → [8.1343:2223]

{
  config,
  lib,
  ...
}: {
  home.activation.setup-allowed-signers = lib.hm.dag.entryAfter ["install-apps"] ''
    echo "* $(cat "$HOME"/.ssh/id_ed25519.pub)" > "$HOME"/.ssh/allowed_signers
  '';
  programs = {
    git = {
      enable = true;
      userEmail = "el-github@elangley.org";
      userName = "Edward Langley";
      lfs.enable = true;
      difftastic.enable = true;
      extraConfig = {
        commit = {gpgsign = true;};
        github = {user = "fiddlerwoaroof";};
        gpg = {
          format = "ssh";
          allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
        };
        init = {defaultBranch = "main";};
        merge = {autoStash = true;};
        pull = {rebase = false;};
        rebase = {autoStash = true;};
        user = {signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";};
      };
    };
  };
}

File addition: mac-apps (d--x------)
[9.152]

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

[0.182]

{
  lib,
  config,
  pkgs,
  ...
}: {
  home.packages = [
    pkgs.crawlTiles
    pkgs.fwoar.iterm2
    pkgs.emacs-git
  ];
  home.activation.install-apps = lib.hm.dag.entryAfter ["linkGeneration"] ''
    new_nix_apps="${config.home.homeDirectory}/Applications/Nix"
    rm -rf "$new_nix_apps"
    mkdir -p "$new_nix_apps"
    find -H -L "$genProfilePath/home-files/Applications" -maxdepth 2 -name "*.app" -type d -print | while read -r app; do
      real_app=$(readlink -f "$app")
      app_name=$(basename "$app")
      target_app="$new_nix_apps/$app_name"
      echo "Link '$real_app' to '$target_app'"
      mkdir -p $target_app
      "${pkgs.xorg.lndir}"/bin/lndir "$real_app" "$target_app" 2>&1>/dev/null
      rm "$target_app/Contents/Info.plist"
      cp "$real_app/Contents/Info.plist" "$target_app/Contents/Info.plist"
    done
  '';
}

File addition: git-config.nix (----------)

[9.152]

{
  config,
  lib,
  ...
}: {
  home.activation.setup-allowed-signers = lib.hm.dag.entryAfter ["install-apps"] ''
    echo "* $(cat "$HOME"/.ssh/id_ed25519.pub)" > "$HOME"/.ssh/allowed_signers
  '';
  programs = {
    git = {
      enable = true;
      userEmail = "el-github@elangley.org";
      userName = "Edward Langley";
      lfs.enable = true;
      difftastic.enable = true;
      extraConfig = {
        commit = {gpgsign = true;};
        github = {user = "fiddlerwoaroof";};
        gpg = {
          format = "ssh";
          allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
        };
        init = {defaultBranch = "main";};
        merge = {autoStash = true;};
        pull = {rebase = false;};
        rebase = {autoStash = true;};
        user = {signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";};
      };
    };
  };
}

Replacement in nix/flake.nix at line 39 [2.189]
B:BD[2.1077] → [2.1077:1100]
```
        pkgs.alejandra
```
[2.1077]
[2.1100]
```
        alejandra.outputs.packages.${system}.default
```

Replacement in nix/flake.nix at line 50 [2.189]

B:BD[2.1352] → [2.1352:2574]

      common = {
        home.packages = [
          alejandra.defaultPackage.${system}
          pkgs.clojure
          pkgs.coreutils-prefixed
          pkgs.difftastic
          pkgs.direnv
          pkgs.dtach
          pkgs.ecl
          pkgs.fwoar.gsed
          pkgs.gawk
          pkgs.gnumake
          pkgs.gnuplot
          pkgs.groff
          pkgs.htop
          pkgs.jq
          pkgs.lorri
          pkgs.mosh
          # pkgs.ncdu ## currently broken
          pkgs.nixfmt-classic
          pkgs.pandoc
          pkgs.pkg-config
          pkgs.ripgrep
          (pkgs.sbcl.overrideAttrs (_: {
            enableFeatures = [
              "sb-thread"
              "sb-core-compression"
              "sb-simd"
              "sb-xref-for-internals"
              "sb-after-xc-core"
              "sb-doc"
            ];
          }))
          pkgs.shellcheck
          pkgs.texinfoInteractive
          pkgs.tree
          pkgs.vim
          pkgs.visidata
          (pkgs.zsh
            // {
              meta =
                pkgs.zsh.meta
                // {
                  outputsToInstall = pkgs.zsh.meta.outputsToInstall ++ ["info" "doc"];
                };
            })
        ];
      };

[2.1352]

[2.2574]

      common = import ./common-module.nix;

Replacement in nix/flake.nix at line 59 [2.189]

B:BD[2.2740] → [2.2740:2850]

      git-config = import ./personal-flake/git-config.nix;
      mac-apps = import ./personal-flake/mac-apps;

[2.2740]

[2.2850]

      git-config = import ./git-config.nix;
      mac-apps = import ./mac-apps;

Insertion in nix/flake.nix at line 74 [2.189]

[2.3321]

        {home.packages = [pkgs.cmake pkgs.nasm pkgs.ninja pkgs.autoconf pkgs.automake pkgs.autoconf-archive];}

Insertion in nix/flake.nix at line 86 [2.189]

[2.3697]

      extraSpecialArgs = {
        inherit system;
        extraFlakes = {
          inherit alejandra;
        };
      };

File addition: common-module.nix (----------)

[9.152]

{extraFlakes, pkgs, system, ...}: {
  home.packages = [
    extraFlakes.alejandra.defaultPackage.${system}
    pkgs.clojure
    pkgs.coreutils-prefixed
    pkgs.difftastic
    pkgs.direnv
    pkgs.dtach
    pkgs.ecl
    pkgs.fwoar.gsed
    pkgs.gawk
    pkgs.gnumake
    pkgs.gnuplot
    pkgs.groff
    pkgs.htop
    pkgs.jq
    pkgs.lorri
    pkgs.mosh
    # pkgs.ncdu ## currently broken
    pkgs.nixfmt-classic
    pkgs.pandoc
    pkgs.pkg-config
    pkgs.ripgrep
    (pkgs.sbcl.overrideAttrs (_: {
      enableFeatures = [
        "sb-thread"
        "sb-core-compression"
        "sb-simd"
        "sb-xref-for-internals"
        "sb-after-xc-core"
        "sb-doc"
      ];
    }))
    pkgs.shellcheck
    pkgs.texinfoInteractive
    pkgs.tree
    pkgs.vim
    pkgs.visidata
    (pkgs.zsh
     // {
       meta =
         pkgs.zsh.meta
         // {
           outputsToInstall = pkgs.zsh.meta.outputsToInstall ++ ["info" "doc"];
         };
     })
  ];
}

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

[0.182]

{
  lib,
  config,
  pkgs,
  ...
}: {
  home.packages = [
    pkgs.crawlTiles
    pkgs.fwoar.iterm2
    pkgs.emacs-git
  ];
  home.activation.install-apps = lib.hm.dag.entryAfter ["linkGeneration"] ''
    new_nix_apps="${config.home.homeDirectory}/Applications/Nix"
    rm -rf "$new_nix_apps"
    mkdir -p "$new_nix_apps"
    find -H -L "$genProfilePath/home-files/Applications" -maxdepth 2 -name "*.app" -type d -print | while read -r app; do
      real_app=$(readlink -f "$app")
      app_name=$(basename "$app")
      target_app="$new_nix_apps/$app_name"
      echo "Link '$real_app' to '$target_app'"
      mkdir -p $target_app
      "${pkgs.xorg.lndir}"/bin/lndir "$real_app" "$target_app" 2>&1>/dev/null
      rm "$target_app/Contents/Info.plist"
      cp "$real_app/Contents/Info.plist" "$target_app/Contents/Info.plist"
    done
  '';
}

File addition: git-config.nix (----------)

[9.152]

{
  config,
  lib,
  ...
}: {
  home.activation.setup-allowed-signers = lib.hm.dag.entryAfter ["install-apps"] ''
    echo "* $(cat "$HOME"/.ssh/id_ed25519.pub)" > "$HOME"/.ssh/allowed_signers
  '';
  programs = {
    git = {
      enable = true;
      userEmail = "el-github@elangley.org";
      userName = "Edward Langley";
      lfs.enable = true;
      difftastic.enable = true;
      extraConfig = {
        commit = {gpgsign = true;};
        github = {user = "fiddlerwoaroof";};
        gpg = {
          format = "ssh";
          allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
        };
        init = {defaultBranch = "main";};
        merge = {autoStash = true;};
        pull = {rebase = false;};
        rebase = {autoStash = true;};
        user = {signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";};
      };
    };
  };
}

File addition: common-module.nix (----------)

[9.152]

{extraFlakes, pkgs, system, ...}: {
  home.packages = [
    extraFlakes.alejandra.defaultPackage.${system}
    pkgs.clojure
    pkgs.coreutils-prefixed
    pkgs.difftastic
    pkgs.direnv
    pkgs.dtach
    pkgs.ecl
    pkgs.fwoar.gsed
    pkgs.gawk
    pkgs.gnumake
    pkgs.gnuplot
    pkgs.groff
    pkgs.htop
    pkgs.jq
    pkgs.lorri
    pkgs.mosh
    # pkgs.ncdu ## currently broken
    pkgs.nixfmt-classic
    pkgs.pandoc
    pkgs.pkg-config
    pkgs.ripgrep
    (pkgs.sbcl.overrideAttrs (_: {
      enableFeatures = [
        "sb-thread"
        "sb-core-compression"
        "sb-simd"
        "sb-xref-for-internals"
        "sb-after-xc-core"
        "sb-doc"
      ];
    }))
    pkgs.shellcheck
    pkgs.texinfoInteractive
    pkgs.tree
    pkgs.vim
    pkgs.visidata
    (pkgs.zsh
     // {
       meta =
         pkgs.zsh.meta
         // {
           outputsToInstall = pkgs.zsh.meta.outputsToInstall ++ ["info" "doc"];
         };
     })
  ];
}

chore(nix): update configuration for ouranos

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

File deletion: mac-apps

File deletion: default.nix

File deletion: default.nix

File deletion: git-config.nix

File deletion: git-config.nix

File addition: mac-apps (d--x------)

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

File addition: git-config.nix (----------)

Replacement in nix/flake.nix at line 39 [2.189]

Replacement in nix/flake.nix at line 50 [2.189]

Replacement in nix/flake.nix at line 59 [2.189]

Insertion in nix/flake.nix at line 74 [2.189]

Insertion in nix/flake.nix at line 86 [2.189]

File addition: common-module.nix (----------)

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

File addition: git-config.nix (----------)

File addition: common-module.nix (----------)