From 3eaf0f8d6615d12ea44daf8f7be0b1ea30f01e23 Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Mon, 23 Oct 2023 17:59:48 -0700 Subject: [PATCH] added hyperland --- flake.lock | 167 +++++--------------------------------- hosts/configuration.nix | 4 +- hosts/desktop/default.nix | 5 ++ modules/hyprland.nix | 59 ++++++++------ 4 files changed, 63 insertions(+), 172 deletions(-) diff --git a/flake.lock b/flake.lock index 5795f8a..fcf0536 100644 --- a/flake.lock +++ b/flake.lock @@ -41,7 +41,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -59,7 +59,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -77,7 +77,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -135,56 +135,9 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "systems": "systems", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1698105239, - "narHash": "sha256-SVgOhOe04idYyisBLIbHVGQknaNSUTFavF1rlsF3te4=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "616ff343b75424a835e5c8ada929943284913910", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "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" - } - }, "kmonad": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "dir": "nix", @@ -204,7 +157,7 @@ }, "nicks_nextcloud_integrations": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -223,16 +176,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1653326962, + "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "41cc1d5d9584103be4108c1815c350e07c807036", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -270,22 +223,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1653326962, - "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "41cc1d5d9584103be4108c1815c350e07c807036", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1692447944, "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", @@ -301,7 +238,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -317,7 +254,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -333,7 +270,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -353,7 +290,7 @@ "inputs": { "beautysh": "beautysh", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -425,10 +362,9 @@ "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "kmonad": "kmonad", "nicks_nextcloud_integrations": "nicks_nextcloud_integrations", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim" } @@ -436,7 +372,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1692497375, @@ -454,16 +390,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -497,21 +433,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1678901627, @@ -526,54 +447,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/configuration.nix b/hosts/configuration.nix index cae9383..d4c4912 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -22,6 +22,7 @@ XDG_STATE_HOME = "$HOME/.local/state"; }; + programs.hyprland.enable = true; services.xserver = { enable = true; @@ -38,8 +39,7 @@ ]; }; - programs.hyprland.enable = true; - displayManager.sddm.enable = true; + displayManager.sddm.enable = true; libinput = { enable = true; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 0720398..044fd7c 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -44,9 +44,14 @@ # Optionally, you may need to select the appropriate driver version for your specific GPU. hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + hardware.nvidia.modesetting.enable = true; hardware.bluetooth.enable = true; + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + }; + time.hardwareClockInLocalTime = true; boot.loader = { diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 438c608..9e121a0 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -4,34 +4,47 @@ let in { + + home.packages = with pkgs; [ + swww + ]; - wayland.windowManager.hyprland = { - enable = true; - package = pkgs.hyprland; - # Whether to enable XWayland - xwayland.enable = true; + wayland.windowManager.hyprland = { + enable = true; + package = pkgs.hyprland; + # Whether to enable XWayland + xwayland.enable = true; - # Optional - # Whether to enable hyprland-session.target on hyprland startup - systemd.enable = true; - # Whether to enable patching wlroots for better Nvidia support - enableNvidiaPatches = true; + # Optional + # Whether to enable hyprland-session.target on hyprland startup + systemd.enable = true; + # Whether to enable patching wlroots for better Nvidia support + enableNvidiaPatches = true; - settings = { - decoration = { - shadow_offset = "0 5"; - "col.shadow" = "rgba(00000099)"; - }; + settings = { + exec-once = [ + "${pkgs.swww}/bin/swww init & sleep 0.5 & ${pkgs.swww}/bin/swww /home/nixolas/Downloads/RecountERD.png" + ]; - "$mod" = "SUPER"; - - bindm = [ - # mouse movements - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; + decoration = { + shadow_offset = "0 5"; + "col.shadow" = "rgba(00000099)"; }; + + "$mod" = "SUPER"; + + bindm = [ + # mouse movements + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + "$mod ALT, mouse:272, resizewindow" + ]; + + bind = [ + "$mod, RETURN, exec, wezterm start --always-new-process" + # "$mod, Q, exec, firefox" + ]; }; + }; }