update nixos to 20.03

This commit is contained in:
Haak Saxberg 2020-06-08 22:54:02 -07:00
parent e44b14438a
commit 77cce70b7e
2 changed files with 14 additions and 7 deletions

View file

@ -15,9 +15,10 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.networkmanager.enable = true;
networking.hostName = "athena"; # Define your hostname.
# Create entries for /etc/wpa_supplicant.conf by running `wpa_passphrase SSID PASSWORD`
networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
@ -29,10 +30,13 @@
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
console = {
font = "Fira Code";
keyMap = "us";
};
# Select internationalisation properties.
i18n = {
consoleFont = "Fira Code";
consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8";
};
# run the following command to swap escape and caps-lock keys, like a
@ -48,6 +52,7 @@
cachix
firefox
inkscape
plasma-browser-integration
unzip
vim
wget
@ -56,6 +61,8 @@
zsh
];
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
fonts.fonts = with pkgs; [ fira-code ];
# Some programs need SUID wrappers, can be configured further or are
@ -128,6 +135,7 @@
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "19.09"; # Did you read the comment?
system.stateVersion = "20.03"; # Did you read the comment?
system.autoUpgrade.enable = true;
}

View file

@ -35,8 +35,7 @@ in {
jq
keybase
lastpass-cli
(let neuronSrc = builtins.fetchTarball https://github.com/srid/neuron/archive/master.tar.gz;
in import neuronSrc)
lorri
nox
tree
ranger
@ -46,9 +45,9 @@ in {
zsh-history-substring-search
zsh-syntax-highlighting
] ++ (if pkgs.stdenv.isDarwin then [
lorri
skhd # keyboard shortcut daemon for macOS
] else [
calibre
slack
]);