From 5533035aa6b9dd7534f6d7a9e9b69cd3ae52f121 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 31 Mar 2024 11:59:33 -0400 Subject: [PATCH] Change stuff --- flake.lock | 136 +++++++++++++++++++++--- flake.nix | 1 + modules/common-desktop/packages.nix | 2 +- modules/common-desktop/polkit.nix | 2 +- modules/common-desktop/virt-manager.nix | 4 + modules/common/quadradical.nix | 2 +- quadraticpc/configuration.nix | 1 - quadtop/configuration.nix | 1 - 8 files changed, 128 insertions(+), 21 deletions(-) create mode 100644 modules/common-desktop/virt-manager.nix diff --git a/flake.lock b/flake.lock index 58dbbbf..a747414 100644 --- a/flake.lock +++ b/flake.lock @@ -147,6 +147,26 @@ "type": "github" } }, + "bluebuild": { + "inputs": { + "flake-schemas": "flake-schemas", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1711470190, + "narHash": "sha256-s8aRH+XcOOl3DYowFFEzA6MgZHqFStueur8USdNNCNM=", + "owner": "blue-build", + "repo": "cli", + "rev": "189141924baccb04349330348428f576ac6b2a76", + "type": "github" + }, + "original": { + "owner": "blue-build", + "repo": "cli", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -197,6 +217,38 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1697467827, + "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", + "rev": "764932025c817d4e500a8d2a4d8c565563923d29", + "revCount": 29, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A.tar.gz" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -232,7 +284,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1711133180, @@ -271,7 +323,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1711242788, @@ -289,18 +341,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", - "type": "github" + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "revCount": 588909, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.588909%2Brev-13aff9b34cc32e59d35c62ac9356e4a41198a538/018dec1e-579e-771e-9f64-eb8879874075/source.tar.gz" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" } }, "nixpkgs-lib": { @@ -322,6 +372,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1711200738, "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", @@ -337,7 +403,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1711163522, "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", @@ -353,7 +419,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1700856099, "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", @@ -392,15 +458,38 @@ }, "root": { "inputs": { + "bluebuild": "bluebuild", "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "programsdb": "programsdb", "stylix": "stylix", "wrapper-manager": "wrapper-manager" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "bluebuild", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709086241, + "narHash": "sha256-3QHK5zu/5XOa+ghBeKzvt+/BLdEPjw/xDNLcpDfbkmg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "5d56056fb905ff550ee61b6ebb6674d494f57a9e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -415,7 +504,7 @@ "flake-compat": "flake-compat", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1711224130, @@ -431,6 +520,21 @@ "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" + } + }, "utils": { "locked": { "lastModified": 1678901627, diff --git a/flake.nix b/flake.nix index bcf577d..f9881bc 100755 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ flake = false; }; nix-gaming.url = "github:fufexan/nix-gaming"; + bluebuild.url = "github:blue-build/cli"; programsdb = { url = "github:wamserma/flake-programs-sqlite"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index 9010859..4fda71c 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -21,7 +21,6 @@ nodejs_21 impression libreoffice - virt-manager wl-clipboard protontricks prismlauncher @@ -30,6 +29,7 @@ nodePackages_latest.pnpm hunspellDicts.en_CA-large inputs.nix-gaming.packages.${system}.wine-ge + inputs.bluebuild.packages.${system}.bluebuild (retroarch.override {cores = with libretro; [bsnes-hd];}) ]; } diff --git a/modules/common-desktop/polkit.nix b/modules/common-desktop/polkit.nix index 5733ab2..ed10ae6 100644 --- a/modules/common-desktop/polkit.nix +++ b/modules/common-desktop/polkit.nix @@ -12,7 +12,7 @@ auth_admin_keep auth_admin_keep - /run/current-system/sw/bin/flatpak + /home/quadradical/.local/bin/rebuildExec '') diff --git a/modules/common-desktop/virt-manager.nix b/modules/common-desktop/virt-manager.nix new file mode 100644 index 0000000..d923a08 --- /dev/null +++ b/modules/common-desktop/virt-manager.nix @@ -0,0 +1,4 @@ +{ + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; +} diff --git a/modules/common/quadradical.nix b/modules/common/quadradical.nix index 00feec8..11ebd72 100644 --- a/modules/common/quadradical.nix +++ b/modules/common/quadradical.nix @@ -2,6 +2,6 @@ users.users.quadradical = { isNormalUser = true; description = "QuadRadical"; - extraGroups = ["networkmanager" "wheel"]; + extraGroups = ["networkmanager" "wheel" "libvirtd"]; }; } diff --git a/quadraticpc/configuration.nix b/quadraticpc/configuration.nix index 2a80e31..b58fed4 100755 --- a/quadraticpc/configuration.nix +++ b/quadraticpc/configuration.nix @@ -1,4 +1,3 @@ { - virtualisation.libvirtd.enable = true; networking.hostName = "quadraticpc"; } diff --git a/quadtop/configuration.nix b/quadtop/configuration.nix index ca661bc..9852e0f 100755 --- a/quadtop/configuration.nix +++ b/quadtop/configuration.nix @@ -17,6 +17,5 @@ }; services.xserver.videoDrivers = ["nvidia"]; - virtualisation.libvirtd.enable = true; networking.hostName = "quadtop"; }