feat: the overlay stuff actually works now!
This commit is contained in:
parent
c079ae71ca
commit
afc6d178f0
|
@ -1,7 +1,6 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
imports = [ ./modules ];
|
||||
|
||||
nixpkgs.config.allowBroken = true;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
@ -95,5 +94,6 @@
|
|||
system.stateVersion = "21.11";
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.allowBroken = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -23,10 +23,14 @@
|
|||
};
|
||||
|
||||
outputs = inputs@{ self, nixpkgs, home-manager, ... }:
|
||||
let provideInputs = import ./modules/overlays/flakes.nix inputs;
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
provideInputs =
|
||||
import ./modules/overlays/flakes.nix { inherit system; } inputs;
|
||||
in {
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
inherit system;
|
||||
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
provideInputs
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
# fceux
|
||||
|
||||
# games
|
||||
tetrio-desktop
|
||||
# tetrio-desktop
|
||||
# mindustry
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
nixpkgs.overlays = [ import ./discord ];
|
||||
{ pkgs, ... }: {
|
||||
nixpkgs.overlays = [ (import ./tweakSources.nix) ];
|
||||
# imports = [ ./legacy.nix ];
|
||||
}
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
self: super:
|
||||
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";
|
||||
sha256 = "0pn2qczim79hqk2limgh88fsn93sa8wvana74mpdk5n6x5afkvdd";
|
||||
};
|
||||
});
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
{ system }:
|
||||
{ home-manager, nixpkgs-unstable, nixos-unstable, easy-purescript-nix
|
||||
, easy-dhall-nix, z, agnoster, ... }:
|
||||
({ pkgs, ... }: {
|
||||
|
@ -5,6 +6,7 @@
|
|||
(self: super: {
|
||||
# inherit nixos-unstable;
|
||||
unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config.allowBroken = true;
|
||||
};
|
||||
|
|
17
modules/overlays/tweakSources.nix
Normal file
17
modules/overlays/tweakSources.nix
Normal file
|
@ -0,0 +1,17 @@
|
|||
self: super:
|
||||
with self; {
|
||||
discord = unstable.discord;
|
||||
vscode = unstable.vscode;
|
||||
}
|
||||
# let version = "0.0.15";
|
||||
# in self
|
||||
# {
|
||||
# discord = super.discord.overrideAttrs (old: {
|
||||
# inherit version;
|
||||
# src = builtins.fetchurl {
|
||||
# url =
|
||||
# "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
# sha256 = "0pn2qczim79hqk2limgh88fsn93sa8wvana74mpdk5n6x5afkvdd";
|
||||
# };
|
||||
# });
|
||||
# }
|
Loading…
Reference in a new issue