From a0df72d83470e01bc03854c5d6fda2d3683246bc Mon Sep 17 00:00:00 2001 From: Vegard Bieker Matthey Date: Tue, 16 Dec 2025 05:21:36 +0100 Subject: [PATCH] update ssh config --- flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 8 ++++---- home.nix | 47 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 9cb9745..5702795 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -79,11 +100,33 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765846734, + "narHash": "sha256-xPno2sNwqa9rYaOnJTPhqtZwMiqYwyvWK6trGqMCrkA=", + "owner": "nix-community", + "repo": "NUR", + "rev": "7c8a6ae3f2eac660bb70392cab9a9d2b6f7215c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixvim": "nixvim" + "nixvim": "nixvim", + "nur": "nur" } }, "systems": { diff --git a/flake.nix b/flake.nix index f9d5d01..c5a9232 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,10 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - # nur = { - # url = "github:nix-community/NUR"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: { diff --git a/home.nix b/home.nix index 3d9ce32..ea666ab 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: { home = { username = "vbm"; @@ -44,6 +49,37 @@ gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; }; + programs.ssh = { + enable = true; + enableDefaultConfig = false; + matchBlocks."*" = { + addKeysToAgent = "yes"; + forwardAgent = false; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; + matchBlocks."pvv-git git.pvv.ntnu.no" = { + port = 2222; + user = "Gitea"; + hostname = "git.pvv.ntnu.no"; + addressFamily = "inet"; + proxyJump = "microbel"; + identityFile = "~/.ssh/pvv_gitea_id_ed25519"; + }; + matchBlocks."microbel" = { + user = "vegardbm"; + hostname = "microbel.pvv.ntnu.no"; + addressFamily = "inet"; + identityFile = "~/.ssh/pvv_gitea_id_ed25519"; + }; + }; + programs.nixvim = { enable = true; colorschemes.catppuccin.enable = true; @@ -217,11 +253,12 @@ "browser.urlbar.suggest.topsites" = false; "browser.urlbar.suggest.recentsearches" = false; "places.history.enabled" = false; + "webgl.disabled" = false; }; - # extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ - # darkreader - # bypass-paywalls-clean - # ]; + # extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ + # darkreader + # bypass-paywalls-clean + # ]; search.force = true; search.engines = { nix-packages = {