fix
This commit is contained in:
parent
6402cb4f35
commit
107dd81aab
@ -180,7 +180,7 @@ in
|
|||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
fontconfig.enable = true;
|
fontconfig.enable = true;
|
||||||
fonts = [ pkgs.dejavu_fonts ];
|
fonts = [ pkgs.dejavu_fonts ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -12,18 +12,6 @@ channels: final: prev: {
|
|||||||
signal-desktop
|
signal-desktop
|
||||||
starship;
|
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
|
haskellPackages = prev.haskellPackages.override
|
||||||
(old: {
|
(old: {
|
||||||
@ -36,5 +24,4 @@ channels: final: prev: {
|
|||||||
haskell-language-server;
|
haskell-language-server;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
>>>>>>> upstream/develop
|
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ in
|
|||||||
programs.command-not-found.enable = false;
|
programs.command-not-found.enable = false;
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
users.mutableUsers = false;
|
users.mutableUsers = false;
|
||||||
|
|
||||||
# For rage encryption, all hosts need a ssh key pair
|
# For rage encryption, all hosts need a ssh key pair
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user