From 7f3e2853c80bdf5d1425a01824d28bb08f343253 Mon Sep 17 00:00:00 2001 From: insert Date: Tue, 4 Jun 2024 10:50:35 -0400 Subject: [PATCH] Move to stable hyprland --- configuration.nix | 2 +- flake.lock | 197 --------------------------------------- flake.nix | 2 +- special/insertlaptop.nix | 1 + 4 files changed, 3 insertions(+), 199 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5041834..dfc9d81 100644 --- a/configuration.nix +++ b/configuration.nix @@ -301,7 +301,7 @@ programs.hyprland = { enable = true; #enableNvidiaPatches = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + #package = inputs.hyprland.packages.${pkgs.system}.hyprland; }; #programs.nnn.enable = false; #programs.hyprland.enable = true; diff --git a/flake.lock b/flake.lock index dd38bff..90b7976 100644 --- a/flake.lock +++ b/flake.lock @@ -108,137 +108,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713214463, - "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1713640602, - "narHash": "sha256-ne/dj6Q126nZR4ATFQ64up3E8c5ONWMgjSPw9v9EJ04=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "4ad739ec63c9a11f0537a884ae2a4c56d6bab10b", - "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" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713612394, - "narHash": "sha256-uWA8iPYzrdpCT9d8I9YHrxkjBdooqOZIH6ZOHoQiOUc=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "f58a3f56e89857dc7ab7166cff2f971345026634", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1716293225, @@ -276,7 +145,6 @@ "agenix": "agenix", "flatpaks": "flatpaks", "home-manager": "home-manager_2", - "hyprland": "hyprland", "nixpkgs": "nixpkgs", "nvidia-beta": "nvidia-beta" } @@ -311,21 +179,6 @@ "type": "github" } }, - "systems_3": { - "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" - } - }, "utils": { "inputs": { "systems": "systems_2" @@ -343,56 +196,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1b551bd..bde2d69 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nvidia-beta.url = "github:NixOS/nixpkgs/d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db"; flatpaks.url = "github:GermanBread/declarative-flatpak/dev"; flatpaks.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + #hyprland.url = "github:hyprwm/Hyprland"; #hyprland.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/special/insertlaptop.nix b/special/insertlaptop.nix index e950f47..6cd3cf6 100644 --- a/special/insertlaptop.nix +++ b/special/insertlaptop.nix @@ -4,6 +4,7 @@ environment.systemPackages = [ pkgs.acpi + pkgs.brightnessctl ]; home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = {