From fd26bc69f08068f3bbac3c105e101b6a3e22eb36 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 26 Jun 2024 09:13:33 -0400 Subject: [PATCH] Remove bluebuild and more --- flake.lock | 263 +++++++--------------------- flake.nix | 1 - modules/common-desktop/gamemode.nix | 4 - modules/common-desktop/packages.nix | 7 +- quadtop/configuration.nix | 1 + 5 files changed, 64 insertions(+), 212 deletions(-) delete mode 100644 modules/common-desktop/gamemode.nix diff --git a/flake.lock b/flake.lock index a747414..8408d63 100644 --- a/flake.lock +++ b/flake.lock @@ -18,39 +18,6 @@ "type": "github" } }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, "base16-fish": { "flake": false, "locked": { @@ -147,34 +114,14 @@ "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": { - "lastModified": 1711290399, - "narHash": "sha256-e1xuHAHgeC8EU7cAIa3XfvzgI4Y7rzyTkAt9sBsgrfc=", + "lastModified": 1716813977, + "narHash": "sha256-8fabA8OY1n2OcJFbbE03+bMydVANSBrNGo8hkzhXxxU=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "33015314c12190230295cff61ced148e0f7ffe1c", + "rev": "8171c0578feb835ce66d49edba7429f46b7ac3f6", "type": "github" }, "original": { @@ -204,11 +151,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -217,38 +164,6 @@ "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": { @@ -268,30 +183,30 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1698794309, - "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "type": "github" }, "original": { "owner": "GNOME", - "ref": "45.1", + "ref": "46.1", "repo": "gnome-shell", "type": "github" } }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -307,11 +222,11 @@ ] }, "locked": { - "lastModified": 1706001011, - "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -323,14 +238,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711242788, - "narHash": "sha256-6m6hw6uoIIvoAMR5RLhw7kGfNu3Govof9vnPAzveUgI=", + "lastModified": 1716686274, + "narHash": "sha256-4JiRUWtoEMrfq38jG4O+NP6rcQIhKxEclnSkHvywnf0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "04028200841ec3b4ce163de4d136296d03123001", + "rev": "83a47c12d3493f7eb876250d0298d1566a965ce4", "type": "github" }, "original": { @@ -341,59 +256,39 @@ }, "nixpkgs": { "locked": { - "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" + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1716619601, + "narHash": "sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8=", "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=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", + "rev": "47e03a624662ce399e55c45a5f6da698fc72c797", "type": "github" }, "original": { @@ -403,13 +298,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -419,13 +314,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { @@ -443,11 +338,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711459416, - "narHash": "sha256-JdfYz5xOg2RPBo4S8+ykdNBnAguoI+XhZ6g3QAXuw9k=", + "lastModified": 1717098144, + "narHash": "sha256-Iw8zvW0LF77uqA4fshJq0xcUcaAAJkwQyc2+/WaAP5I=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "bba0e2e52c058c7dba0656f4a31e9db68eb62197", + "rev": "eb2e0c40e4f5c651d2bc2b24cd471214647c708a", "type": "github" }, "original": { @@ -458,43 +353,18 @@ }, "root": { "inputs": { - "bluebuild": "bluebuild", "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "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", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -504,14 +374,14 @@ "flake-compat": "flake-compat", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1711224130, - "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=", + "lastModified": 1716895458, + "narHash": "sha256-W9Y/+K4L7JcF5xcXO4MVGQk/0DgzHrp/IjlHyLeYExY=", "owner": "danth", "repo": "stylix", - "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403", + "rev": "5234b3d467aa803ad8d3fe898ef5673246045984", "type": "github" }, "original": { @@ -520,21 +390,6 @@ "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, @@ -557,11 +412,11 @@ ] }, "locked": { - "lastModified": 1702396227, - "narHash": "sha256-JTgwZK6m3Lt1LrjgWdl5+9RyDlAI9mzH3QHFMY8RwVY=", + "lastModified": 1716795369, + "narHash": "sha256-EEeIFSlwE/BaGuP8B+3CB1wtKjy/rGKiOpvNDVGcgcU=", "owner": "viperML", "repo": "wrapper-manager", - "rev": "3a4c510ffb9f01fc7cab5e23f5ae818d72a66e1a", + "rev": "1ba792f455c21644ec95f4dd9df202b9981c272b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f9881bc..bcf577d 100755 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ 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/gamemode.nix b/modules/common-desktop/gamemode.nix deleted file mode 100644 index fa68294..0000000 --- a/modules/common-desktop/gamemode.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - programs.gamemode.enable = true; - environment.sessionVariables.GAMEMODERUNEXEC = "nvidia-offload"; -} diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index 4fda71c..9448034 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -3,6 +3,7 @@ inputs, ... }: { + programs.gamemode.enable = true; environment.systemPackages = with pkgs; [ fd tldr @@ -10,15 +11,16 @@ gimp heroic aspell + muzika fractal killall ripgrep + foliate inkscape r2modman pciutils - monophony alejandra - nodejs_21 + nodejs_22 impression libreoffice wl-clipboard @@ -29,7 +31,6 @@ 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/quadtop/configuration.nix b/quadtop/configuration.nix index 9852e0f..81f44a8 100755 --- a/quadtop/configuration.nix +++ b/quadtop/configuration.nix @@ -16,6 +16,7 @@ dynamicBoost.enable = true; }; + environment.sessionVariables.GAMEMODERUNEXEC = "nvidia-offload"; services.xserver.videoDrivers = ["nvidia"]; networking.hostName = "quadtop"; }