dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
dusk 2021-07-24 16:51:53 +03:00
parent 6402cb4f35
commit 107dd81aab
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/lungmen.nix
View File

@ -180,7 +180,7 @@ in
fonts = {
enableDefaultFonts = true;
fontconfig.enable = true;
fontconfig.enable = true;
fonts = [ pkgs.dejavu_fonts ];
};

13
overlays/overrides.nix
View File

@ -12,18 +12,6 @@ channels: final: prev: {
signal-desktop
starship;
<<<<<<< HEAD
haskellPackages = prev.haskellPackages.override {
overrides = hfinal: hprev:
let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
in
{
# same for haskell packages, matching ghc versions
inherit (channels.latest.haskell.packages."ghc${version}")
haskell-language-server;
};
};
=======
haskellPackages = prev.haskellPackages.override
(old: {
@ -36,5 +24,4 @@ channels: final: prev: {
haskell-language-server;
});
});
>>>>>>> upstream/develop
}

2
profiles/core/default.nix
View File

@ -166,7 +166,7 @@ in
programs.command-not-found.enable = false;
home-manager.useGlobalPkgs = true;
users.mutableUsers = false;
# For rage encryption, all hosts need a ssh key pair
services.openssh = {
enable = true;