more fixes to pkgs

pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix

@@ -8,20 +8,20 @@
 
   # Sets Neovim colors based on Nix colorscheme
 
-  options.colors = lib.mkOption {
-    type = lib.types.attrsOf lib.types.str;
-    description = "Attrset of base16 colorscheme key value pairs.";
-  };
+  # options.colors = lib.mkOption {
+  #   type = lib.types.attrsOf lib.types.str;
+  #   description = "Attrset of base16 colorscheme key value pairs.";
+  # };
 
-  config = lib.mkIf config.colors {
-    plugins = [ pkgs.vimPlugins.base16-nvim ];
-    setup.base16-colorscheme = config.colors;
-
-    # Telescope isn't working, shut off for now
-    lua = ''
-      require('base16-colorscheme').with_config {
-          telescope = false,
-      }
-    '';
-  };
+  # config = lib.mkIf config.colors {
+  #   plugins = [ pkgs.vimPlugins.base16-nvim ];
+  #   setup.base16-colorscheme = config.colors;
+  #
+  #   # Telescope isn't working, shut off for now
+  #   lua = ''
+  #     require('base16-colorscheme').with_config {
+  #         telescope = false,
+  #     }
+  #   '';
+  # };
 }

pkgs/applications/editors/neovim/nmasur/neovim/package.nix

@@ -28,10 +28,10 @@
 
 {
   pkgs,
-  colors ? null,
-  terraform ? false,
-  github ? false,
-  kubernetes ? false,
+  # colors ? null,
+  # terraform ? false,
+  # github ? false,
+  # kubernetes ? false,
   ...
 }:
 
@@ -40,15 +40,15 @@
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
   inherit
-    colors
-    terraform
-    github
-    kubernetes
+    # colors
+    # terraform
+    # github
+    # kubernetes
     ;
   imports = [
     ./config/align.nix
     ./config/bufferline.nix
-    ./config/colors.nix
+    # ./config/colors.nix
     ./config/completion.nix
     ./config/gitsigns.nix
     ./config/lsp.nix

pkgs/tools/misc/gh-collaborators/package.nix

@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ buildGoModule, fetchFromGitHub }:
 
-pkgs.buildGoModule rec {
+buildGoModule rec {
   pname = "gh-collaborators";
   version = "v3.0.0";
-  src = {
+  src = fetchFromGitHub {
     owner = "katiem0";
     repo = "gh-collaborators";
-    rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24";
-    sha256 = pkgs.lib.fakeHash;
+    rev = "bf412dde50605e48af86f291c2ac8714f2c1b228";
+    sha256 = "sha256-SGmP/8Fvf2rcYkwscMOFG01Y0VJGb/TXrNZtLacurxA=";
   };
 
   vendorHash = "sha256-9qmvG2q9t1Zj8yhKFyA99IaJ90R/gRVdQVjdliVKLRE";

pkgs/tools/misc/ip-check/package.nix

@@ -7,4 +7,4 @@ pkgs.writers.writeFishBin "ip-check" {
     ":"
     "${lib.makeBinPath [ pkgs.curl ]}"
   ];
-} builtins.readFile ./ip.fish
+} (builtins.readFile ./ip.fish)

pkgs/tools/misc/ocr/package.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, writeShellApplication }:
 
-pkgs.writeShellApplication {
+writeShellApplication {
   name = "ocr";
   runtimeInputs = [ pkgs.tesseract ];
   text = builtins.readFile ./ocr.sh;

pkgs/tools/misc/osc/package.nix

@@ -1,15 +1,20 @@
 # Clipboard over SSH
 
-{ pkgs, ... }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  ...
+}:
 
-pkgs.buildGoModule {
+buildGoModule {
   pname = "osc";
   version = "v0.4.6";
-  src = {
+  src = fetchFromGitHub {
     owner = "theimpostor";
     repo = "osc";
     rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24";
-    sha256 = pkgs.lib.fakeHash;
+    sha256 = lib.fakeSha256;
   };
 
   vendorHash = "sha256-POtQWIjPObsfa3YZ1dLZgedZFUcc4HeTWjU20AucoKc=";