colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make dotfiles worktree follow flake checkout

Browse Source
This commit is contained in:
Ivan Malison
2026-05-31 21:00:50 -07:00
parent d90a6c7c63
commit 6018cc6f1d
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotfiles/gitconfig
View File

@@ -116,3 +116,4 @@
directory = /tmp/tmp.zfvv44RquC/runtime/data/org directory = /tmp/tmp.zfvv44RquC/runtime/data/org
directory = /tmp/tmp.zFdvVnKk4B/runtime/data/org directory = /tmp/tmp.zFdvVnKk4B/runtime/data/org
directory = /tmp/tmp.PQTdI3UzS3/runtime/data/org directory = /tmp/tmp.PQTdI3UzS3/runtime/data/org
directory = /srv/dotfiles/dotfiles/config/taffybar/taffybar

20
nixos/environment.nix
View File

@@ -6,7 +6,16 @@
inputs, inputs,
... ...
}: let }: let
envDotfilesWorktree = builtins.getEnv "DOTFILES_WORKTREE";
defaultDotfilesWorktree =
if envDotfilesWorktree != ""
then envDotfilesWorktree
else "/srv/dotfiles";
libDir = "${config.dotfiles-worktree}/dotfiles/lib"; libDir = "${config.dotfiles-worktree}/dotfiles/lib";
zshLibDir = builtins.path {
path = ../dotfiles/lib;
name = "dotfiles-zsh-lib";
};
machineFilenames = builtins.attrNames (builtins.readDir ./machines); machineFilenames = builtins.attrNames (builtins.readDir ./machines);
machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename); machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename);
machineNames = map machineNameFromFilename machineFilenames; machineNames = map machineNameFromFilename machineFilenames;
@@ -28,7 +37,10 @@ in
}; };
dotfiles-worktree = mkOption { dotfiles-worktree = mkOption {
type = types.str; type = types.str;
default = "/srv/dotfiles"; default = defaultDotfilesWorktree;
defaultText = literalExpression ''
builtins.getEnv "DOTFILES_WORKTREE" or "/srv/dotfiles"
'';
description = '' description = ''
Runtime path to the shared, editable dotfiles checkout. Home Manager Runtime path to the shared, editable dotfiles checkout. Home Manager
uses this for out-of-store symlink targets so links are stable across uses this for out-of-store symlink targets so links are stable across
@@ -59,9 +71,9 @@ in
plugins = ["git" "sudo" "pip"]; plugins = ["git" "sudo" "pip"];
}; };
shellInit = '' shellInit = ''
fpath=("$HOME/.lib/completions" "${libDir}/completions" $fpath) fpath=("${zshLibDir}/completions" $fpath)
fpath+="${libDir}/functions" fpath+="${zshLibDir}/functions"
for file in "${libDir}/functions/"* for file in "${zshLibDir}/functions/"*(N)
do do
autoload "''${file##*/}" autoload "''${file##*/}"
done done

4
nixos/justfile
View File

@@ -2,8 +2,8 @@ switch-substituters := "https://cache.nixos.org https://cache.nixos-cuda.org htt
switch-trusted-public-keys := "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M= cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E= ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE= colonelpanic8-dotfiles.cachix.org-1:O6GF3nptpeMFapX29okzO92eSWXR36zqW6ZF2C8P0eQ= taffybar.cachix.org-1:beZotJ1nVEsAnJxa3lWn0zwzZM7oeXmGh4ADRpHeeIo= codex-cli.cachix.org-1:1Br3H1hHoRYG22n//cGKJOk3cQXgYobUel6O8DgSing= claude-code.cachix.org-1:YeXf2aNu7UTX8Vwrze0za1WEDS+4DuI2kVeWEE4fsRk=" switch-trusted-public-keys := "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M= cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E= ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE= colonelpanic8-dotfiles.cachix.org-1:O6GF3nptpeMFapX29okzO92eSWXR36zqW6ZF2C8P0eQ= taffybar.cachix.org-1:beZotJ1nVEsAnJxa3lWn0zwzZM7oeXmGh4ADRpHeeIo= codex-cli.cachix.org-1:1Br3H1hHoRYG22n//cGKJOk3cQXgYobUel6O8DgSing= claude-code.cachix.org-1:YeXf2aNu7UTX8Vwrze0za1WEDS+4DuI2kVeWEE4fsRk="
switch *args: switch *args:
case "$(systemctl show -P ActiveState nixos-upgrade.service 2>/dev/null)" in active|activating|reloading) /run/wrappers/bin/sudo systemctl stop nixos-upgrade.service;; esac case "$(/run/current-system/sw/bin/systemctl show -P ActiveState nixos-upgrade.service 2>/dev/null)" in active|activating|reloading) /run/wrappers/bin/sudo /run/current-system/sw/bin/systemctl stop nixos-upgrade.service;; esac
/run/wrappers/bin/sudo nixos-rebuild switch --flake ".#" --impure --option substituters '{{switch-substituters}}' --option trusted-public-keys '{{switch-trusted-public-keys}}' {{args}} dotfiles_worktree="$(/run/current-system/sw/bin/readlink -f "$PWD/..")"; /run/wrappers/bin/sudo env DOTFILES_WORKTREE="$dotfiles_worktree" PATH=/run/current-system/sw/bin:/nix/var/nix/profiles/system/sw/bin:/etc/profiles/per-user/root/bin:/usr/bin:/bin /run/current-system/sw/bin/nixos-rebuild switch --flake ".#" --impure --option substituters '{{switch-substituters}}' --option trusted-public-keys '{{switch-trusted-public-keys}}' {{args}}
populate-cachix cache="colonelpanic8-dotfiles" host=`hostname` *args: populate-cachix cache="colonelpanic8-dotfiles" host=`hostname` *args:
store_path="$(nix build --no-link --print-out-paths ".#nixosConfigurations.{{host}}.config.system.build.toplevel" --impure --option warn-dirty false {{args}})" && cachix push {{cache}} "$store_path" store_path="$(nix build --no-link --print-out-paths ".#nixosConfigurations.{{host}}.config.system.build.toplevel" --impure --option warn-dirty false {{args}})" && cachix push {{cache}} "$store_path"