From 96de7b7a71882db1afa28e042c9cc44590f15406 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Thu, 1 Jun 2023 12:35:45 +0200 Subject: [PATCH] Hyprland package source to nixpkgs --- flake.lock | 104 +--------------------- flake.nix | 1 - home/users/m3tam3re/dotfiles/hyprland.nix | 2 +- hosts/m3-nix/default.nix | 1 - 4 files changed, 2 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index 30d50c8..be7c18b 100644 --- a/flake.lock +++ b/flake.lock @@ -119,48 +119,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_3", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1685560280, - "narHash": "sha256-OA2oyvNcJRCo4JS/CqqVlR76TNprLcXK4ZuRffoE8+8=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "e76bd43f53197af2c64608ba6b0792326e79db07", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1677676435, @@ -194,22 +152,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1685383865, "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", @@ -230,8 +172,7 @@ "agenix": "agenix", "deploy-rs": "deploy-rs", "home-manager": "home-manager_2", - "hyprland": "hyprland", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "utils": { @@ -248,49 +189,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1685491729, - "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fe2d5e2..9b93932 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ agenix.url = "github:ryantm/agenix"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; deploy-rs.url = "github:serokell/deploy-rs"; - hyprland.url = "github:hyprwm/Hyprland"; }; outputs = { self, nixpkgs, home-manager, agenix, deploy-rs, ... }@inputs: diff --git a/home/users/m3tam3re/dotfiles/hyprland.nix b/home/users/m3tam3re/dotfiles/hyprland.nix index 0c7aad3..0b1e127 100644 --- a/home/users/m3tam3re/dotfiles/hyprland.nix +++ b/home/users/m3tam3re/dotfiles/hyprland.nix @@ -16,7 +16,7 @@ # source = ~/.config/hypr/myColors.conf # Some default env vars. - env = XCURSOR_SIZE,24 + #env = XCURSOR_SIZE,24 env = WLR_NO_HARDWARE_CURSORS,1 env = __NV_PRIME_RENDER_OFFLOAD,1 env = GTK_THEME,Dracula diff --git a/hosts/m3-nix/default.nix b/hosts/m3-nix/default.nix index 9133132..d59f183 100644 --- a/hosts/m3-nix/default.nix +++ b/hosts/m3-nix/default.nix @@ -19,7 +19,6 @@ in { ../common/users/m3tam3re ../common/base ./services - inputs.hyprland.nixosModules.default ]; specialisation = { external-display.configuration = {