From e4d68f509f5caf28d0107467d028402e7a885bed Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 11 Dec 2021 17:20:54 +0100 Subject: [PATCH] enable unfree package --- flake.nix | 9 +++++++++ home-manager/desktop.nix | 2 +- home-manager/obsidian.nix | 16 +--------------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index fb72546..7f5d307 100644 --- a/flake.nix +++ b/flake.nix @@ -20,11 +20,20 @@ }: let system = "x86_64-linux"; + overlay-unstable = final: prev: { + unstable = import nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + }; pkgs = import nixpkgs { inherit system; config = { allowUnfree = true; }; + overlays = [ + overlay-unstable + ]; }; in { diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 057592a..33eab9f 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -3,7 +3,7 @@ imports = [ ./common.nix ./common/git/git.nix - # ./obsidian.nix + ./obsidian.nix ./work-desktop.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/obsidian.nix b/home-manager/obsidian.nix index 10a9cd1..da524f6 100644 --- a/home-manager/obsidian.nix +++ b/home-manager/obsidian.nix @@ -1,18 +1,4 @@ -{ config, pkgs, ... }: -let - unstable = import - (builtins.fetchTarball { - # Descriptive name to make the store path easier to identify - url = "https://github.com/nixos/nixpkgs/archive/942eb9a335b4cd22fa6a7be31c494e53e76f5637.tar.gz"; - # Commit hash for nixos-unstable as of 2018-09-12 - # `git ls-remote https://github.com/nixos/nixpkgs nixos-unstable` - sha256 = "05390093gl44h8v6pgklwkgbn3vwdhs81shabqmjagq6rg1sh1l5"; - }) - # reuse the current configuration - { - config = config.nixpkgs.config; - }; -in +{ pkgs, ... }: { home.packages = with pkgs; [ unstable.obsidian