From 6c17ac67d966cbe550383a78b0dee963ac860ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 20 Feb 2022 16:23:55 +0000 Subject: [PATCH] newest discord --- flake.lock | 17 +++++++++++++++++ flake.nix | 10 +++++++++- nixos/gui/default.nix | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d944f729..dfce6512 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,22 @@ "type": "github" } }, + "discord": { + "locked": { + "lastModified": 1645128811, + "narHash": "sha256-HEa2awcmQ86HEFvOyCimCURc03bnhrOg1tb2E27Jisw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e0c8e584ae000051db50c70cf6882e12e91b5e9f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "e0c8e584ae000051db50c70cf6882e12e91b5e9f", + "repo": "nixpkgs", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -220,6 +236,7 @@ "root": { "inputs": { "agenix": "agenix", + "discord": "discord", "flake-utils": "flake-utils", "home-manager": "home-manager", "neuron": "neuron", diff --git a/flake.nix b/flake.nix index a7b5afdc..acc25153 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "NixOS configuration with flakes"; - outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, sops } @ inputs: + outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, sops, discord } @ inputs: let mkServer = pkgs: system: hostname: @@ -43,6 +43,7 @@ specialArgs = { inherit inputs system; unstableAndUnfree = import nixpkgs-nixos-unstable { inherit system; config = { allowUnfree = true; }; }; + discord = import discord { inherit system; config = { allowUnfree = true; }; }; }; }; in @@ -152,6 +153,13 @@ repo = "sops-nix"; ref = "master"; }; + + discord = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "e0c8e584ae000051db50c70cf6882e12e91b5e9f"; + }; }; } diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 74f7795c..08788adc 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, unstableAndUnfree, inputs, ... }: +{ config, pkgs, discord, inputs, ... }: let unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; in @@ -42,7 +42,7 @@ in brave cheese digikam - unstableAndUnfree.discord + discord.discord electrum element-desktop eog