From 09494136822ddd86fe48fa56218d0d777b4db2fd Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Sun, 21 Nov 2021 22:41:32 +0200 Subject: [PATCH] aaaaaaaaaa --- flake.nix | 20 +++++--------------- modules/overlays/default.nix | 5 +++-- modules/overlays/discord.nix | 8 ++++---- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/flake.nix b/flake.nix index b557081..0295faa 100644 --- a/flake.nix +++ b/flake.nix @@ -8,12 +8,12 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - easy-dhall-nix.url = "github:justinwoo/easy-dhall-nix"; - easy-dhall-nix.flake = false; - # easy-dhall-nix.inputs.nixpkgs.follows = "nixpkgs"; + # easy-dhall-nix.url = "github:justinwoo/easy-dhall-nix"; + # easy-dhall-nix.flake = false; + # # easy-dhall-nix.inputs.nixpkgs.follows = "nixpkgs"; - easy-purescript-nix.url = "github:justinwoo/easy-purescript-nix"; - easy-purescript-nix.flake = false; + # easy-purescript-nix.url = "github:justinwoo/easy-purescript-nix"; + # easy-purescript-nix.flake = false; # easy-purescript-nix.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -21,16 +21,6 @@ , easy-dhall-nix, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - nixpkgs.overlays = [ - (self: super: { - inputs = { - inherit nixpkgs; - inherit nixos-unstable; - inherit easy-dhall-nix; - inherit easy-purescript-nix; - }; - }) - ]; modules = [ home-manager.nixosModules.home-manager ./hardware/laptop.nix diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index bae92c0..afeab98 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -1,4 +1,5 @@ -{ ... }: { - nixpkgs.overlays = [ import ./discord ]; +{ ... }: +{ + # nixpkgs.overlays = [ import ./discord ]; # imports = [ ./legacy.nix ]; } diff --git a/modules/overlays/discord.nix b/modules/overlays/discord.nix index eea5e40..a209869 100644 --- a/modules/overlays/discord.nix +++ b/modules/overlays/discord.nix @@ -1,8 +1,8 @@ self: super: - -{ - discord = super.discord.overrideAttrs (old: rec { - version = "0.0.15"; +let version = "0.0.15"; +in { + discord = super.discord.overrideAttrs (old: { + inherit version; src = builtins.fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";