summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2023-08-31 00:13:19 +0200
committerDevin Finlinson <devin.finlinson@pm.me>2023-08-31 00:13:19 +0200
commit58d98f017b07187ece57c30e445afd2436dcebec (patch)
tree0fcd5d72c17ee599464345e5c9a7bdb4c59ff2ff
parent9a88a88fa98197be43817bd3db23b043e25b91ca (diff)
-rw-r--r--flake.lock2
-rw-r--r--flake.nix14
-rw-r--r--modules/hyprland.nix1
3 files changed, 9 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock
index 259420a..f3addfe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,7 @@
"home-manager": {
"inputs": {
"nixpkgs": [
- "nixpkgs"
+ "nixpkgs-unstable"
]
},
"locked": {
diff --git a/flake.nix b/flake.nix
index 47bb6a7..a4112d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,16 +4,17 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs.nixpkgs.follows = "nixpkgs-unstable";
};
- hyprland.url = "github:hyprwm/Hyprland";
};
- outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
+ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: {
nixosConfigurations = {
+
zenbook = nixpkgs.lib.nixosSystem {
modules = [
./machines/zenbook/configuration.nix
@@ -24,20 +25,19 @@
./modules/user-profiles/defin.nix
home-manager.nixosModules.home-manager {
+
# home-manager.useGlobalPkgs = true;
home-manager.useUserpackages = true;
home-manager.users.defin = import ./home-manager/home.nix;
+
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}
- hyprland.homeManagerModules.default
- {wayland.windowManager.hyprland.enable = true;}
- ./modules/hyprland.nix
-
./modules/bluetooth.nix
./modules/environment.nix
./modules/kde-connect.nix
+ ./modules/hyprland.nix
./modules/nix-common.nix
./modules/services.nix
./modules/sway.nix
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index d91811a..0540606 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -1,5 +1,6 @@
{ config, lib, ...}:
{
+ programs.hyprland.enable = true;
# Optional, hint electron apps to use wayland:
environment.sessionVariables.NIXOS_OZONE_WL = "1";
} \ No newline at end of file