🔥 (home) stop using hyprland main, stick to nixpkgs unstable

This commit is contained in:
Laureηt 2024-07-27 16:02:56 +02:00
parent 9dce54aace
commit 5b97859c93
Signed by: Laurent
SSH key fingerprint: SHA256:pb5NrYg80So5z9hmqQFPmp//sgr+DFeJkKhmGyU2NLk
6 changed files with 9 additions and 34 deletions

View file

@ -44,13 +44,7 @@
}; };
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote"; url = "github:nix-community/lanzaboote";
# inputs.nixpkgs.follows = "nixpkgs"; # leads to recompilations # inputs.nixpkgs.follows = "nixpkgs"; # leads to many recompilations
};
hyprland = {
type = "git";
url = "https://github.com/hyprwm/Hyprland";
submodules = true;
# inputs.nixpkgs.follows = "nixpkgs"; # leads to recompilations
}; };
nixos-hardware = { nixos-hardware = {
url = "github:nixos/nixos-hardware"; url = "github:nixos/nixos-hardware";
@ -134,11 +128,9 @@
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://hyprland.cachix.org"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
]; ];
}; };

View file

@ -2,7 +2,6 @@
config.home.stateVersion = "24.05"; config.home.stateVersion = "24.05";
imports = [ imports = [
inputs.hyprland.homeManagerModules.default
inputs.catppuccin.homeManagerModules.catppuccin inputs.catppuccin.homeManagerModules.catppuccin
./applications ./applications

View file

@ -5,7 +5,6 @@
lib, lib,
... ...
}: let }: let
hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland;
cursor = config.catppuccin.pointerCursor; cursor = config.catppuccin.pointerCursor;
in { in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@ -23,7 +22,7 @@ in {
"${lib.getExe pkgs.thunderbird}" "${lib.getExe pkgs.thunderbird}"
"${pkgs.wl-clipboard}/bin/wl-paste --watch ${lib.getExe pkgs.cliphist} store" "${pkgs.wl-clipboard}/bin/wl-paste --watch ${lib.getExe pkgs.cliphist} store"
"${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon --start --components=secrets" "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon --start --components=secrets"
"${hyprland}/bin/hyprctl setcursor catppuccin-${cursor.flavor}-${cursor.accent}-cursors 24" # FIXME: shouldn't be necessary "${pkgs.hyprland}/bin/hyprctl setcursor catppuccin-${cursor.flavor}-${cursor.accent}-cursors 24" # FIXME: shouldn't be necessary
]; ];
# https://wiki.hyprland.org/Configuring/Monitors/ # https://wiki.hyprland.org/Configuring/Monitors/

View file

@ -1,18 +1,15 @@
{ {
inputs,
pkgs, pkgs,
lib, lib,
... ...
}: let }: {
hyprland_pkg = inputs.hyprland.packages."${pkgs.system}".hyprland;
in {
services.swayidle = { services.swayidle = {
enable = true; enable = true;
systemdTarget = "hyprland-session.target"; systemdTarget = "hyprland-session.target";
events = [ events = [
{ {
event = "after-resume"; event = "after-resume";
command = "${hyprland_pkg}/bin/hyprctl dispatch dpms on"; command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
} }
{ {
event = "before-sleep"; event = "before-sleep";
@ -26,7 +23,7 @@ in {
} }
{ {
timeout = 150; timeout = 150;
command = "${hyprland_pkg}/bin/hyprctl dispatch dpms off"; command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";
} }
{ {
timeout = 300; timeout = 300;

View file

@ -1,16 +1,10 @@
{ {pkgs, ...}: {
inputs,
pkgs,
...
}: let
hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland;
in {
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${hyprland}/bin/Hyprland"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.hyprland}/bin/Hyprland";
user = "greeter"; user = "greeter";
}; };
}; };

View file

@ -1,16 +1,10 @@
{ {pkgs, ...}: {
inputs,
pkgs,
...
}: let
hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland;
in {
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${hyprland}/bin/Hyprland"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.hyprland}/bin/Hyprland";
user = "greeter"; user = "greeter";
}; };
}; };