Fixes to make pbp build again

This commit is contained in:
Andrea Ciceri 2022-01-12 11:51:56 +01:00
parent ddefe962cc
commit 1da0bea837
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
7 changed files with 10 additions and 9 deletions

View file

@ -4,6 +4,6 @@
./configuration.nix ./configuration.nix
] ++ suites.base; ] ++ suites.base;
bud.enable = true; bud.enable = false;
bud.localFlakeClone = "/home/ccr/fleet"; bud.localFlakeClone = "/home/ccr/fleet";
} }

View file

@ -26,7 +26,7 @@ in
nix-index nix-index
nmap nmap
ripgrep ripgrep
skim #skim
tealdeer tealdeer
tmux tmux
usbutils usbutils

View file

@ -25,8 +25,6 @@
gphoto2 gphoto2
digikam digikam
rawtherapee rawtherapee
freecad
openscad
deploy-rs.deploy-rs deploy-rs.deploy-rs
] ++ ] ++
(if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ]) (if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ])

View file

@ -1,8 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
openscad
] ++ (if !stdenv.hostPlatform.isAarch64 then [ ] ++ (if !stdenv.hostPlatform.isAarch64 then [
blender blender
freecad
] ]
else [ ]); else [ ]);
} }

View file

@ -35,7 +35,6 @@
fd fd
ffmpegthumbnailer ffmpegthumbnailer
graphviz-nox graphviz-nox
haskell-language-server
hunspell hunspell
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.it_IT hunspellDicts.it_IT
@ -59,6 +58,7 @@
) )
] ++ (if pkgs.system == "x86_64-linux" then [ ] ++ (if pkgs.system == "x86_64-linux" then [
python-language-server python-language-server
haskell-language-server
] ++ (with easy-ps; [ ] ++ (with easy-ps; [
# spago2nix # spago2nix
nodejs nodejs

View file

@ -57,8 +57,8 @@
''; '';
in in
lib.mkOptionDefault { lib.mkOptionDefault {
"${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs"; "${modifier}+x" = "exec emacs";
"${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox"; "${modifier}+b" = "exec firefox";
"${modifier}+s" = "exec ${screenshotScript}"; "${modifier}+s" = "exec ${screenshotScript}";
}; };
}; };

View file

@ -29,8 +29,9 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
haskell-language-server
stylish-haskell stylish-haskell
ghc ghc
]; ] ++ (if pkgs.system == "x86_64-linux" then [
haskell-language-server
] else [ ]);
} }