changes to modules + adoption of PC

home/river/programs/fish.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./eza.nix
+    ./starship.nix
+    ./zoxide.nix
+  ];
+
+  home.packages = with pkgs; [
+    fish
+    bat
+    fzf
+    fd
+    zoxide
+    ripgrep
+    neovim
+  ];
+
+  home.file.".config/fish".source = ../config/fish;
+
+  programs.fish.enable = true;
+}

home/river/programs/git.nix

@@ -1,9 +1,30 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   programs.git = {
     enable = true;
+    settings = {
+      user = {
+        name = "Maaz Khokhar";
+        email = "khokharmaaz@gmail.com";
+      };
+      signing = {
+        key = "0xA8D1AEA9C92D6867"; # e.g., "0x1234567890ABCDEF"
+        signByDefault = true;
+      };
+
+      credential.helper = "libsecret";
+
+      extraConfig = {
+        commit.gpgSign = true;
+        tag.gpgSign = true;
+        gpg.program = "${pkgs.gnupg}/bin/gpg";
+        init.defaultBranch = "main";
+        pull.rebase = true;
+      };
+    };
   };
+
   programs.delta = {
     enable = true;
     options = {

home/river/programs/gpg.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 1800;
+    maxCacheTtl = 1800;
+    pinentry.package = pkgs.pinentry-curses;
+  };
+
+  programs.gpg = {
+    enable = true;
+    settings = {
+      auto-key-locate = "local,wkd,keyserver";
+      keyserver = "hkps://keys.openpgp.org";
+    };
+  };
+}

home/river/programs/java.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+{
+  home.file.".java/jdk-17".source = pkgs.jdk17;
+  home.file.".java/jdk-25".source = pkgs.jdk25;
+}

home/river/programs/vesktop.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    vesktop
+  ];
+}

home/river/programs/zoxide.nix

@@ -4,5 +4,6 @@
   programs.zoxide = {
     enable = true;
     enableBashIntegration = true;
+    enableFishIntegration = true;
   };
 }