fix: get path to hyprland from flake directly
This commit is contained in:
parent
60a5a9958c
commit
f19b87bd53
2 changed files with 21 additions and 14 deletions
|
@ -1,5 +1,12 @@
|
|||
{ config, ... }:
|
||||
{ config, ... }: let
|
||||
flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
|
||||
|
||||
hyprland = (import flake-compat {
|
||||
# I use release version for plugin support
|
||||
src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/v0.26.0.tar.gz";
|
||||
}).defaultNix;
|
||||
|
||||
in
|
||||
{
|
||||
imports =
|
||||
[
|
||||
|
@ -19,15 +26,7 @@
|
|||
home-manager.useGlobalPkgs = true;
|
||||
programs.dconf.enable = true;
|
||||
|
||||
home-manager.users.matt = { config, pkgs, lib, ... }: let
|
||||
flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
|
||||
|
||||
hyprland = (import flake-compat {
|
||||
# I use release version for plugin support
|
||||
src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/v0.26.0.tar.gz";
|
||||
}).defaultNix;
|
||||
|
||||
in {
|
||||
home-manager.users.matt = { config, pkgs, lib, ... }: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar.overrideAttrs (oldAttrs: {
|
||||
|
@ -148,7 +147,7 @@
|
|||
|
||||
home.sessionVariables = {
|
||||
XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:\$XDG_DATA_DIRS";
|
||||
SUDO_ASKPASS= "${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname}";
|
||||
SUDO_ASKPASS = "${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname}";
|
||||
};
|
||||
|
||||
imports = [
|
||||
|
@ -173,4 +172,11 @@
|
|||
|
||||
home.stateVersion = "23.05";
|
||||
};
|
||||
|
||||
services.xserver.displayManager = {
|
||||
sessionPackages = [
|
||||
(hyprland).packages.x86_64-linux.default
|
||||
];
|
||||
defaultSession = "hyprland";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
}; # gnome session needed to fix bugs
|
||||
sessionPackages = [ pkgs.hyprland pkgs.gnome.gnome-session.sessions ];
|
||||
defaultSession = "hyprland";
|
||||
}; # gnome session needed to fix bugs
|
||||
sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
|
||||
# See ./cfg/home-manager.nix
|
||||
#defaultSession = "hyprland";
|
||||
#autoLogin = { # logs out after a minute
|
||||
# enable = true;
|
||||
# user = "matt";
|
||||
|
|
Loading…
Reference in a new issue