From 812974e7c8b8e27d3fefbd31ef7338769416ee45 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Sun, 14 Jan 2024 16:22:16 +0000 Subject: [PATCH] Updates --- flake.lock | 183 ++++----------------- flake.nix | 25 --- hosts/common/graphical/default.nix | 2 + users/configs/desktop/hyprland/default.nix | 6 +- 4 files changed, 43 insertions(+), 173 deletions(-) diff --git a/flake.lock b/flake.lock index 54e68bd..e70caea 100644 --- a/flake.lock +++ b/flake.lock @@ -6,14 +6,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1703107199, - "narHash": "sha256-Xx9Kkoqye520mkEWTZx/sKQRJsIeWOuwoh568uwHpNg=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "17090d105af1b9f941109c1e12d6e3a596657f97", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -30,11 +31,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -54,11 +55,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703066966, - "narHash": "sha256-MbX0XYOEvAuXwi80emHKJsjo1IGQZhoKKnEp2uzgNx4=", + "lastModified": 1705094340, + "narHash": "sha256-T7d1d5PQXqDbZUnKjRTBf26yTCMSttDQULM8jU4jiro=", "owner": "cachix", "repo": "devenv", - "rev": "405a4c6a3fecfd2a7fb37cc13f4e760658e522e6", + "rev": "96b49eb381779bdd4f41ca176a762867c31db5da", "type": "github" }, "original": { @@ -85,7 +86,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -103,7 +104,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -179,11 +180,11 @@ ] }, "locked": { - "lastModified": 1703095146, - "narHash": "sha256-eenN+HOlBZ4rNZVSEO+MVhjxQ29RrXyTYUM9gJArf6c=", + "lastModified": 1704991055, + "narHash": "sha256-4vy42iud/wmouYBRquwSEpc+aJC7RLb4/vQeyzXiHUI=", "owner": "tailscale", "repo": "golink", - "rev": "311ede68efe8c86cbbab596a2e02c028564d2d92", + "rev": "5ee5a81391769cc571a7e92b1d0cdc9f9d86eeb0", "type": "github" }, "original": { @@ -200,11 +201,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -220,11 +221,11 @@ ] }, "locked": { - "lastModified": 1703178811, - "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=", + "lastModified": 1705169127, + "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae", + "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8", "type": "github" }, "original": { @@ -234,53 +235,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "systems": "systems_3", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1703194032, - "narHash": "sha256-ynsyO+BacfysxWm3R9owGPZfsClLXWEXNEfqMD6mBic=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "bd952dcef2ead3b0b7e2d730930a3fc528813ee0", - "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" - } - }, "i3utils": { "inputs": { "flake-utils": "flake-utils_3", @@ -366,18 +320,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-regression": { @@ -412,21 +365,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -442,11 +380,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", "type": "github" }, "original": { @@ -461,10 +399,9 @@ "devenv": "devenv", "golink": "golink", "home-manager": "home-manager_2", - "hyprland": "hyprland", "i3utils": "i3utils", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -499,64 +436,16 @@ }, "systems_3": { "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", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1701368958, - "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1702334919, - "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index a1dd36d..ca87845 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; - i3utils.url = "git+https://git.sr.ht/~dpatterbee/i3utils?ref=main"; i3utils.inputs.nixpkgs.follows = "nixpkgs"; @@ -31,7 +29,6 @@ devenv, golink, home-manager, - hyprland, i3utils, nixgl, ... @@ -44,7 +41,6 @@ config.allowUnfree = true; overlays = [ golink.overlay - hyprland.overlays.default nixgl.overlay ]; config.permittedInsecurePackages = [ @@ -53,17 +49,6 @@ }) // { i3utils = i3utils.packages.${system}.default; - hyprland = hyprland.packages."x86_64-linux".default.overrideAttrs (finalAttrs: previousAttrs: { - buildInputs = previousAttrs.buildInputs ++ [pkgs.makeWrapper]; - postInstall = '' - ls -lar $out - wrapProgram $out/bin/Hyprland \ - --set LIBVA_DRIVER_NAME nvidia \ - --set XDG_SESSION_TYPE wayland \ - --set __GLX_VENDOR_LIBRARY_NAME nvidia \ - --set WLR_NO_HARDWARE_CURSORS 1 - ''; - }); }; lib = nixpkgs.lib; @@ -92,13 +77,6 @@ agenix.nixosModules.default - hyprland.nixosModules.default - { - programs.hyprland = { - enable = !headless; - }; - } - golink.nixosModules.default home-manager.nixosModules.home-manager @@ -110,9 +88,6 @@ inherit hostname; inherit headless; }; - sharedModules = [ - hyprland.homeManagerModules.default - ]; }; } ]; diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index 08bafa9..874ea79 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -49,6 +49,8 @@ }; programs = { + hyprland.enable = true; + steam = { enable = true; }; diff --git a/users/configs/desktop/hyprland/default.nix b/users/configs/desktop/hyprland/default.nix index 3b35d25..2329238 100644 --- a/users/configs/desktop/hyprland/default.nix +++ b/users/configs/desktop/hyprland/default.nix @@ -37,10 +37,14 @@ in { xwayland = { enable = true; }; - enableNvidiaPatches = hostname == "elderbug"; extraConfig = (builtins.readFile ./${hostname}.conf) + '' + env = LIBVA_DRIVER_NAME,nvidia + env = XDG_SESSION_TYPE,wayland + env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = WLR_NO_HARDWARE_CURSORS,1 + # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch