From 3206b48f287c41ceb01e4183322356f0611217cd Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sat, 22 Feb 2025 17:39:12 -0500
Subject: [PATCH] more fixes to pkgs

---
 flake.nix                                     |  1 +
 hosts/nixos/tempest/default.nix               |  7 ++++-
 overlays/pkgs.nix                             | 19 ++++++++----
 .../neovim/nmasur/neovim/config/colors.nix    | 30 +++++++++----------
 .../editors/neovim/nmasur/neovim/package.nix  | 18 +++++------
 pkgs/tools/misc/gh-collaborators/package.nix  | 10 +++----
 pkgs/tools/misc/ip-check/package.nix          |  2 +-
 pkgs/tools/misc/ocr/package.nix               |  4 +--
 pkgs/tools/misc/osc/package.nix               | 13 +++++---
 .../modules/nmasur/presets/services/i3.nix    | 15 +++++-----
 .../nmasur/presets/services/mbsync.nix        |  6 ++--
 11 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/flake.nix b/flake.nix
index 311bc1d..83087ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -262,6 +262,7 @@
         (import ./overlays/tree-sitter.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
+        (import ./overlays/pkgs.nix)
       ];
 
       # System types to support.
diff --git a/hosts/nixos/tempest/default.nix b/hosts/nixos/tempest/default.nix
index fab99d0..9120294 100644
--- a/hosts/nixos/tempest/default.nix
+++ b/hosts/nixos/tempest/default.nix
@@ -38,9 +38,14 @@ rec {
       developer.enable = true;
       experimental.enable = true;
     };
+    nmasur.presets.services.mbsync = {
+      user = nmasur.settings.username;
+      server = "noahmasur.com";
+    };
     home.stateVersion = "23.05";
   };
 
+  system.stateVersion = "23.05";
   # Not sure what's necessary but too afraid to remove anything
   boot.initrd.availableKernelModules = [
     "nvme"
@@ -100,7 +105,7 @@ rec {
   nmasur.presets.services.cloudflared = {
     tunnel = {
       id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
-      credentialsFile = ../../private/cloudflared-tempest.age;
+      credentialsFile = ../../../private/cloudflared-tempest.age;
       ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
     };
   };
diff --git a/overlays/pkgs.nix b/overlays/pkgs.nix
index 7390f65..62dadb3 100644
--- a/overlays/pkgs.nix
+++ b/overlays/pkgs.nix
@@ -9,15 +9,24 @@ let
         value = v;
       }) list
     );
+
+  listToAttrsByPnameOrName =
+    list:
+    builtins.listToAttrs (
+      map (v: {
+        name = v."pname" ? v."name";
+        value = v;
+      }) list
+    );
   lib = prev.lib;
-  packagesDirectory = lib.filesystem.listFilesRecursive ../pkgs;
-  packages = lib.pipe packagesDirectory [
+  # packagesDirectory = lib.filesystem.listFilesRecursive ../pkgs;
+  packages = lib.pipe (lib.filesystem.listFilesRecursive ../pkgs) [
     # Get only files called package.nix
-    (builtins.filter (name: lib.hasSuffix "package.nix"))
+    (builtins.filter (name: lib.hasSuffix "package.nix" name))
     # Apply callPackage to create a derivation
-    (builtins.map prev.callPackage)
+    (builtins.map (name: prev.callPackage name { }))
     # Convert the list to an attrset
-    (listToAttrsByField "name")
+    listToAttrsByPnameOrName
   ];
 in
 
diff --git a/pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix b/pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix
index ffbcb7f..8a66f27 100644
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix
+++ b/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,
+  #     }
+  #   '';
+  # };
 }
diff --git a/pkgs/applications/editors/neovim/nmasur/neovim/package.nix b/pkgs/applications/editors/neovim/nmasur/neovim/package.nix
index 8119dc7..14b5281 100644
--- a/pkgs/applications/editors/neovim/nmasur/neovim/package.nix
+++ b/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
diff --git a/pkgs/tools/misc/gh-collaborators/package.nix b/pkgs/tools/misc/gh-collaborators/package.nix
index 08ad871..e79e497 100644
--- a/pkgs/tools/misc/gh-collaborators/package.nix
+++ b/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";
diff --git a/pkgs/tools/misc/ip-check/package.nix b/pkgs/tools/misc/ip-check/package.nix
index 048fe00..cdf4267 100644
--- a/pkgs/tools/misc/ip-check/package.nix
+++ b/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)
diff --git a/pkgs/tools/misc/ocr/package.nix b/pkgs/tools/misc/ocr/package.nix
index 3463354..2a8c45a 100644
--- a/pkgs/tools/misc/ocr/package.nix
+++ b/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;
diff --git a/pkgs/tools/misc/osc/package.nix b/pkgs/tools/misc/osc/package.nix
index 1fa0f0b..b4de03a 100644
--- a/pkgs/tools/misc/osc/package.nix
+++ b/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=";
diff --git a/platforms/home-manager/modules/nmasur/presets/services/i3.nix b/platforms/home-manager/modules/nmasur/presets/services/i3.nix
index c98ccc8..0f922d0 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/i3.nix
+++ b/platforms/home-manager/modules/nmasur/presets/services/i3.nix
@@ -17,7 +17,7 @@ in
       type = lib.types.package;
       description = "Terminal application to launch";
     };
-    wallpaper = {
+    wallpaper = lib.mkOption {
       type = lib.types.path;
       description = "Wallpaper background image file";
       default = "${pkgs.wallpapers}/gruvbox/road.jpg";
@@ -78,7 +78,7 @@ in
 
   config = lib.mkIf cfg.enable {
     xsession.windowManager.i3 = {
-      enable = config.services.xserver.enable;
+      enable = true;
       config =
         let
           modifier = "Mod4"; # Super key
@@ -315,11 +315,10 @@ in
     };
 
     programs.fish.functions = {
-      update-lock-screen =
-        lib.mkIf cfg.commands.updateLockScreen != null {
-          description = "Update lockscreen with wallpaper";
-          body = cfg.commands.updateLockScreen;
-        };
+      update-lock-screen = lib.mkIf (cfg.commands.updateLockScreen != null) {
+        description = "Update lockscreen with wallpaper";
+        body = cfg.commands.updateLockScreen;
+      };
     };
 
     # Update lock screen cache only if cache is empty
@@ -327,7 +326,7 @@ in
       let
         cacheDir = "${config.xdg.cacheHome}/betterlockscreen/current";
       in
-      lib.mkIf cfg.commands.updateLockScreen != null (
+      lib.mkIf (cfg.commands.updateLockScreen != null) (
         config.lib.dag.entryAfter [ "writeBoundary" ] ''
           if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
               run ${cfg.commands.updateLockScreen}
diff --git a/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix b/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix
index 69abdf4..8913ad5 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix
+++ b/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  inherit (config.nmasur.settings) fullName;
+  inherit (config.nmasur.settings) fullName hostnames;
   cfg = config.nmasur.presets.services.mbsync;
 in
 
@@ -25,10 +25,12 @@ in
     imapHost = lib.mkOption {
       type = lib.types.str;
       description = "Server host for IMAP (reading mail).";
+      default = config.hostnames.imap;
     };
     smtpHost = lib.mkOption {
       type = lib.types.str;
       description = "Server host for SMTP (sending mail).";
+      default = config.hostnames.smtp;
     };
   };
 
@@ -110,7 +112,7 @@ in
             notmuch.enable = true;
 
             # Used to login and send and receive emails
-            passwordCommand = "${lib.getExe pkgs.age} --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
+            passwordCommand = "${lib.getExe pkgs.age} --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../../../../private/mailpass.age)}";
 
             smtp = {
               host = cfg.smtpHost;