From 86fe70288b639b32f23f743facbeec14bedd30d7 Mon Sep 17 00:00:00 2001
From: Semere Meharena Mebrahtom <semere.meharena1@gmail.com>
Date: Sat, 18 Jul 2026 17:05:18 +0200
Subject: [PATCH] gpg configured

---
 flake.lock                  | 22 ++++++++++++----------
 flake.nix                   | 30 ++++++++++++------------------
 home/him.nix                | 30 +++++++++++++++++++++++++++---
 hosts/sys/configuration.nix | 13 +------------
 4 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/flake.lock b/flake.lock
index 640ceb8..6e34b79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781981105,
-        "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=",
+        "lastModified": 1783740085,
+        "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7bfff44b465909f69a442701293bc0badcf476dc",
+        "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
         "type": "github"
       },
       "original": {
@@ -23,16 +23,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782535326,
-        "narHash": "sha256-r4TA57SL7nvj1R+GY/FCLwFU48w9IixTQlzBTIYkt8E=",
-        "rev": "714a5f8c4ead6b31148d829288440ed033ccc041",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.3494.714a5f8c4ead/nixexprs.tar.xz"
+        "lastModified": 1783549019,
+        "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac",
+        "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-26.05",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 2eaa789..f998f81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,9 @@
   description = "NixOS system flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-26.05";
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs/nixos-26.05";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
@@ -12,22 +14,15 @@
 
   outputs = { self, nixpkgs, home-manager, ... }:
   let
-    system = "x86_64-linux";
-
-    hosts = [ "sys" ];
-    # hosts = builtins.attrNames (builtins.readDir ./hosts);
+    lib = nixpkgs.lib;
   in
   {
-    nixosConfigurations =
-      builtins.listToAttrs (
-        map (host: {
-          name = host;
-          value = nixpkgs.lib.nixosSystem {
-            inherit system;
-
-            modules = [
-              ./hosts/${host}/configuration.nix
-              ./hosts/${host}/hardware-configuration.nix
+    nixosConfigurations = {
+      sys = lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+              ./hosts/sys/configuration.nix
+              ./hosts/sys/hardware-configuration.nix
 
               home-manager.nixosModules.home-manager
               {
@@ -41,8 +36,7 @@
                 };
               }
             ];
-          };
-        }) hosts
-      );
+      };
+    };
   };
 }
diff --git a/home/him.nix b/home/him.nix
index 5deb8de..1b9e271 100644
--- a/home/him.nix
+++ b/home/him.nix
@@ -1,10 +1,31 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 {
   home.username = "him";
   home.homeDirectory = "/home/him";
   home.stateVersion = "26.05";
 
-  programs.git.enable = true;
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = "Semere M. Mebrahtom";
+        email = "semere.meharena1@gmail.com";
+      };
+      commit.gpgsign = true;
+      gpg.program = "gpg";
+    };
+    signing = {
+      key = "451054EEC0D2AFD1741D4E6A7FC937214DF30488";
+      signByDefault = true;
+    };
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 1800;
+    enableSshSupport = true;
+    pinentry.package = pkgs.pinentry-curses;
+  };
 
   programs.bash = {
     enable = true;
@@ -13,5 +34,8 @@
     };
   };
 
+  programs.fzf = {
+    enable = true;
+    enableBashIntegration = true;
+  };
 }
-
diff --git a/hosts/sys/configuration.nix b/hosts/sys/configuration.nix
index 01aeec2..a29a021 100644
--- a/hosts/sys/configuration.nix
+++ b/hosts/sys/configuration.nix
@@ -61,19 +61,14 @@
     gnupg
     pass
     p7zip
-    yazi
     wmenu
     fnott
 
     btop
-
-    wlock
     helix
     foot
     firefox
-
-    mpv
-    yt-dlp
+    tor-browser
   ];
 
   fonts.packages = with pkgs; [
@@ -93,12 +88,6 @@
     "flakes"
   ];
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-curses;
-  };
-
   system.stateVersion = "26.05";
 
 }