From 8f1e1ea06ee2ca9caf8f9cd36639ee1aea1fa574 Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Thu, 31 Aug 2023 11:15:36 +0200
Subject: [PATCH] feat: switch to unstable channel

---
 flake.lock                        | 17 ++++++++---------
 flake.nix                         | 17 ++++++++++++-----
 users/gandalf/default.nix         |  5 ++++-
 users/gandalf/modules/default.nix |  1 +
 users/gandalf/modules/ssh.nix     |  9 +++++++++
 5 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 users/gandalf/modules/ssh.nix

diff --git a/flake.lock b/flake.lock
index dc817dd..3660037 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,31 +7,30 @@
         ]
       },
       "locked": {
-        "lastModified": 1692099905,
-        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
+        "lastModified": 1693399033,
+        "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
+        "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692447944,
-        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
-        "owner": "NixOS",
+        "lastModified": 1693377291,
+        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
+        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
diff --git a/flake.nix b/flake.nix
index c70219b..3f237a6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,18 @@
 {
   description = "Nix los hier";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
+    #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    #home-manager.url = "github:nix-community/home-manager/release-23.05";
+    #home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    #home-manager-unstable.url = "github:nix-community/home-manager";
+    #home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
   };
   outputs = { self, nixpkgs, home-manager, ... }@inputs: {
     nixosConfigurations = {
diff --git a/users/gandalf/default.nix b/users/gandalf/default.nix
index 92c95ee..63dafd6 100644
--- a/users/gandalf/default.nix
+++ b/users/gandalf/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, unstable, ... }:
 let
   aliases = import ../../modules/aliases.nix;
 in
@@ -18,6 +18,9 @@ in
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = {
+    inherit unstable;
+  };
 
   home-manager.users.gandalf = { pkgs, ... }: {
     imports = [ ./modules ];
diff --git a/users/gandalf/modules/default.nix b/users/gandalf/modules/default.nix
index 0f0a454..9632c5d 100644
--- a/users/gandalf/modules/default.nix
+++ b/users/gandalf/modules/default.nix
@@ -5,6 +5,7 @@
     ./git.nix
     ./gnupg.nix
     ./neovim.nix
+    ./ssh.nix
     ./sway.nix
     ./tmux.nix
     ./udiskie.nix
diff --git a/users/gandalf/modules/ssh.nix b/users/gandalf/modules/ssh.nix
new file mode 100644
index 0000000..836539c
--- /dev/null
+++ b/users/gandalf/modules/ssh.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  programs.ssh = {
+    enable = true;
+  };
+
+  services.ssh-agent = {
+    enable = true;
+  };
+}