From 705c9ba011b5ee91bd27c295819736d0125e6e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Mon, 4 Mar 2024 08:14:08 +0100
Subject: [PATCH] Add ssh config

---
 flake.lock                 |  7 ++++---
 flake.nix                  |  2 +-
 home/default.nix           |  2 +-
 home/hyprland/hyprland.nix |  4 ++--
 home/ssh/default.nix       |  1 +
 home/ssh/gunter.nix        | 12 ++++++++++++
 hosts/gunter/steamuser.nix |  3 +++
 7 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 home/ssh/default.nix
 create mode 100644 home/ssh/gunter.nix

diff --git a/flake.lock b/flake.lock
index 38e7a6d..c142bbe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,15 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1709485962,
-        "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
+        "lastModified": 1706981411,
+        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
+        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 60cafaa..acaf134 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager?ref=release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/home/default.nix b/home/default.nix
index 6d57d3d..deafdfd 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -16,7 +16,7 @@
         ./zsh
         ./packages
         ./hyprland
-        ./i3
+        ./ssh
       ];
       firefox.enable = true;
       tmux.enable = true;
diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix
index 5144cda..5769f43 100644
--- a/home/hyprland/hyprland.nix
+++ b/home/hyprland/hyprland.nix
@@ -23,9 +23,9 @@
         "$term" = "kitty";
 
         monitor = [
-          "DP-3,1920x1080@60,2560x0,1" # top
+          "DP-6,1920x1080@60,2560x0,1" # top T2B04424SL000
           "DP-8,2560x1440@75,0x1080,1" # left
-          "DP-2,2560x1440@120,2560x1080,1" # main
+          "DP-5,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
           "DP-7,2560x1440@75,5120x1080,1" # right
         ];
         input = {
diff --git a/home/ssh/default.nix b/home/ssh/default.nix
new file mode 100644
index 0000000..da32aec
--- /dev/null
+++ b/home/ssh/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./gunter.nix ]; }
diff --git a/home/ssh/gunter.nix b/home/ssh/gunter.nix
new file mode 100644
index 0000000..6e086bf
--- /dev/null
+++ b/home/ssh/gunter.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  programs.ssh = {
+    enable = true;
+    matchBlocks."bmo.uio.no" = {
+      hostname = "bmo.uio.no";
+      extraOptions = {
+        ControlMaster = "auto";
+        ControlPath = "$XDG_RUNTIME_DIR/ssh/%r@%h:%p";
+      };
+    };
+  };
+}
diff --git a/hosts/gunter/steamuser.nix b/hosts/gunter/steamuser.nix
index 6459ddb..6ae4bfe 100644
--- a/hosts/gunter/steamuser.nix
+++ b/hosts/gunter/steamuser.nix
@@ -14,6 +14,9 @@
     shell = pkgs.zsh;
     # Install some user packages
     packages = with pkgs; [
+      firefox
+      mumble
+      easyeffects
     ];
   };
 }