From 68309732331874bc92e36514b3d3b028ff4acdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sat, 6 Jun 2026 09:30:35 +0200
Subject: [PATCH] multiple things + tried gpg signing

---
 flake.lock                        | 13 +++++++++++++
 flake.nix                         |  6 +++++-
 modules/applications/kdrive.nix   |  6 +++---
 modules/applications/neovim.nix   |  4 ++--
 modules/hosts/desktop.nix         |  2 +-
 modules/hosts/laptop.nix          |  4 ++--
 modules/utilities/development.nix |  2 ++
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index bdde15f..5bd368a 100755
--- a/flake.lock
+++ b/flake.lock
@@ -203,6 +203,18 @@
         "type": "github"
       }
     },
+    "nixpkgs-local": {
+      "locked": {
+        "lastModified": 1780728942,
+        "narHash": "sha256-NjXPlIssFzJ8vazKaihsW773r/Kq2TTby7FKBlbWIg4=",
+        "path": "/home/tomasr/devel/fugit2-gpgme",
+        "type": "path"
+      },
+      "original": {
+        "path": "/home/tomasr/devel/fugit2-gpgme",
+        "type": "path"
+      }
+    },
     "nixpkgs-notifier": {
       "inputs": {
         "flake-utils": [
@@ -313,6 +325,7 @@
         "microPlugins-vivify": "microPlugins-vivify",
         "nixos-grub-themes": "nixos-grub-themes",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-local": "nixpkgs-local",
         "nixpkgs-notifier": "nixpkgs-notifier",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "notewrapper": "notewrapper"
diff --git a/flake.nix b/flake.nix
index c812399..1c34b48 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages
     nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
+
+    # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone
+    nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -59,8 +62,9 @@
             };
           pkgs = mkPkgs inputs.nixpkgs;
           pkgs-unstable = mkPkgs inputs.nixpkgs-unstable;
+          pkgs-local =  mkPkgs inputs.nixpkgs-local;
         in {
-          inherit pkgs pkgs-unstable;
+          inherit pkgs pkgs-unstable pkgs-local;
         };
       }
       // (inputs.import-tree ./modules));
diff --git a/modules/applications/kdrive.nix b/modules/applications/kdrive.nix
index c5d45ae..2682b89 100644
--- a/modules/applications/kdrive.nix
+++ b/modules/applications/kdrive.nix
@@ -11,9 +11,9 @@
       enable = true;
     };
   };
-  flake.nixosModules.kdrive-desktop = {pkgs-unstable, ...}: {
-    environment.systemPackages = with pkgs-unstable; [
-      rclone
+  flake.nixosModules.kdrive-desktop = {pkgs, ...}: {
+    environment.systemPackages = [
+      pkgs.rclone
       self.packages.${pkgs.system}.custom-checkKdrive
       self.packages.${pkgs.system}.custom-synckdrive-desktop
     ];
diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix
index c405449..cbf1d36 100644
--- a/modules/applications/neovim.nix
+++ b/modules/applications/neovim.nix
@@ -1,5 +1,5 @@
 _: {
-  flake.homeModules.neovim = {pkgs-unstable, ...}: {
+  flake.homeModules.neovim = {pkgs-unstable, pkgs-local,...}: {
     programs.neovim = {
       withRuby = false;
       withPython3 = false;
@@ -59,7 +59,7 @@ _: {
         pkgs-unstable.vimPlugins.cheatsheet-nvim
         pkgs-unstable.vimPlugins.popup-nvim
         pkgs-unstable.vimPlugins.vim-visual-multi
-        pkgs-unstable.vimPlugins.fugit2-nvim
+        pkgs-local.vimPlugins.fugit2-nvim
         pkgs-unstable.vimPlugins.nvim-lastplace
         pkgs-unstable.vimPlugins.runner-nvim # terminal
         pkgs-unstable.vimPlugins.better-diagnostic-virtual-text
diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix
index a325b27..2a9ad5e 100644
--- a/modules/hosts/desktop.nix
+++ b/modules/hosts/desktop.nix
@@ -7,7 +7,7 @@
   flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem {
     #system = "x86_64-linux";
     specialArgs = {
-      inherit (self) pkgs-unstable;
+      inherit (self) pkgs-unstable pkgs-local;
     };
     modules = with self.nixosModules; [
       # important do not remove
diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix
index 059dc38..df4a91d 100644
--- a/modules/hosts/laptop.nix
+++ b/modules/hosts/laptop.nix
@@ -6,7 +6,7 @@
   flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem {
     #system = "x86_64-linux";
     specialArgs = {
-      inherit (self) pkgs-unstable;
+      inherit (self) pkgs-unstable pkgs-local;
     };
     modules = with self.nixosModules; [
       # important do not remove
@@ -104,7 +104,7 @@
       useUserPackages = true;
 
       extraSpecialArgs = {
-        inherit (self) pkgs-unstable;
+        inherit (self) pkgs-unstable pkgs-local;
         inherit self;
       };
     };
diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix
index 5fff03a..b02c10e 100644
--- a/modules/utilities/development.nix
+++ b/modules/utilities/development.nix
@@ -31,6 +31,8 @@
       ltex-ls-plus
       pylint
       black
+      gnupg
+      pinentry-curses
       inputs.nixpkgs-notifier.packages.${pkgs.system}.default
     ];
   };