From a75b23d54b7ed1c009c656b8114ae897fcbc7240 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 6 Dec 2023 10:50:36 +0100 Subject: [PATCH] remove getchvim never again --- exprs/overlay.nix | 2 +- flake.lock | 130 +------------------------------------------- flake.nix | 8 --- systems/desktop.nix | 1 - 4 files changed, 4 insertions(+), 137 deletions(-) diff --git a/exprs/overlay.nix b/exprs/overlay.nix index a5f08f8..f28a611 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -1,3 +1,3 @@ final: prev: { - shortcut = final.qt6Packages.callPackage ./shortcut.nix {}; + shortcut = final.qt6Packages.callPackage ./shotcut.nix {}; } diff --git a/flake.lock b/flake.lock index f3b45c6..94f5d3f 100644 --- a/flake.lock +++ b/flake.lock @@ -66,22 +66,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -121,24 +105,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -153,53 +119,7 @@ "type": "github" } }, - "getchvim": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "parts": [ - "flake-parts" - ], - "pre-commit": "pre-commit" - }, - "locked": { - "lastModified": 1701140113, - "narHash": "sha256-jimeA/Vr/iFNLP6ROb0tEpb0jqoWr/XcN0clIEfeaCs=", - "owner": "getchoo", - "repo": "getchvim", - "rev": "5341bafa1b7bbac2eb16d4e8b651a734f2005af0", - "type": "github" - }, - "original": { - "owner": "getchoo", - "repo": "getchvim", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "getchvim", - "pre-commit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -265,11 +185,11 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": [ "flake-parts" ], - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -336,34 +256,6 @@ "type": "indirect" } }, - "pre-commit": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "getchvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "getchvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -374,7 +266,7 @@ "lanzaboote", "flake-utils" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -399,7 +291,6 @@ "inputs": { "agenix": "agenix", "flake-parts": "flake-parts", - "getchvim": "getchvim", "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", @@ -445,21 +336,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c043f84..7ee0f19 100644 --- a/flake.nix +++ b/flake.nix @@ -27,14 +27,6 @@ url = "github:uku3lig/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - getchvim = { - url = "github:getchoo/getchvim"; - inputs = { - nixpkgs.follows = "nixpkgs"; - parts.follows = "flake-parts"; - }; - }; }; outputs = {flake-parts, ...} @ inputs: diff --git a/systems/desktop.nix b/systems/desktop.nix index cee2c5e..6effaed 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -126,7 +126,6 @@ in { agenix.packages.${system}.default firefox font-manager - getchvim.packages.${system}.default gimp gnome.file-roller jetbrains.idea-ultimate