From bb1df0d1c0954f8bb5985911d8e85ce99302541e Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 15 Mar 2024 15:45:44 -0500 Subject: [PATCH] Removing unused inputs and added NixVirt input. --- flake.lock | 207 +++++++++----------------------- flake.nix | 17 +-- nixos/gandalf/configuration.nix | 3 +- 3 files changed, 61 insertions(+), 166 deletions(-) diff --git a/flake.lock b/flake.lock index e8d5611..285753b 100644 --- a/flake.lock +++ b/flake.lock @@ -22,28 +22,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs-stable" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1708091384, - "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -60,44 +38,10 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1709336216, "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", @@ -196,7 +140,7 @@ "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "nixpkgs": "nixpkgs", - "systems": "systems_3", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, @@ -220,7 +164,7 @@ "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs_2", - "systems": "systems_4", + "systems": "systems_3", "wlroots": "wlroots_2", "xdph": "xdph_2" }, @@ -321,7 +265,7 @@ "hyprland-protocols": "hyprland-protocols_3", "hyprlang": "hyprlang_3", "nixpkgs": "nixpkgs_3", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1709299639, @@ -390,7 +334,7 @@ "hyprland-xdph-git", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1708681732, @@ -406,31 +350,9 @@ "type": "github" } }, - "nix-fast-build": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs-stable" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1709911523, - "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", - "owner": "Mic92", - "repo": "nix-fast-build", - "rev": "692fe3e98f36b60c678d637235271b57910a7f80", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-fast-build", - "type": "github" - } - }, "nixd-git": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -466,11 +388,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -481,18 +403,16 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-ovmf": { "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { - "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", @@ -595,19 +515,54 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1708979614, + "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvirt-git": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "nixpkgs-ovmf": "nixpkgs-ovmf" + }, + "locked": { + "lastModified": 1709064919, + "narHash": "sha256-uscnESRqfncrLg/gsEjDRP57u1tHk9+eGIBb5uhbf9g=", + "owner": "AshleyYakeley", + "repo": "NixVirt", + "rev": "a9cbedf52007b5d525837b0f736ad4fc8fe7f94c", + "type": "github" + }, + "original": { + "owner": "AshleyYakeley", + "ref": "v0.3.0", + "repo": "NixVirt", + "type": "github" + } + }, "root": { "inputs": { "atuin": "atuin", - "deploy-rs": "deploy-rs", "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "hy3": "hy3", "hyprland-git": "hyprland-git", "hyprland-xdph-git": "hyprland-xdph-git", - "nix-fast-build": "nix-fast-build", "nixd-git": "nixd-git", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", + "nixvirt-git": "nixvirt-git", "sops-nix": "sops-nix" } }, @@ -649,16 +604,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -707,60 +662,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-fast-build", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 9d871a3..6eced9f 100644 --- a/flake.nix +++ b/flake.nix @@ -25,24 +25,12 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - # nix-fast-build - nix-fast-build = { - url = "github:Mic92/nix-fast-build"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; - # sops-nix sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; - # deploy-rs - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; - # atuin atuin = { url = "github:atuinsh/atuin"; @@ -68,6 +56,11 @@ nixd-git = { url = "github:nix-community/nixd"; }; + + # NixVirt for qemu & libvirt + nixvirt-git = { + url = "github:AshleyYakeley/NixVirt/v0.3.0"; + }; }; # The `@` syntax here is used to alias the attribute set of the diff --git a/nixos/gandalf/configuration.nix b/nixos/gandalf/configuration.nix index 7ef21d6..9524438 100644 --- a/nixos/gandalf/configuration.nix +++ b/nixos/gandalf/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: { imports = @@ -39,6 +39,7 @@ environment.systemPackages = with pkgs; [ podman-compose lazydocker + inputs.nixvirt-git.packages.${pkgs.system}.default ]; # Services