prescientmoon/satellite
1
Fork 0
Code Activity

feat: the overlay stuff actually works now!

Browse source
This commit is contained in:
Matei Adriel 2022-01-25 12:26:06 +02:00
parent c079ae71ca
commit afc6d178f0
7 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -1,7 +1,6 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }: {
imports = [ ./modules ]; imports = [ ./modules ];
nixpkgs.config.allowBroken = true;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -95,5 +94,6 @@
system.stateVersion = "21.11"; system.stateVersion = "21.11";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.allowBroken = true;
} }

8
flake.nix
View file

@ -23,10 +23,14 @@
}; };
outputs = inputs@{ self, nixpkgs, home-manager, ... }: 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 { in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
provideInputs provideInputs

2
modules/applications/misc.nix
View file

@ -71,7 +71,7 @@
# fceux # fceux
# games # games
tetrio-desktop # tetrio-desktop
# mindustry # mindustry
]; ];
} }

4
modules/overlays/default.nix
View file

@ -1,4 +1,4 @@
{ ... }: { { pkgs, ... }: {
nixpkgs.overlays = [ import ./discord ]; nixpkgs.overlays = [ (import ./tweakSources.nix) ];
# imports = [ ./legacy.nix ]; # imports = [ ./legacy.nix ];
} }

12
modules/overlays/discord.nix
View file

@ -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";
};
});
}

2
modules/overlays/flakes.nix
View file

@ -1,3 +1,4 @@
{ system }:
{ home-manager, nixpkgs-unstable, nixos-unstable, easy-purescript-nix { home-manager, nixpkgs-unstable, nixos-unstable, easy-purescript-nix
, easy-dhall-nix, z, agnoster, ... }: , easy-dhall-nix, z, agnoster, ... }:
({ pkgs, ... }: { ({ pkgs, ... }: {
@ -5,6 +6,7 @@
(self: super: { (self: super: {
# inherit nixos-unstable; # inherit nixos-unstable;
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true; config.allowUnfree = true;
config.allowBroken = true; config.allowBroken = true;
}; };

17
modules/overlays/tweakSources.nix Normal file
View 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";
# };
# });
# }