From b88ad9b5df8f71d6f596ad2ef35600f2ee9fa8ac Mon Sep 17 00:00:00 2001
From: Christian Ott <mail@christianott.ch>
Date: Wed, 17 Apr 2024 12:21:07 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Add=20Obsidian=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Obsidian on the stable nixpkgs contains a deprecated electron package.
That's why the unstable branch is added
---
 flake.lock | 19 ++++++++++++++++++-
 flake.nix  | 11 ++++++++---
 home.nix   |  7 ++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index c0114c3..84b7b6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,10 +37,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1713248628,
+        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 5fb1080..332e433 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,20 +2,25 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = github:nix-community/home-manager/release-23.11;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs: 
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: 
     let
       username = "chrigi";
       lib = nixpkgs.lib;
       system = "x86_64-linux";
 
       pkgs = import nixpkgs { inherit system; };
+      pkgs-unstable = import nixpkgs-unstable { 
+        inherit system; 
+        config.allowUnfree = true;
+      };
     in {
       nixosConfigurations.nix-fw16 = lib.nixosSystem {
         modules = [
@@ -24,7 +29,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.${username} = import ./home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs username; };
+            home-manager.extraSpecialArgs = {inherit pkgs-unstable username; };
           }
         ];
       };
diff --git a/home.nix b/home.nix
index 7bacb7f..70aec81 100644
--- a/home.nix
+++ b/home.nix
@@ -1,13 +1,14 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-unstable, username,  ... }:
 
 {
   # TODO please change the username & home directory to your own
-  home.username = "chrigi";
-  home.homeDirectory = "/home/chrigi";
+  home.username = "${username}";
+  home.homeDirectory = "/home/${username}";
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
     eza
+    pkgs-unstable.obsidian
     jq
   ];