diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index f3a3db1..81ab15c 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "ansible-sshjail": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "path": "flakes/ansible-sshjail", - "type": "path" - }, - "original": { - "path": "flakes/ansible-sshjail", - "type": "path" - }, - "parent": [] - }, "crane": { "locked": { "lastModified": 1731098351, @@ -89,42 +72,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -281,14 +228,12 @@ }, "root": { "inputs": { - "ansible-sshjail": "ansible-sshjail", "disko": "disko", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", "nixpkgs-dda3dcd3f": "nixpkgs-dda3dcd3f", - "nixpkgs-unoptimized": "nixpkgs-unoptimized", - "zsh-histdb": "zsh-histdb" + "nixpkgs-unoptimized": "nixpkgs-unoptimized" } }, "rust-overlay": { @@ -311,53 +256,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zsh-histdb": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "path": "flakes/zsh-histdb", - "type": "path" - }, - "original": { - "path": "flakes/zsh-histdb", - "type": "path" - }, - "parent": [] } }, "root": "root", diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 681457a..583fb2d 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -31,8 +31,6 @@ # # doas nix --substituters "http://10.0.2.2:8080?trusted=1 https://cache.nixos.org/" --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount hosts/odo/disk-config.nix -# nix flake update zsh-histdb --flake . -# nix flake update ansible-sshjail --flake . # for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done # nixos-install --substituters "http://10.0.2.2:8080?trusted=1 https://cache.nixos.org/" --flake ".#vm_ionlybootzfs" # @@ -51,18 +49,6 @@ # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; }; - zsh-histdb = { - url = "path:flakes/zsh-histdb"; - - # Optional but recommended to limit the size of your system closure. - inputs.nixpkgs.follows = "nixpkgs"; - }; - ansible-sshjail = { - url = "path:flakes/ansible-sshjail"; - - # Optional but recommended to limit the size of your system closure. - inputs.nixpkgs.follows = "nixpkgs"; - }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -77,8 +63,6 @@ nixpkgs-dda3dcd3f, impermanence, lanzaboote, - zsh-histdb, - ansible-sshjail, ... }@inputs: let @@ -98,12 +82,6 @@ impermanence.nixosModules.impermanence lanzaboote.nixosModules.lanzaboote inputs.disko.nixosModules.disko - { - nixpkgs.overlays = [ - zsh-histdb.overlays.default - ansible-sshjail.overlays.default - ]; - } ./configuration.nix ]; }; diff --git a/nix/configuration/flakes/ansible-sshjail/flake.lock b/nix/configuration/flakes/ansible-sshjail/flake.lock deleted file mode 100644 index fdf755d..0000000 --- a/nix/configuration/flakes/ansible-sshjail/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1735141468, - "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/configuration/flakes/ansible-sshjail/flake.nix b/nix/configuration/flakes/ansible-sshjail/flake.nix deleted file mode 100644 index 581331a..0000000 --- a/nix/configuration/flakes/ansible-sshjail/flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - description = "A slightly better history for zsh"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = - { - self, - nixpkgs, - flake-utils, - ... - }: - let - out = - system: - let - pkgs = nixpkgs.legacyPackages.${system}; - # Maybe pkgs = import nixpkgs { inherit system; }; ? - appliedOverlay = self.overlays.default pkgs pkgs; - in - { - packages = rec { - default = ansible-sshjail; - ansible-sshjail = appliedOverlay.ansible-sshjail; - }; - }; - in - flake-utils.lib.eachDefaultSystem out - // { - overlays.default = final: prev: { - ansible-sshjail = final.callPackage ./package.nix { }; - }; - }; -} diff --git a/nix/configuration/flakes/zsh-histdb/flake.lock b/nix/configuration/flakes/zsh-histdb/flake.lock deleted file mode 100644 index fdf755d..0000000 --- a/nix/configuration/flakes/zsh-histdb/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1735141468, - "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/configuration/flakes/zsh-histdb/flake.nix b/nix/configuration/flakes/zsh-histdb/flake.nix deleted file mode 100644 index f831ce1..0000000 --- a/nix/configuration/flakes/zsh-histdb/flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - description = "A slightly better history for zsh"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = - { - self, - nixpkgs, - flake-utils, - ... - }: - let - out = - system: - let - pkgs = nixpkgs.legacyPackages.${system}; - # Maybe pkgs = import nixpkgs { inherit system; }; ? - appliedOverlay = self.overlays.default pkgs pkgs; - in - { - packages = rec { - default = zsh-histdb; - zsh-histdb = appliedOverlay.zsh-histdb; - }; - }; - in - flake-utils.lib.eachDefaultSystem out - // { - overlays.default = final: prev: { - zsh-histdb = final.callPackage ./package.nix { }; - }; - }; -} diff --git a/nix/configuration/hosts/hydra/DEPLOY_BOOT b/nix/configuration/hosts/hydra/DEPLOY_BOOT index add6a56..f0b005e 100755 --- a/nix/configuration/hosts/hydra/DEPLOY_BOOT +++ b/nix/configuration/hosts/hydra/DEPLOY_BOOT @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=hydra -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/DEPLOY_SWITCH b/nix/configuration/hosts/hydra/DEPLOY_SWITCH index ff96352..b6b9edd 100755 --- a/nix/configuration/hosts/hydra/DEPLOY_SWITCH +++ b/nix/configuration/hosts/hydra/DEPLOY_SWITCH @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=hydra -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/ISO b/nix/configuration/hosts/hydra/ISO index f05a859..e438611 100755 --- a/nix/configuration/hosts/hydra/ISO +++ b/nix/configuration/hosts/hydra/ISO @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.hydra" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/VM_ISO b/nix/configuration/hosts/hydra/VM_ISO index 201b5f9..db043f3 100755 --- a/nix/configuration/hosts/hydra/VM_ISO +++ b/nix/configuration/hosts/hydra/VM_ISO @@ -6,8 +6,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#vm_iso.hydra" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/ionlybootzfs/DEPLOY_BOOT b/nix/configuration/hosts/ionlybootzfs/DEPLOY_BOOT index b7c6a5a..46867d9 100755 --- a/nix/configuration/hosts/ionlybootzfs/DEPLOY_BOOT +++ b/nix/configuration/hosts/ionlybootzfs/DEPLOY_BOOT @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET="ionlybootzfs" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/ionlybootzfs/DEPLOY_SWITCH b/nix/configuration/hosts/ionlybootzfs/DEPLOY_SWITCH index fc3ee26..59e6ff7 100755 --- a/nix/configuration/hosts/ionlybootzfs/DEPLOY_SWITCH +++ b/nix/configuration/hosts/ionlybootzfs/DEPLOY_SWITCH @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=ionlybootzfs -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/ionlybootzfs/ISO b/nix/configuration/hosts/ionlybootzfs/ISO index 10a7664..c817925 100755 --- a/nix/configuration/hosts/ionlybootzfs/ISO +++ b/nix/configuration/hosts/ionlybootzfs/ISO @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.ionlybootzfs" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/neelix/DEPLOY_BOOT b/nix/configuration/hosts/neelix/DEPLOY_BOOT index 679a790..8b0d98d 100755 --- a/nix/configuration/hosts/neelix/DEPLOY_BOOT +++ b/nix/configuration/hosts/neelix/DEPLOY_BOOT @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=neelix -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/neelix/DEPLOY_SWITCH b/nix/configuration/hosts/neelix/DEPLOY_SWITCH index d2d91d0..74c99a8 100755 --- a/nix/configuration/hosts/neelix/DEPLOY_SWITCH +++ b/nix/configuration/hosts/neelix/DEPLOY_SWITCH @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=neelix -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/DEPLOY_BOOT b/nix/configuration/hosts/odo/DEPLOY_BOOT index bc63853..4afc053 100755 --- a/nix/configuration/hosts/odo/DEPLOY_BOOT +++ b/nix/configuration/hosts/odo/DEPLOY_BOOT @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=odo -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/DEPLOY_SWITCH b/nix/configuration/hosts/odo/DEPLOY_SWITCH index 42dea3d..880cfee 100755 --- a/nix/configuration/hosts/odo/DEPLOY_SWITCH +++ b/nix/configuration/hosts/odo/DEPLOY_SWITCH @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=odo -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/ISO b/nix/configuration/hosts/odo/ISO index d16e846..f187364 100755 --- a/nix/configuration/hosts/odo/ISO +++ b/nix/configuration/hosts/odo/ISO @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.odo" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_BOOT b/nix/configuration/hosts/odo/SELF_BOOT index e410f5e..ff6c55c 100755 --- a/nix/configuration/hosts/odo/SELF_BOOT +++ b/nix/configuration/hosts/odo/SELF_BOOT @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_BUILD b/nix/configuration/hosts/odo/SELF_BUILD index 00c1ef4..6de3e8b 100755 --- a/nix/configuration/hosts/odo/SELF_BUILD +++ b/nix/configuration/hosts/odo/SELF_BUILD @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_SWITCH b/nix/configuration/hosts/odo/SELF_SWITCH index d7ca743..0f1423f 100755 --- a/nix/configuration/hosts/odo/SELF_SWITCH +++ b/nix/configuration/hosts/odo/SELF_SWITCH @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/DEPLOY_BOOT b/nix/configuration/hosts/quark/DEPLOY_BOOT index 10620b1..108ab01 100755 --- a/nix/configuration/hosts/quark/DEPLOY_BOOT +++ b/nix/configuration/hosts/quark/DEPLOY_BOOT @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=quark -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/DEPLOY_SWITCH b/nix/configuration/hosts/quark/DEPLOY_SWITCH index efa26ab..7b18a97 100755 --- a/nix/configuration/hosts/quark/DEPLOY_SWITCH +++ b/nix/configuration/hosts/quark/DEPLOY_SWITCH @@ -10,8 +10,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TARGET=192.168.211.250 TARGET=quark -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/ISO b/nix/configuration/hosts/quark/ISO index 72caaa5..4f00288 100755 --- a/nix/configuration/hosts/quark/ISO +++ b/nix/configuration/hosts/quark/ISO @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.quark" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_BOOT b/nix/configuration/hosts/quark/SELF_BOOT index 6818f53..0387013 100755 --- a/nix/configuration/hosts/quark/SELF_BOOT +++ b/nix/configuration/hosts/quark/SELF_BOOT @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_BUILD b/nix/configuration/hosts/quark/SELF_BUILD index 9297c9f..6966a6b 100755 --- a/nix/configuration/hosts/quark/SELF_BUILD +++ b/nix/configuration/hosts/quark/SELF_BUILD @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_SWITCH b/nix/configuration/hosts/quark/SELF_SWITCH index c6475d6..7b3a91a 100755 --- a/nix/configuration/hosts/quark/SELF_SWITCH +++ b/nix/configuration/hosts/quark/SELF_SWITCH @@ -6,7 +6,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : "${JOBS:="1"}" -nix flake update zsh-histdb --flake "$DIR/../../" -nix flake update ansible-sshjail --flake "$DIR/../../" for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/roles/ansible/default.nix b/nix/configuration/roles/ansible/default.nix index d36dfda..8600402 100644 --- a/nix/configuration/roles/ansible/default.nix +++ b/nix/configuration/roles/ansible/default.nix @@ -25,6 +25,9 @@ ]; nixpkgs.overlays = [ + (final: prev: { + ansible-sshjail = (final.callPackage ./package/ansible-sshjail/package.nix { }); + }) (final: prev: { ansible = pkgs.symlinkJoin { name = "ansible"; diff --git a/nix/configuration/flakes/ansible-sshjail/package.nix b/nix/configuration/roles/ansible/package/ansible-sshjail/package.nix similarity index 100% rename from nix/configuration/flakes/ansible-sshjail/package.nix rename to nix/configuration/roles/ansible/package/ansible-sshjail/package.nix diff --git a/nix/configuration/roles/zsh/default.nix b/nix/configuration/roles/zsh/default.nix index 2a4fdfe..9417755 100644 --- a/nix/configuration/roles/zsh/default.nix +++ b/nix/configuration/roles/zsh/default.nix @@ -109,6 +109,12 @@ in ]; }; }; + + nixpkgs.overlays = [ + (final: prev: { + zsh-histdb = (final.callPackage ./package/zsh-histdb/package.nix { }); + }) + ]; } ] ); diff --git a/nix/configuration/flakes/zsh-histdb/package.nix b/nix/configuration/roles/zsh/package/zsh-histdb/package.nix similarity index 100% rename from nix/configuration/flakes/zsh-histdb/package.nix rename to nix/configuration/roles/zsh/package/zsh-histdb/package.nix