diff --git a/flake.lock b/flake.lock index 142317f4..ef13ca08 100644 --- a/flake.lock +++ b/flake.lock @@ -61,6 +61,21 @@ "type": "github" } }, + "flake-compat": { + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -118,6 +133,28 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-root": { "locked": { "lastModified": 1713493429, @@ -133,6 +170,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -169,6 +224,25 @@ "type": "github" } }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1724587851, + "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": [ @@ -191,6 +265,27 @@ "type": "github" } }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts_4", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1723372011, + "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "8802412b8747633e9d80639897e4d58fa6290909", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", @@ -213,6 +308,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixd": { "inputs": { "flake-parts": "flake-parts_2", @@ -364,19 +481,39 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-lib_3": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-wayland": { + "inputs": { + "flake-compat": "flake-compat", + "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1725039046, + "narHash": "sha256-B5Ypgx4cO0syxPyUsHTIxVFT8xChPj494WJ5uIOefDM=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "90cf4eb6d71f1ee8124fd57535a3569048771b33", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", "type": "github" } }, @@ -412,6 +549,38 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nurpkgs": { "locked": { "lastModified": 1724464296, @@ -439,7 +608,7 @@ "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-wayland": "nixpkgs-wayland", "nurpkgs": "nurpkgs", "sops-nix": "sops-nix" } @@ -499,6 +668,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -541,6 +725,28 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "umu": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index f053669b..0dbacb87 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { # NixOS related inputs nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix = { @@ -19,6 +18,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + nix-gaming = { url = "github:fufexan/nix-gaming"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos-config/hosts/yui/nvidia/default.nix b/nixos-config/hosts/yui/nvidia/default.nix index d26380f5..dc40c879 100644 --- a/nixos-config/hosts/yui/nvidia/default.nix +++ b/nixos-config/hosts/yui/nvidia/default.nix @@ -1,7 +1,4 @@ { pkgs, flake-inputs, config, lib, ... }: -let - unstable = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; -in { imports = [ ./vaapi.nix ]; @@ -32,39 +29,9 @@ in }; }; - nixpkgs.overlays = [ - (final: _prev: { - sway-unwrapped = unstable.sway-unwrapped.overrideAttrs (attrs: { - version = "0-unstable-2024-08-28"; - src = final.fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = "980a4e02113789d0cca94aa023557c6f6e87ec73"; - hash = "sha256-qciZeQghlLV5aMuOnex3LvFU9vTa941RMlUkdvj0QTU="; - }; - buildInputs = attrs.buildInputs ++ [ final.wlroots ]; - mesonFlags = - let - inherit (lib.strings) mesonEnable mesonOption; - in - [ - (mesonOption "sd-bus-provider" "libsystemd") - (mesonEnable "tray" attrs.trayEnabled) - ]; - }); - - wlroots = unstable.wlroots.overrideAttrs (_attrs: { - version = "0-unstable-2024-08-29"; - src = final.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = "beb9a9ad0a38867154b7606911c33ffa5ecf759f"; - hash = "sha256-ZlNFxwj3c5zKiSfokA27zhJ+Yar8cma4fj6N/ulI0VM="; - }; - }); - }) - ]; + programs.sway.package = pkgs.sway.override { + inherit (flake-inputs.nixpkgs-wayland.packages.${pkgs.system}) sway-unwrapped; + }; boot = { kernelParams = [