From e95d240f9831dacc612a10c953a82e850be0f74a Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Tue, 6 Jun 2023 13:43:38 +0200 Subject: [PATCH] remove hyprland flake and caches --- flake.lock | 114 ++----------------------------- flake.nix | 3 - shared/caches.nix | 2 - users/rouven/modules/default.nix | 1 - 4 files changed, 6 insertions(+), 114 deletions(-) diff --git a/flake.lock b/flake.lock index 8d9a63a..caf0e85 100644 --- a/flake.lock +++ b/flake.lock @@ -177,48 +177,6 @@ "type": "indirect" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1686037687, - "narHash": "sha256-6jOnzbGk2hM60Se/Mk/TlZm92EHiVoB+kVDMILF6eq8=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "4afeedbd567ca2114f682f14a6de26d4a8188878", - "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" - } - }, "images": { "inputs": { "nixpkgs": [ @@ -336,18 +294,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1685931219, + "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-22_11": { @@ -412,21 +369,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -481,13 +423,12 @@ "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "purge": "purge", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", @@ -613,49 +554,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1685803001, - "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", - "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 b6bb56a..4a25bb0 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ }; nix-colors.url = "github:Misterio77/nix-colors"; - hyprland.url = "github:hyprwm/Hyprland"; purge = { url = "github:therealr5/purge"; @@ -49,7 +48,6 @@ , nixpkgs , home-manager , nix-index-database - , hyprland , sops-nix , impermanence , nix-colors @@ -87,7 +85,6 @@ home-manager.users.rouven = { imports = [ nix-colors.homeManagerModules.default - hyprland.homeManagerModules.default sops-nix.homeManagerModules.sops ]; }; diff --git a/shared/caches.nix b/shared/caches.nix index c2fa87b..c39eefd 100644 --- a/shared/caches.nix +++ b/shared/caches.nix @@ -2,11 +2,9 @@ { nix.settings = { substituters = [ - "https://hyprland.cachix.org" "https://cache.rfive.de" ]; trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "cache.rfive.de:2E/yzJduGj4SJqYqDhpXO7aM2m5buMMUHN64EZdml3I=" ]; }; diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index 5a1d442..a37b127 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -6,7 +6,6 @@ ./git ./gpg ./helix - # ./hyprland ./sway ./mpv ./sops