upgrade to NixOS 20.03

This commit is contained in:
Trolli Schmittlauch 2020-03-08 02:10:28 +01:00
parent fcb93efd54
commit 29d9a4ef16
2 changed files with 11 additions and 8 deletions

View file

@ -41,11 +41,11 @@ let
pdfpc pdfpc
quaternion quaternion
nheko nheko
(unstable.spectral) unstable.spectral
wire-desktop wire-desktop
gpx-viewer gpx-viewer
gpxsee gpxsee
unstable.cawbird cawbird
tootle tootle
subsurface subsurface
( (
@ -248,7 +248,6 @@ let
ubuntu_font_family ubuntu_font_family
twemoji-color-font twemoji-color-font
opensans-ttf opensans-ttf
(iosevka.override { design = [ "slab" "term" ]; set = "serif"; })
(iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; }) (iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; })
# TODO: vollkorn # TODO: vollkorn
# TODO: humor-sans # TODO: humor-sans
@ -298,7 +297,7 @@ in
{ {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
#pinentryFlavor = "qt"; pinentryFlavor = "qt";
}; };
programs.ssh = programs.ssh =

View file

@ -18,7 +18,7 @@ in
( (
builtins.fetchGit { builtins.fetchGit {
url = "https://github.com/NixOS/nixos-hardware"; url = "https://github.com/NixOS/nixos-hardware";
rev = "c0182a06982f82a47356c91d78d80d2af29bd7f1"; rev = "62a1812f3c20b7119013650f926806fecd956574";
} + "/lenovo/thinkpad/t440s" } + "/lenovo/thinkpad/t440s"
) )
# home manager integration # home manager integration
@ -44,7 +44,7 @@ in
services.davfs2.enable = true; services.davfs2.enable = true;
# try newer kernels # try newer kernels
boot.kernelPackages = pkgs.linuxPackages_latest; #boot.kernelPackages = pkgs.linuxPackages_latest;
services.fstrim.enable = true; services.fstrim.enable = true;
services.btrfs.autoScrub = services.btrfs.autoScrub =
@ -82,10 +82,14 @@ in
networking.hostName = "thinknix"; networking.hostName = "thinknix";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# configure console
console = {
font = "Lat2-Terminus16";
keyMap = "de";
};
# Select internationalisation properties. # Select internationalisation properties.
i18n = { i18n = {
consoleFont = "Lat2-Terminus16";
consoleKeyMap = "de";
defaultLocale = "de_DE.UTF-8"; defaultLocale = "de_DE.UTF-8";
}; };