diff --git a/deploy b/deploy index 7eda4b4..8e81932 100755 --- a/deploy +++ b/deploy @@ -1 +1 @@ -nixos-rebuild switch --flake .#soleo --target-host root@178.156.171.49 --build-on remote +nix run nixpkgs#nixos-rebuild -- switch --flake .#soleo --target-host root@178.156.171.49 --build-on-remote diff --git a/flake.lock b/flake.lock index d4056e5..00faf82 100644 --- a/flake.lock +++ b/flake.lock @@ -3,124 +3,30 @@ "disko": { "inputs": { "nixpkgs": [ - "nixos-anywhere", "nixpkgs" ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1773506317, + "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "disko", "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixos-anywhere", - "nixpkgs" - ] - }, + "nixpkgs": { "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "nix-vm-test": { - "inputs": { - "nixpkgs": [ - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769079217, - "narHash": "sha256-R6qzhu+YJolxE2vUsPQWWwUKMbAG5nXX3pBtg8BNX38=", - "owner": "Enzime", - "repo": "nix-vm-test", - "rev": "58c15f78947b431d6c206e0966500c7e9139bd2f", - "type": "github" - }, - "original": { - "owner": "Enzime", - "ref": "pr-105-latest", - "repo": "nix-vm-test", - "type": "github" - } - }, - "nixos-anywhere": { - "inputs": { - "disko": "disko", - "flake-parts": "flake-parts", - "nix-vm-test": "nix-vm-test", - "nixos-images": "nixos-images", - "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1769956140, - "narHash": "sha256-D+RQ+DaIC/GVwv5lUs7e8jSmh8aPc77Kg/gRjaS25Zk=", - "owner": "nix-community", - "repo": "nixos-anywhere", - "rev": "92f82c5196a5f8588be4967e535c4cfd35e85902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-anywhere", - "type": "github" - } - }, - "nixos-images": { - "inputs": { - "nixos-stable": [ - "nixos-anywhere", - "nixos-stable" - ], - "nixos-unstable": [ - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766770015, - "narHash": "sha256-kUmVBU+uBUPl/v3biPiWrk680b8N9rRMhtY97wsxiJc=", - "owner": "nix-community", - "repo": "nixos-images", - "rev": "e4dba54ddb6b2ad9c6550e5baaed2fa27938a5d2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-images", - "type": "github" - } - }, - "nixos-stable": { - "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1773524153, + "narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", "type": "github" }, "original": { @@ -130,63 +36,10 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1769900851, - "narHash": "sha256-RgCgXS3WiG9c/1wxFM6OXmmv39dSaLLON9VeAbTTAIM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "30a3e96da641620c63f2e1f345ea434ac78f5de1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "nixos-anywhere": "nixos-anywhere", - "nixpkgs": "nixpkgs_2" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769691507, - "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" + "disko": "disko", + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 6ec7cec..6b69254 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,8 @@ system = "x86_64-linux"; modules = [ disko.nixosModules.disko - ./hosts/wsoleo/configuration.nix - ./hosts/wsoleo/disk-config.nix + ./hosts/soleo/configuration.nix + ./hosts/soleo/disk-config.nix ]; }; };