diff options
| -rw-r--r-- | flake.lock | 201 | ||||
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | home-manager/home.nix | 8 | ||||
| -rw-r--r-- | modules/nixos/hyprland.nix | 5 |
4 files changed, 203 insertions, 23 deletions
@@ -99,11 +99,11 @@ "catppuccin-starship": { "flake": false, "locked": { - "lastModified": 1689246850, - "narHash": "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=", + "lastModified": 1716565281, + "narHash": "sha256-KzXO4dqpufxTew064ZLp3zKIXBwbF8Bi+I0Xa63j/lI=", "owner": "catppuccin", "repo": "starship", - "rev": "5629d2356f62a9f2f8efad3ff37476c19969bd4f", + "rev": "ca2fb0600730fd3958a2cb4d4ca97c401877b365", "type": "github" }, "original": { @@ -133,6 +133,137 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1716576411, + "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "hyprcursor": "hyprcursor", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "systems": "systems", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1716583868, + "narHash": "sha256-ob6ep5LY0RxjdKYROYKcAxAutT02x1Kgbt/QPZErs7E=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "2ff95bba3fec58b9f1a127fe72dda84b1420a7af", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ], + "systems": [ + "hyprland", + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -190,11 +321,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716218643, - "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -221,11 +352,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -238,11 +369,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1716143588, - "narHash": "sha256-X/epUJkS3qppjjmmMZ+gfK8DNkt6brZQocbFyKXzVTA=", + "lastModified": 1716399661, + "narHash": "sha256-dFEr4tntEPMiwrBYeyWQbkkqu5xsXMYyEj7mJ3Kp7yw=", "owner": "nushell", "repo": "nu_scripts", - "rev": "66c76a9dbd41ea4fb07fde0eb8474a3ae941db12", + "rev": "407a313bbb13bd5ce2de16768ab2ebec7c111657", "type": "github" }, "original": { @@ -260,6 +391,7 @@ "catppuccin-hyprland": "catppuccin-hyprland", "catppuccin-starship": "catppuccin-starship", "home-manager": "home-manager", + "hyprland": "hyprland", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", @@ -268,6 +400,21 @@ "wallpapers": "wallpapers" } }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wallpapers": { "flake": false, "locked": { @@ -283,6 +430,36 @@ "repo": "wallpapers", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", @@ -14,11 +14,10 @@ }; # modern window compositor - # hyprland.url = "github:hyprwm/Hyprland"; - # hyprland = { - # url = "github:hyprwm/Hyprland"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; nix-colors.url = "github:misterio77/nix-colors"; @@ -135,8 +134,9 @@ outputs = inputs@{ self, ...}: with inputs; { packages.x86_64-linux = { + # packages.x86_64-linux = { ISO = nixos-generators.nixosGenerate { - system = "x86_64-linux"; + system = "aarch64-linux"; modules = [ ./modules/users/defin.nix ./modules/nixos/system-packages.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index 9928e31..f07a960 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, hyprland-plugins, ... }: # let # home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; # unstable = import <nixpkgs-unstable>{}; @@ -157,9 +157,9 @@ }; # wayland.windowManager.hyprland = { # enable = true; - # plugins = [ - # hyprland-plugins.packages.${pkgs.system}.hyprcursor #hyprcursor is a built-in not a plugin - # ]; + # # plugins = [ + # # hyprland-plugins.packages.${pkgs.system}.hyprcursor #hyprcursor is a built-in not a plugin + # # ]; # }; programs = { diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index c6c97ed..1a0c42e 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -32,7 +32,10 @@ programs = { hyprland = { enable = true; - # package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; + # package = with inputs.nixpkgs-unstable.pkgs; [ + # hyprland + # ]; # nvidiaPatches = true; }; |