From 90eff62335c9d6f39beef27d1901c008f712bc2a Mon Sep 17 00:00:00 2001
From: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Date: Thu, 16 Jul 2026 13:59:02 +0200
Subject: [PATCH] update

---
 configuration.nix           |  1 +
 flake.lock                  | 24 ++++++++++-----------
 home/home.nix               | 33 ++++++++++++++++++++++++++++-
 home/programs/librewolf.nix |  1 +
 home/programs/ssh.nix       | 42 +++++++++++++++++++++++++++++++++++++
 5 files changed, 88 insertions(+), 13 deletions(-)
 create mode 100644 home/programs/ssh.nix

diff --git a/configuration.nix b/configuration.nix
index a7898d8..f6bf3ec 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,6 +19,7 @@
       sops
       mosh
       nixfmt
+      eza
     ];
 
     home = "/Users/Vegard";
diff --git a/flake.lock b/flake.lock
index f965338..24bb108 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1783483370,
-        "narHash": "sha256-BsaOwrDS2lxKDR031CoLyazWjAanP+ZO1Xx3z5NX6DM=",
+        "lastModified": 1784001764,
+        "narHash": "sha256-vf1MXsM49y/Du0tMvSCuRkItYaBgj+pOyB3T3Q9EQc4=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "2105ea2563f5577187064d91060569f77d30b673",
+        "rev": "a3569b6df9a8071c156af09c2b3f1ffc32d758b9",
         "type": "gitlab"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783525612,
-        "narHash": "sha256-OEFYdbtG6Qy04KGteknnrx15Uo2XXkYVuUvBvFNEn+Q=",
+        "lastModified": 1783963347,
+        "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1aac8895fea6fcabc6a0184c63a80fb2f99fd208",
+        "rev": "a45a7c451455a51ae740ec3bce4024b312809c29",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783279667,
-        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
+        "lastModified": 1783915482,
+        "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
+        "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1783349931,
-        "narHash": "sha256-aYE76ATiGBg7/cQ2dHASRq97WvNum4OOIPgZ8xIK0QI=",
+        "lastModified": 1784057377,
+        "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4fd45857deecb90d2732c87e0315daa48505515e",
+        "rev": "07180a087e4a00720dc0731cbcd8dec796974381",
         "type": "github"
       },
       "original": {
diff --git a/home/home.nix b/home/home.nix
index 71caa89..498c092 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,7 +1,8 @@
-{ ... }: {
+{ config, ... }: {
   imports = [
     ./programs/neovim.nix
     ./programs/librewolf.nix
+    ./programs/ssh.nix
   ];
   home = {
     stateVersion = "26.11";
@@ -38,4 +39,34 @@
     };
     extraConfig = "$env.config.edit_mode = 'vi'";
   };
+
+  programs.zsh = {
+    enable = true;
+    sessionVariables = config.home.sessionVariables;
+    localVariables = {
+      PROMPT = "%B%F{blue}%~%f%b%B%F{green} > %f%b";
+    };
+    shellAliases = {
+      ls = "eza";
+    };
+  };
+
+  programs.git = {
+    enable = true;
+    settings = {
+      init.defaultBranch = "master";
+      user = {
+        name = "Vegard Bieker Matthey";
+        email = "VegardMatthey@protonmail.com";
+        signingkey = "~/.ssh/pvv_gitea_id_ed25519.pub";
+      };
+      commit.gpgsign = true;
+      tag.gpgsign = true;
+      gpg.format = "ssh";
+      gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
+      # push.gpgSign = true; Usually not supported
+    };
+  };
+
+  services.ssh-agent.enable = true;
 }
diff --git a/home/programs/librewolf.nix b/home/programs/librewolf.nix
index 7db9148..fce0ac8 100644
--- a/home/programs/librewolf.nix
+++ b/home/programs/librewolf.nix
@@ -36,6 +36,7 @@ in
         istilldontcareaboutcookies
         sponsorblock
         youtube-nonstop
+	bitwarden
       ];
 
       search.force = true;
diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix
new file mode 100644
index 0000000..de29e01
--- /dev/null
+++ b/home/programs/ssh.nix
@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    settings = {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "yes";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      "*.pvv.ntnu.no microbel pvv-login" = {
+        identityFile = "~/.ssh/pvv_nixos_id_ed25519";
+        user = "vegardbm";
+      };
+      "git.pvv.ntnu.no pvv-git" = {
+        port = 2222;
+        user = "Gitea";
+        hostname = "git.pvv.ntnu.no";
+        proxyJump = "pvv-login";
+        identityFile = "~/.ssh/pvv_gitea_id_ed25519";
+      };
+      "github.com" = {
+        hostname = "github.com";
+        identityFile = "~/.ssh/github_id_ed25519";
+      };
+      "microbel" = {
+        hostname = "microbel.pvv.ntnu.no";
+      };
+      "pvv-login" = {
+        hostname = "login.pvv.ntnu.no";
+      };
+    };
+  };
+}