diff --git a/flake.nix b/flake.nix index 86972900b..f195a8a38 100755 --- a/flake.nix +++ b/flake.nix @@ -383,6 +383,7 @@ ./modules/nixos/desktop.nix #./modules/nixos/gnome.nix ./modules/nixos/plasma6.nix + ./modules/nixos/hyprland.nix ./modules/nixos/tailscale.nix ./profiles/personal.nix attic.nixosModules.atticd diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 857957d86..ff7debd85 100755 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -40,7 +40,7 @@ in pkg, file ? "${pkg.pname}.plugin.zsh", }: - rec { + { name = pkg.pname; src = pkg.src; inherit file; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix new file mode 100644 index 000000000..292339151 --- /dev/null +++ b/modules/nixos/hyprland.nix @@ -0,0 +1,5 @@ +{ ... }: +{ + programs.hyprland.enable = true; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; +} diff --git a/profiles/home-manager/personal.nix b/profiles/home-manager/personal.nix index 7d8541c01..9a10d2919 100755 --- a/profiles/home-manager/personal.nix +++ b/profiles/home-manager/personal.nix @@ -1,3 +1,4 @@ +# TODO: move this into modules/home-manager/git.nix { ... }: { programs.git = { diff --git a/profiles/personal.nix b/profiles/personal.nix index 1db4b081b..8c49249ac 100755 --- a/profiles/personal.nix +++ b/profiles/personal.nix @@ -1,3 +1,4 @@ +# TODO: move this into modules/home-manager/git.nix { ... }: { user.name = "bri";