diff --git a/flake.nix b/flake.nix index 40b13c7..7ae76a7 100644 --- a/flake.nix +++ b/flake.nix @@ -44,13 +44,7 @@ }; lanzaboote = { url = "github:nix-community/lanzaboote"; - # inputs.nixpkgs.follows = "nixpkgs"; # leads to recompilations - }; - hyprland = { - type = "git"; - url = "https://github.com/hyprwm/Hyprland"; - submodules = true; - # inputs.nixpkgs.follows = "nixpkgs"; # leads to recompilations + # inputs.nixpkgs.follows = "nixpkgs"; # leads to many recompilations }; nixos-hardware = { url = "github:nixos/nixos-hardware"; @@ -134,11 +128,9 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "https://hyprland.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; diff --git a/home/default.nix b/home/default.nix index 8b2eaec..bc6fae9 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,7 +2,6 @@ config.home.stateVersion = "24.05"; imports = [ - inputs.hyprland.homeManagerModules.default inputs.catppuccin.homeManagerModules.catppuccin ./applications diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix index ed1e8ed..0f33bd4 100644 --- a/home/desktop/hyprland.nix +++ b/home/desktop/hyprland.nix @@ -5,7 +5,6 @@ lib, ... }: let - hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland; cursor = config.catppuccin.pointerCursor; in { wayland.windowManager.hyprland = { @@ -23,7 +22,7 @@ in { "${lib.getExe pkgs.thunderbird}" "${pkgs.wl-clipboard}/bin/wl-paste --watch ${lib.getExe pkgs.cliphist} store" "${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/ diff --git a/home/desktop/swayidle.nix b/home/desktop/swayidle.nix index d4273c3..04999e9 100644 --- a/home/desktop/swayidle.nix +++ b/home/desktop/swayidle.nix @@ -1,18 +1,15 @@ { - inputs, pkgs, lib, ... -}: let - hyprland_pkg = inputs.hyprland.packages."${pkgs.system}".hyprland; -in { +}: { services.swayidle = { enable = true; systemdTarget = "hyprland-session.target"; events = [ { event = "after-resume"; - command = "${hyprland_pkg}/bin/hyprctl dispatch dpms on"; + command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; } { event = "before-sleep"; @@ -26,7 +23,7 @@ in { } { timeout = 150; - command = "${hyprland_pkg}/bin/hyprctl dispatch dpms off"; + command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; } { timeout = 300; diff --git a/hosts/aurum/services/greetd/default.nix b/hosts/aurum/services/greetd/default.nix index 8867551..f0b67ca 100644 --- a/hosts/aurum/services/greetd/default.nix +++ b/hosts/aurum/services/greetd/default.nix @@ -1,16 +1,10 @@ -{ - inputs, - pkgs, - ... -}: let - hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland; -in { +{pkgs, ...}: { services.greetd = { enable = true; settings = { 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"; }; }; diff --git a/hosts/silicium/services/greetd/default.nix b/hosts/silicium/services/greetd/default.nix index 8867551..f0b67ca 100644 --- a/hosts/silicium/services/greetd/default.nix +++ b/hosts/silicium/services/greetd/default.nix @@ -1,16 +1,10 @@ -{ - inputs, - pkgs, - ... -}: let - hyprland = inputs.hyprland.packages."${pkgs.system}".hyprland; -in { +{pkgs, ...}: { services.greetd = { enable = true; settings = { 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"; }; };