diff --git a/flake.lock b/flake.lock index 4029689..795a617 100644 --- a/flake.lock +++ b/flake.lock @@ -81,16 +81,16 @@ ] }, "locked": { - "lastModified": 1679738842, - "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=", + "lastModified": 1680249941, + "narHash": "sha256-7Ylr0NAr8msd3YVaYBw6uyJIRbtOq5l6aLrmrYA5qTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83110c259889230b324bb2d35bef78bf5f214a1f", + "rev": "67b97020b6970d39b4126a7870063d11337ecb80", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -111,6 +111,48 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "nixpkgs": "nixpkgs", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1680312172, + "narHash": "sha256-q4FL99ZuV04Azc8acchAVsaLqlRVdkkF8AyZ0dJPgws=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "2b4d96e0efe4ce4a13b8cdef0d1ff5981f674542", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671839510, + "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "linkal": { "inputs": { "flake-utils": [ @@ -137,7 +179,7 @@ }, "nixos-apple-silicon": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -155,6 +197,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1679172431, + "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1679172431, "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", @@ -170,7 +228,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1680122840, "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=", @@ -192,9 +250,10 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "homepage": "homepage", + "hyprland": "hyprland", "linkal": "linkal", "nixos-apple-silicon": "nixos-apple-silicon", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", "unstable": "unstable" @@ -282,6 +341,49 @@ "repo": "nixpkgs", "type": "github" } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1679340088, + "narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673116118, + "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6bbc708..b764fbf 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "unstable"; inputs.utils.follows = "flake-utils"; }; @@ -50,6 +50,10 @@ url = "github:tpwrules/nixos-apple-silicon"; }; + hyprland = { + url = "github:hyprwm/Hyprland"; + }; + }; diff --git a/lib/default.nix b/lib/default.nix index 5a474e7..8c2e11b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,6 +21,7 @@ in host-config inputs.home-manager.nixosModules.home-manager inputs.simple-nixos-mailserver.nixosModule + inputs.hyprland.nixosModules.default { home-manager.useGlobalPkgs = true; nixpkgs.overlays = [ diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix index c31ac98..ac8e7f8 100644 --- a/machines/macintosh/default.nix +++ b/machines/macintosh/default.nix @@ -28,6 +28,8 @@ hardware.asahi.pkgs = lib.mkDefault pkgs; + programs.hyprland.enable = true; + programs.fish.shellInit = '' diff --git a/modules/hmgr/default.nix b/modules/hmgr/default.nix index 1935663..ceccea6 100644 --- a/modules/hmgr/default.nix +++ b/modules/hmgr/default.nix @@ -14,7 +14,7 @@ with lib; lib.mapAttrs (name: value: { - imports = with builtins; (map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules))); + imports = with builtins; (map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules))) ++ [ inputs.hyprland.homeManagerModules.default ]; home.username = "${name}"; home.homeDirectory = "/home/${name}"; home.stateVersion = "21.05";