7 files changed, 45 insertions, 97 deletions
diff --git a/flake/devshells.nix b/flake/devshells.nix
index a97dc2b..19f9497 100644
--- a/flake/devshells.nix
+++ b/flake/devshells.nix
@@ -36,7 +36,7 @@
         };
 
       pre-commit-check = mkPreCommitHooks ./.;
-      scripts = import "${self}/scripts" {
+      scripts = import "${self}/flake/scripts" {
         inherit
           pkgs
           system
diff --git a/scripts/common.nix b/flake/scripts/common.nix
index b8ab82e..b8ab82e 100644
--- a/scripts/common.nix
+++ b/flake/scripts/common.nix
diff --git a/flake/scripts/darwin.nix b/flake/scripts/darwin.nix
new file mode 100644
index 0000000..abf6eac
--- /dev/null
+++ b/flake/scripts/darwin.nix
@@ -0,0 +1,29 @@
+{
+  pkgs,
+  system,
+  inputs,
+}:
+[
+  (pkgs.writeScriptBin "nbuild" ''
+    set -e
+    echo "> Running darwin-rebuild build..."
+    ${inputs.darwin.packages.${system}.darwin-rebuild}/bin/darwin-rebuild build --flake .
+    echo "> darwin-rebuild build was successful ✅"
+  '')
+
+  (pkgs.writeScriptBin "nswitch" ''
+    set -e
+    echo "> Running darwin-rebuild switch..."
+    ${inputs.darwin.packages.${system}.darwin-rebuild}/bin/darwin-rebuild switch --flake .
+    echo "> macOS config was successfully applied 🚀"
+  '')
+
+  (pkgs.writeScriptBin "sync-agenix-key" ''
+    set -e
+    echo "> Copying agenix SSH key from 1password ..."
+    mkdir -p ~/.ssh
+    ${pkgs._1password-cli}/bin/op --account my.1password.com read "op://Private/agenix/private key?ssh-format=openssh" > ~/.ssh/agenix
+    ${pkgs._1password-cli}/bin/op --account my.1password.com read "op://Private/agenix/public key" > ~/.ssh/agenix.pub
+    echo "> agenix SSH key copied successfully 🔐"
+  '')
+]
diff --git a/flake/scripts/default.nix b/flake/scripts/default.nix
new file mode 100644
index 0000000..db6febe
--- /dev/null
+++ b/flake/scripts/default.nix
@@ -0,0 +1,15 @@
+{
+  pkgs,
+  system,
+  inputs,
+}:
+let
+  common = import ./common.nix { inherit pkgs; };
+  darwin = import ./darwin.nix { inherit pkgs system inputs; };
+in
+{
+  common = common;
+  darwin = if pkgs.lib.hasSuffix "darwin" system then darwin else [ ];
+
+  all = common ++ (if pkgs.lib.hasSuffix "darwin" system then darwin else [ ]);
+}
diff --git a/scripts/darwin.nix b/scripts/darwin.nix
deleted file mode 100644
index c23feb3..0000000
--- a/scripts/darwin.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  pkgs,
-  system,
-  inputs,
-}:
-[
-  (pkgs.writeScriptBin "nbuild" ''
-    set -e
-    echo "> Running darwin-rebuild build..."
-    ${inputs.darwin.packages.${system}.darwin-rebuild}/bin/darwin-rebuild build --flake .
-    echo "> darwin-rebuild build was successful ✅"
-  '')
-
-  (pkgs.writeScriptBin "nswitch" ''
-    set -e
-    echo "> Running darwin-rebuild switch..."
-    ${inputs.darwin.packages.${system}.darwin-rebuild}/bin/darwin-rebuild switch --flake .
-    echo "> macOS config was successfully applied 🚀"
-  '')
-
-  (pkgs.writeScriptBin "build-synology-vm" ''
-    set -e
-    echo "> Running nixos-rebuild build ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#synology-vm --target-host 192.168.1.151 --build-host 192.168.1.151 --fast --use-remote-sudo --use-substitutes
-    echo "> nixos-rebuild build was successful ✅"
-  '')
-
-  (pkgs.writeScriptBin "switch-synology-vm" ''
-    set -e
-    echo "> Running nixos-rebuild switch ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --keep-going --flake .#synology-vm --target-host 192.168.1.151 --build-host 192.168.1.151 --fast --use-remote-sudo --use-substitutes
-    echo "> nixos config successfully applied 🚀"
-  '')
-
-  (pkgs.writeScriptBin "build-do-rproxy" ''
-    set -e
-    echo "> Running nixos-rebuild build ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#do-rproxy --target-host 165.232.158.110 --build-host 165.232.158.110 --fast --use-remote-sudo --use-substitutes
-    echo "> nixos-rebuild build was successful ✅"
-  '')
-
-  (pkgs.writeScriptBin "switch-do-rproxy" ''
-    set -e
-    echo "> Running nixos-rebuild switch ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --keep-going --flake .#do-rproxy --target-host 165.232.158.110 --build-host 165.232.158.110 --fast --use-remote-sudo --use-substitutes
-    echo "> nixos config successfully applied 🚀"
-  '')
-
-  (pkgs.writeScriptBin "sync-agenix-key" ''
-    set -e
-    echo "> Copying agenix SSH key from 1password ..."
-    mkdir -p ~/.ssh
-    ${pkgs._1password-cli}/bin/op --account my.1password.com read "op://Private/agenix/private key?ssh-format=openssh" > ~/.ssh/agenix
-    ${pkgs._1password-cli}/bin/op --account my.1password.com read "op://Private/agenix/public key" > ~/.ssh/agenix.pub
-    echo "> agenix SSH key copied successfully 🔐"
-  '')
-]
diff --git a/scripts/default.nix b/scripts/default.nix
deleted file mode 100644
index 90851df..0000000
--- a/scripts/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  pkgs,
-  system,
-  inputs,
-}:
-let
-  common = import ./common.nix { inherit pkgs; };
-  darwin = import ./darwin.nix { inherit pkgs system inputs; };
-  linux = import ./linux.nix { inherit pkgs system inputs; };
-in
-{
-  common = common;
-  darwin = if pkgs.lib.hasSuffix "darwin" system then darwin else [ ];
-  linux = if pkgs.lib.hasSuffix "linux" system then linux else [ ];
-
-  all =
-    common
-    ++ (if pkgs.lib.hasSuffix "darwin" system then darwin else [ ])
-    ++ (if pkgs.lib.hasSuffix "linux" system then linux else [ ]);
-}
diff --git a/scripts/linux.nix b/scripts/linux.nix
deleted file mode 100644
index b44c86f..0000000
--- a/scripts/linux.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  pkgs,
-}:
-[
-  (pkgs.writeScriptBin "nbuild" ''
-    set -e
-    echo "> Running nixos-rebuild build..."
-    sudo nixos-rebuild build --flake .
-    echo "> nixos-rebuild build was successful ✅"
-  '')
-
-  (pkgs.writeScriptBin "nswitch" ''
-    set -e
-    echo "> Running nixos-rebuild switch..."
-    sudo nixos-rebuild switch --flake .
-    echo "> nixos-rebuild switch was successful ✅"
-    echo "> NixOS config was successfully applied 🚀"
-  '')
-]