diff --git a/flake.lock b/flake.lock index 8918390a..da56e25f 100644 --- a/flake.lock +++ b/flake.lock @@ -159,30 +159,6 @@ "type": "github" } }, - "cachix-deploy-flake": { - "inputs": { - "darwin": "darwin", - "disko": "disko", - "home-manager": [ - "home-manager" - ], - "nixos-anywhere": "nixos-anywhere", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1728048122, - "narHash": "sha256-2P7BjsQHpAjp+zjftGXSGwo0gepR79KJbBNRKJxsUyk=", - "owner": "cachix", - "repo": "cachix-deploy-flake", - "rev": "f363e7ba6661f0e342707b98224c85599fdfb1cc", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix-deploy-flake", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1727316705, @@ -299,27 +275,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "cachix-deploy-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -363,27 +318,6 @@ "type": "github" } }, - "disko": { - "inputs": { - "nixpkgs": [ - "cachix-deploy-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727977578, - "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", - "owner": "nix-community", - "repo": "disko", - "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -558,28 +492,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "cachix-deploy-flake", - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -600,7 +512,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -621,7 +533,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nur", @@ -1370,7 +1282,7 @@ "inputs": { "crane": "crane_3", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ], @@ -1437,7 +1349,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1721727458, @@ -1615,7 +1527,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1733629314, @@ -1631,78 +1543,6 @@ "type": "github" } }, - "nixos-anywhere": { - "inputs": { - "disko": [ - "cachix-deploy-flake", - "disko" - ], - "flake-parts": "flake-parts_3", - "nixos-images": "nixos-images", - "nixos-stable": "nixos-stable", - "nixpkgs": [ - "cachix-deploy-flake", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1727531568, - "narHash": "sha256-lt8fmizvl6iRDNz7/Yqor1MmU5fcUyv3oajtUsUmthA=", - "owner": "numtide", - "repo": "nixos-anywhere", - "rev": "b6168ba67a8fad0636b5111a906dfbdf3abe2dee", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nixos-anywhere", - "type": "github" - } - }, - "nixos-images": { - "inputs": { - "nixos-stable": [ - "cachix-deploy-flake", - "nixos-anywhere", - "nixos-stable" - ], - "nixos-unstable": [ - "cachix-deploy-flake", - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727367213, - "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", - "owner": "nix-community", - "repo": "nixos-images", - "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-images", - "type": "github" - } - }, - "nixos-stable": { - "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1706487304, @@ -1786,20 +1626,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1727998858, - "narHash": "sha256-IeBVJ75Bd7yWz8i3m225x5Q25O1Wk8cBWi8DI7bCgSo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73bed75dbd3de6d4fca3f81ce25a0cc7766afff6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1732937961, "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", @@ -1813,7 +1639,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1733392399, "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", @@ -1829,7 +1655,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1733940404, "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", @@ -1845,6 +1671,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { "locked": { "lastModified": 1644486793, @@ -1862,22 +1704,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1733940404, "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", @@ -1897,7 +1723,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin_2", @@ -1905,7 +1731,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1734103614, @@ -1950,7 +1776,7 @@ "inputs": { "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1672582520, @@ -1971,7 +1797,7 @@ "inputs": { "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1713028366, @@ -1989,9 +1815,9 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8", - "treefmt-nix": "treefmt-nix_3" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_7", + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1734126962, @@ -2156,7 +1982,6 @@ "anyrun-hyprwin": "anyrun-hyprwin", "anyrun-nixos-options": "anyrun-nixos-options", "anyrun-rink": "anyrun-rink", - "cachix-deploy-flake": "cachix-deploy-flake", "csshacks": "csshacks", "d2": "d2", "deploy-rs": "deploy-rs", @@ -2175,7 +2000,7 @@ "neorg-telescope": "neorg-telescope", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "nno": "nno", @@ -2606,28 +2431,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "cachix-deploy-flake", - "nixos-anywhere", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727252110, - "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -2648,7 +2451,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nur", diff --git a/flake.nix b/flake.nix index 5bf20304..bca6809c 100644 --- a/flake.nix +++ b/flake.nix @@ -66,10 +66,6 @@ url = "github:zaghaghi/openapi-tui"; flake = false; }; - cachix-deploy-flake = { - url = "github:cachix/cachix-deploy-flake"; - inputs.home-manager.follows = "home-manager"; - }; onepassword-shell-plugins = { url = "github:uttarayan21/shell-plugins"; inputs.nixpkgs.follows = "nixpkgs"; @@ -289,11 +285,12 @@ user = "root"; }; }; - mbpro = { - hostname = "Uttarayans-MacBook-Pro.local"; + kuro = { + hostname = "kuro"; profiles.system = { sshUser = "fs0c131y"; - path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.Uttarayans-MacBook-Pro; + path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro; + user = "root"; }; }; deoxys = { @@ -305,7 +302,7 @@ }; }; deck = { - hostname = "192.168.1.52"; + hostname = "deck"; profiles.system = { sshUser = "deck"; path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck; diff --git a/nix.conf b/nix.conf deleted file mode 100644 index 63529267..00000000 --- a/nix.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Generated by https://github.com/DeterminateSystems/nix-installer. -# See `/nix/nix-installer --version` for the version details. - -build-users-group = nixbld -experimental-features = nix-command flakes repl-flake -bash-prompt-prefix = (nix:$name)\040 -max-jobs = auto -extra-nix-path = nixpkgs=flake:nixpkgs