From 888573446c71d62ea0e0aeb7fa06bd747349e232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Mon, 29 May 2023 00:12:48 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20move=20hyprland=20module=20down?= =?UTF-8?q?=20the=20tree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 7 ++----- hosts/neodymium/configuration.nix | 5 +++-- hosts/neodymium/home/default.nix | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index e68b4ec..c124ea5 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; outputs = { nixpkgs, flake-utils, lanzaboote, agenix, home-manager - , nixos-hardware, hyprland, ... }: + , nixos-hardware, ... }@attrs: (flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -48,13 +48,10 @@ # neodymium laptop nixosConfigurations.neodymium = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = attrs; modules = [ ./hosts/neodymium/configuration.nix home-manager.nixosModules.home-manager - { - home-manager.users.laurent.imports = - [ hyprland.homeManagerModules.default ]; - } agenix.nixosModules.default lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.common-cpu-amd diff --git a/hosts/neodymium/configuration.nix b/hosts/neodymium/configuration.nix index 5dff7a9..f8a8a09 100644 --- a/hosts/neodymium/configuration.nix +++ b/hosts/neodymium/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, hyprland, ... }: { imports = [ ./hardware-configuration.nix ./system ]; # shorter timeout for systemd services @@ -23,7 +23,7 @@ # disable user creation/deletion mutableUsers = false; - # damn, who's this handsome guy? + # absolute gigachad users.laurent = { isNormalUser = true; initialPassword = "laurent"; @@ -36,6 +36,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; + extraSpecialArgs = { inherit hyprland; }; users.laurent = ./home; }; diff --git a/hosts/neodymium/home/default.nix b/hosts/neodymium/home/default.nix index 2125662..f94c0c7 100644 --- a/hosts/neodymium/home/default.nix +++ b/hosts/neodymium/home/default.nix @@ -1,6 +1,8 @@ -{ ... }: { +{ hyprland, ... }: { config.home.stateVersion = "22.11"; imports = [ + hyprland.homeManagerModules.default + ./packages.nix ./alacritty