cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove vultr as builder, fix mindforger

Browse source
This commit is contained in:
Cyryl Płotnicki 2021-05-10 19:49:51 +01:00
parent 6c86464dd9
commit 525cb9908d
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/common.nix
View file

@ -3,6 +3,7 @@
let let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz; unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz;
bisqTarball = fetchTarball https://github.com/emmanuelrosa/nixpkgs/archive/6ee154d2bc8c4c48cde2d7ae5bcd0a3da28b2b72.tar.gz; bisqTarball = fetchTarball https://github.com/emmanuelrosa/nixpkgs/archive/6ee154d2bc8c4c48cde2d7ae5bcd0a3da28b2b72.tar.gz;
mindforgerTarball = fetchTarball https://github.com/cyplo/nixpkgs/archive/80286e3d62406777c08c4afbeeb5deeb1c44062b.tar.gz;
nurTarball = fetchTarball https://github.com/nix-community/NUR/archive/master.tar.gz; nurTarball = fetchTarball https://github.com/nix-community/NUR/archive/master.tar.gz;
in in
{ {
@ -27,6 +28,9 @@ in
bisq = import bisqTarball { bisq = import bisqTarball {
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
mindforgerPatched = import mindforgerTarball {
config = config.nixpkgs.config;
};
nur = import nurTarball { nur = import nurTarball {
inherit pkgs; inherit pkgs;
}; };

10
nixos/distributed-builds.nix
View file

@ -15,16 +15,6 @@
supportedFeatures = [ "kvm" ]; supportedFeatures = [ "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
} }
{
hostName = "vultr1.vpn";
sshUser = "nix-builder";
sshKey = "/home/cyryl/.ssh/id_ed25519";
system = "x86_64-linux";
maxJobs = 2;
speedFactor = 1;
supportedFeatures = [ ];
mandatoryFeatures = [ ];
}
]; ];
nix.extraOptions = '' nix.extraOptions = ''

10
nixos/gui/default.nix
View file

@ -19,7 +19,6 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
wineFull
anarchism anarchism
apvlv apvlv
digikam digikam
@ -32,12 +31,15 @@
gnome3.nautilus gnome3.nautilus
gsettings-desktop-schemas gsettings-desktop-schemas
keybase-gui keybase-gui
libreoffice simple-scan libreoffice
mindforgerPatched.mindforger
passff-host passff-host
python38Packages.binwalk-full python38Packages.binwalk-full
qemu aqemu qemu aqemu
shotwell
simple-scan
slack slack
spotify shotwell spotify
ssb-patchwork ssb-patchwork
unstable.discord unstable.discord
unstable.electrum unstable.electrum
@ -45,12 +47,12 @@
unstable.ghidra-bin unstable.ghidra-bin
unstable.hopper unstable.hopper
unstable.inkscape unstable.inkscape
unstable.mindforger
unstable.openscad unstable.openscad
unstable.qcad unstable.qcad
unstable.signal-desktop unstable.signal-desktop
unstable.wireshark unstable.wireshark
vlc vlc
wineFull
xclip xclip
xidlehook xidlehook
yubico-piv-tool yubico-piv-tool