diff --git a/flake.lock b/flake.lock index 746c7e6..621d017 100644 --- a/flake.lock +++ b/flake.lock @@ -722,16 +722,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1657907510, - "narHash": "sha256-4sH259ROLAp825Ir38AmnxEysu/xSz8P5j792rviiuA=", - "owner": "marsupialgutz", - "repo": "nixpkgs-nvidia-open", - "rev": "9c7c0cab3a2312efbff63516c982af9af2093333", + "lastModified": 1658017223, + "narHash": "sha256-mVtJv3x9/yUb8mCK1jkh+k1p4LYLx9GDpk8MMd3pUJM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "57bfdfae1747fa296400ab0558eb9f8ab5916118", "type": "github" }, "original": { - "owner": "marsupialgutz", - "repo": "nixpkgs-nvidia-open", + "owner": "nixos", + "repo": "nixpkgs", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 7549160..721400e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - nixpkgs.url = "github:marsupialgutz/nixpkgs-nvidia-open"; + nixpkgs.url = "github:nixos/nixpkgs"; nixvim.url = "github:pta2002/nixvim"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nur.url = "github:nix-community/NUR"; @@ -82,7 +82,6 @@ ./sys/nix/configuration.nix home-manager.nixosModule hyprland.nixosModules.default - {programs.hyprland.enable = true;} ]; }; wsl = lib.nixosSystem { diff --git a/pkgs/default.nix b/pkgs/default.nix index 3be2a2b..ad724e3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -42,6 +42,8 @@ in { ''; }); + hyprland-nvidia = inputs.hyprland.packages.${prev.system}.default.override { inherit (final) wlroots; }; + awesome = (prev.awesome.overrideAttrs (old: { inherit (sources.awesome) src pname version; diff --git a/sys/nix/configuration.nix b/sys/nix/configuration.nix index 6b62e0a..bb99ca5 100644 --- a/sys/nix/configuration.nix +++ b/sys/nix/configuration.nix @@ -68,6 +68,11 @@ }; }; + programs.hyprland = { + enable = true; + package = pkgs.hyprland-nvidia; + }; + environment.loginShellInit = '' dbus-update-activation-environment --systemd DISPLAY eval $(ssh-agent)