This commit is contained in:
dusk 2021-06-16 18:19:07 +03:00
parent 9f6a8af128
commit 2394d9ec50
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 16 additions and 11 deletions

View File

@ -37,6 +37,8 @@
digga.lib.mkFlake { digga.lib.mkFlake {
inherit self inputs; inherit self inputs;
lib = import ./lib { lib = digga.lib // nixos.lib; };
channelsConfig = { channelsConfig = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
@ -60,8 +62,6 @@
latest = { }; latest = { };
}; };
lib = import ./lib { lib = digga.lib // nixos.lib; };
sharedOverlays = [ sharedOverlays = [
(final: prev: { (final: prev: {
lib = prev.lib.extend (lfinal: lprev: { lib = prev.lib.extend (lfinal: lprev: {
@ -89,19 +89,23 @@
/* set host specific properties here */ /* set host specific properties here */
NixOS = { }; NixOS = { };
}; };
profiles = [ ./profiles ./users ]; importables = rec {
suites = { profiles, users, ... }: with profiles; { profiles = (digga.lib.importers.rakeLeaves ./profiles) // { users = digga.lib.importers.rakeLeaves ./users; };
base = [ cachix core users.root ]; suites = with profiles; {
work = [ users.patriot develop ]; base = [ cachix core users.root ];
work = [ users.patriot develop ];
};
}; };
}; };
home = { home = {
modules = ./users/modules/module-list.nix; modules = ./users/modules/module-list.nix;
externalModules = [ ]; externalModules = [ ];
profiles = [ ./users/profiles ]; importables = rec {
suites = { profiles, ... }: with profiles; { profiles = digga.lib.importers.rakeLeaves ./users/profiles;
base = [ direnv git starship ]; suites = with profiles; {
base = [ direnv git starship ];
};
}; };
}; };

View File

@ -1,12 +1,12 @@
final: prev: rec { final: prev: rec {
discord-canary-system = prev.callPackage mkDiscord (rec { discord-canary-system = prev.callPackage mkDiscord (rec {
pname = "discord-canary"; pname = "discord-canary";
version = "0.0.124"; version = "0.0.125";
binaryName = "DiscordCanary"; binaryName = "DiscordCanary";
desktopName = "Discord Canary"; desktopName = "Discord Canary";
src = prev.fetchurl { src = prev.fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-Ie37ju2eg6oPwaB0LQ5WPoBiduhqbAJ5RNQXm1O+Hhg="; sha256 = "sha256-L/1K1R0eFr9MyHPaZgcOwWWWJQmq9jRYJYXufKhRxVM=";
}; };
isWayland = true; isWayland = true;
extraOptions = [ extraOptions = [

View File

@ -870,6 +870,7 @@ in
(mkExt "material-icon-theme" "4.6.0" "PKief" "sha256-i+3lrw3mDqK2vTMDhJYTACW5JleA+lN1XAC2imgQLUo=") (mkExt "material-icon-theme" "4.6.0" "PKief" "sha256-i+3lrw3mDqK2vTMDhJYTACW5JleA+lN1XAC2imgQLUo=")
(mkExt "github-vscode-theme" "4.1.1" "GitHub" "sha256-yLySHOx6pe7w2cyi95pQlKkn/o4VMCTkrTYHu8ASn5M=") (mkExt "github-vscode-theme" "4.1.1" "GitHub" "sha256-yLySHOx6pe7w2cyi95pQlKkn/o4VMCTkrTYHu8ASn5M=")
(mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=") (mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=")
(mkExt "vscode-rhai" "0.6.3" "rhaiscript" "sha256-gEdpM/TkkiZ50bG9qDU6BH04AJLRDcHLquniRs6m0mg=")
]) ++ (with pkgs.vscode-extensions; [ a5huynh.vscode-ron vadimcn.vscode-lldb jnoortheen.nix-ide ]); ]) ++ (with pkgs.vscode-extensions; [ a5huynh.vscode-ron vadimcn.vscode-lldb jnoortheen.nix-ide ]);
userSettings = { userSettings = {
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";