From 1b33ec0bae74df7fc6e39745c02c9474d521e85f Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Sat, 26 Mar 2022 14:56:06 +0100 Subject: [PATCH] chore(flake): remove inputs that aren't needed --- flake.lock | 179 +---------------------------------------------------- flake.nix | 43 ++++--------- 2 files changed, 14 insertions(+), 208 deletions(-) diff --git a/flake.lock b/flake.lock index 76858f3..db2d7a7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,12 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -31,28 +15,6 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "nixpkgs": [ - "photoprism2nix", - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1641803356, - "narHash": "sha256-ZjF43cckJLJCV9I+SXwTGNQGI52KrYwUhLt/R83TyKk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "fc5adcc53031c5a3934500a57896a840a2bd073d", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -74,31 +36,6 @@ "type": "github" } }, - "neovim": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1648270774, - "narHash": "sha256-F9hpJi2Qqi7kJw44yOhHRUxxisD2s3njHZuJGmTmIOo=", - "owner": "neovim", - "repo": "neovim", - "rev": "fb5587d2bede0cc091b92731b990bd2e394e9914", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1648141026, @@ -163,81 +100,6 @@ "type": "github" } }, - "nvim-ts-autotag": { - "flake": false, - "locked": { - "lastModified": 1646385778, - "narHash": "sha256-gYm8/MLCBBhrH1vSrBxK33wOtG5CYaXJWn9N5e4a0hk=", - "owner": "windwp", - "repo": "nvim-ts-autotag", - "rev": "57035b5814f343bc6110676c9ae2eacfcd5340c2", - "type": "github" - }, - "original": { - "owner": "windwp", - "repo": "nvim-ts-autotag", - "type": "github" - } - }, - "nvim-ts-context-commentstring": { - "flake": false, - "locked": { - "lastModified": 1647633943, - "narHash": "sha256-zOViSH+6PF89ypBvDXDH+muRvo2FFBFbeMl60HZ0g0I=", - "owner": "JoosepAlviste", - "repo": "nvim-ts-context-commentstring", - "rev": "7810f1fe706092290dd338f40e5e857bac4a03cf", - "type": "github" - }, - "original": { - "owner": "JoosepAlviste", - "repo": "nvim-ts-context-commentstring", - "type": "github" - } - }, - "photoprism": { - "flake": false, - "locked": { - "lastModified": 1646430173, - "narHash": "sha256-SbnYw0A3nTBYpCaQdj4BbCihBcq0ZE8JImYG/itbR3g=", - "owner": "photoprism", - "repo": "photoprism", - "rev": "ba1004d7eee6bc20cfcd06092b839a8c39c72c29", - "type": "github" - }, - "original": { - "owner": "photoprism", - "repo": "photoprism", - "type": "github" - } - }, - "photoprism2nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "nixpkgs" - ], - "photoprism": "photoprism", - "ranz2nix": "ranz2nix" - }, - "locked": { - "lastModified": 1646523092, - "narHash": "sha256-CbP0CeUwUheIkT55bAAq40u5Apovgpovh3z5Yjgblds=", - "owner": "GTrunSec", - "repo": "photoprism2nix", - "rev": "df62bfe92848a657ece6313b6b69c78f9c67158a", - "type": "github" - }, - "original": { - "owner": "GTrunSec", - "repo": "photoprism2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-utils": [ @@ -261,51 +123,16 @@ "type": "github" } }, - "ranz2nix": { - "flake": false, - "locked": { - "lastModified": 1594668772, - "narHash": "sha256-JE7lk0rDP5itZqWOwjuv8N18xLbGc6XL/0u9rMnhXUk=", - "owner": "andir", - "repo": "ranz2nix", - "rev": "637276c3110716d2a798e737fe62e54b37190d50", - "type": "github" - }, - "original": { - "owner": "andir", - "repo": "ranz2nix", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", - "neovim": "neovim", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur", "nvim-lspfuzzy": "nvim-lspfuzzy", - "nvim-ts-autotag": "nvim-ts-autotag", - "nvim-ts-context-commentstring": "nvim-ts-context-commentstring", - "photoprism2nix": "photoprism2nix", "pre-commit-hooks": "pre-commit-hooks" } - }, - "utils": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0d74eea..deb2840 100644 --- a/flake.nix +++ b/flake.nix @@ -12,17 +12,12 @@ inputs.nur.url = "github:nix-community/NUR/master"; - inputs.neovim = { - url = "github:neovim/neovim?dir=contrib"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - inputs.photoprism2nix = { - url = "github:GTrunSec/photoprism2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + # TODO this looks preferable: https://github.com/NixOS/nixpkgs/issues/96043#issuecomment-1030936467 + # inputs.photoprism2nix = { + # url = "github:GTrunSec/photoprism2nix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.flake-utils.follows = "flake-utils"; + # }; inputs.pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; @@ -30,24 +25,13 @@ inputs.flake-utils.follows = "flake-utils"; }; - inputs.nvim-ts-autotag = { - url = "github:windwp/nvim-ts-autotag"; - flake = false; - }; - - inputs.nvim-ts-context-commentstring = { - url = "github:JoosepAlviste/nvim-ts-context-commentstring"; - flake = false; - }; - inputs.nvim-lspfuzzy = { url = "github:ojroques/nvim-lspfuzzy"; flake = false; }; outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur - , neovim, photoprism2nix, pre-commit-hooks, nvim-ts-autotag - , nvim-ts-context-commentstring, nvim-lspfuzzy }@inputs: + , pre-commit-hooks, nvim-lspfuzzy }@inputs: let overlays = { neovim = self: super: @@ -60,13 +44,7 @@ src = input; }; in { - neovim-nightly = neovim.packages.${self.system}.neovim; vimPlugins = super.vimPlugins // { - nvim-ts-autotag = - buildVimPlugin "nvim-ts-autotag" nvim-ts-autotag; - nvim-ts-context-commentstring = - buildVimPlugin "nvim-ts-context-commentstring" - nvim-ts-context-commentstring; nvim-lspfuzzy = buildVimPlugin "nvim-lspfuzzy" nvim-lspfuzzy; }; }; @@ -74,9 +52,10 @@ deconz = self.qt5.callPackage ./pkgs/deconz { }; }; # custom overlay so it's using the flake's nixpkgs - photoprism = self: super: { - photoprism = photoprism2nix.defaultPackage.${self.system}; - }; + photoprism = self: super: + { + # photoprism = photoprism2nix.defaultPackage.${self.system}; + }; }; nixosModules = { flakeDefaults = import ./modules/flakeDefaults.nix; }; homeManagerModules = { git = import ./home/modules/git.nix; };