steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

adjust to nixos 21.05

Browse source
This commit is contained in:
steveej 2021-06-08 12:39:01 +02:00
parent 454aa6e386
commit 1242a8e215
14 changed files with 145 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/os/devices/steveej-t14/hw.nix
View file

@ -7,11 +7,8 @@ let
"nvme"
"nvme_core"
"pcieport"
"thunderbolt"
"e1000e"
"xhci_pci"
"hxci_hcd"
];
in

8
nix/os/devices/steveej-t14/versions.tmpl.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
@ -24,7 +24,7 @@ in
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "release-21.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}

6
nix/os/profiles/graphical/system.nix
View file

@ -38,7 +38,7 @@
services.xserver = {
enable = true;
libinput.enable = true;
libinput.naturalScrolling = true;
libinput.touchpad.naturalScrolling = true;
videoDrivers = [ "qxl" "modesetting" "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
xkbVariant = "altgr-intl";
@ -46,7 +46,7 @@
desktopManager = {
# FIXME: gnome should be moved to user session
gnome3.enable = true;
gnome.enable = true;
xterm.enable = true;
plasma5.enable = false;
@ -77,7 +77,7 @@
programs.gnome-documents.enable = false;
programs.gnome-disks.enable = false;
services.gnome3 = {
services.gnome = {
# gnome-online-miners.enable = false; TODO: enable this again
games.enable = false;
gnome-remote-desktop.enable = false;