From 88a152bb84d2510ad26e5833711a4381d3145c6b Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 27 Jul 2024 19:20:32 +0200 Subject: [PATCH] hyprland revert --- flake.lock | 55 ++++++++++++---------------------- flake.nix | 39 ------------------------ home/core/gui/hypr/default.nix | 5 +--- nixos/hardware/cnix.nix | 12 +++++++- 4 files changed, 31 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 152f68c1..4f8ac5a9 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1722003330, - "narHash": "sha256-PaHG6to4NcCFvzOdmHGUs20QXe7roaHf3k3heaPCt/I=", + "lastModified": 1722083308, + "narHash": "sha256-71YP9f+M3lhOD6oDrB34p0ATmL6OVg7Ow2atZgFughE=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "0a2d58c778d58d43e308f0a68fd07591068fdd32", + "rev": "5c3131cb8b7d51b13be2e2ad94aa1b69eb50700e", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "hardware": { "locked": { - "lastModified": 1721911538, - "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", + "lastModified": 1722017959, + "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", + "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1721996913, - "narHash": "sha256-eqbhEBObarS6WsI0J1PVACQ8fXeq9OmSS0+iXBegoOI=", + "lastModified": 1722067813, + "narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc2b96acda50229bc99925dde5c8e561e90b0b00", + "rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722096947, - "narHash": "sha256-uMt45fyadfOsfvxd9hGVle/ebsL5Zmu0E6w1th7TEi0=", + "lastModified": 1722099103, + "narHash": "sha256-2Ebhf5kYsszJV/05KdlE5R0S8w/fsgB8VBvjnlbKl+c=", "ref": "refs/heads/main", - "rev": "ae638d997d45e6183adafc6942b1b8fcc70f8928", - "revCount": 4996, + "rev": "10e8af00d61ee2d647af82712c4070eaec875cdb", + "revCount": 4998, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -703,11 +703,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1722098849, + "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", "type": "github" }, "original": { @@ -961,22 +961,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1717794163, @@ -1040,11 +1024,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721946885, - "narHash": "sha256-b90iLj3d9tLz5/M8dDnhD5j9vAWjpoNn5WhCLnIwK/g=", + "lastModified": 1722016645, + "narHash": "sha256-YQA4oenJwjWVzX+we6Zzv08im5q2n7dVhJ12Nw8wQio=", "owner": "nix-community", "repo": "nixvim", - "rev": "47b6c4804f69556dc22aa2a2e64721f216b69090", + "rev": "162ae6354bbf2af5c33b09aa90e9d8d11f14462e", "type": "github" }, "original": { @@ -1114,7 +1098,6 @@ "hyprpaper": "hyprpaper", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "systems": "systems_5", "wezterm": "wezterm" diff --git a/flake.nix b/flake.nix index 7264b8d6..4d4040f9 100644 --- a/flake.nix +++ b/flake.nix @@ -43,45 +43,6 @@ wezterm = { url = "github:wez/wezterm?dir=nix"; }; - # hyprwm - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - - hypridle = { - url = "github:hyprwm/hypridle"; - inputs = { - hyprlang.follows = "hyprland/hyprlang"; - nixpkgs.follows = "hyprland/nixpkgs"; - systems.follows = "hyprland/systems"; - }; - }; - - # hyprland-contrib = { - # url = "github:hyprwm/contrib"; - # inputs.nixpkgs.follows = "hyprland/nixpkgs"; - # }; - - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.hyprland.follows = "hyprland"; - # }; - - hyprlock = { - url = "github:hyprwm/hyprlock"; - inputs = { - hyprlang.follows = "hyprland/hyprlang"; - nixpkgs.follows = "hyprland/nixpkgs"; - systems.follows = "hyprland/systems"; - }; - }; - - hyprpaper = { - url = "github:hyprwm/hyprpaper"; - inputs = { - hyprlang.follows = "hyprland/hyprlang"; - nixpkgs.follows = "hyprland/nixpkgs"; - systems.follows = "hyprland/systems"; - }; - }; }; outputs = { self, diff --git a/home/core/gui/hypr/default.nix b/home/core/gui/hypr/default.nix index 9ca7b96f..dd46580e 100644 --- a/home/core/gui/hypr/default.nix +++ b/home/core/gui/hypr/default.nix @@ -1,7 +1,4 @@ -{inputs, ...}: { - imports = [ - inputs.hyprland.homeManagerModules.default - ]; +{ wayland.windowManager.hyprland = { enable = true; settings = { diff --git a/nixos/hardware/cnix.nix b/nixos/hardware/cnix.nix index 05971152..8bf28083 100644 --- a/nixos/hardware/cnix.nix +++ b/nixos/hardware/cnix.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: let + pkgs-unstable = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; +in { zramSwap.enable = true; hardware = { @@ -12,7 +18,11 @@ }; graphics = { enable = true; + + package = pkgs-unstable.mesa.drivers; enable32Bit = true; + + package32 = pkgs-unstable.pkgsi686Linux.mesa.drivers; extraPackages = with pkgs; [ libva vaapiVdpau