VSinerva/nixos-conf
1
0
Fork 0
Code Activity Actions

Update options to be in line with 24.05

Browse source
This commit is contained in:
Vili Sinervä 2024-06-01 12:46:00 +03:00
parent a37ecd626b
commit 22aec3c470
No known key found for this signature in database
GPG key ID: DF8FEAF54EFAC996
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base.nix
View file

@ -95,8 +95,10 @@
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
services.xserver.layout = "us,"; services.xserver.xkb = {
services.xserver.xkbVariant = "de_se_fi,"; layout = "us,";
variant = "de_se_fi,";
};
console = pkgs.lib.mkForce { console = pkgs.lib.mkForce {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
useXkbConfig = true; # use xkbOptions in tty. useXkbConfig = true; # use xkbOptions in tty.

10
desktop.nix
View file

@ -486,13 +486,15 @@ in
]; ];
services = { services = {
displayManager = {
defaultSession = "none+i3";
autoLogin.enable = true;
autoLogin.user = "vili";
};
xserver = { xserver = {
enable = true; enable = true;
displayManager = { displayManager = {
defaultSession = "none+i3";
lightdm.enable = true; lightdm.enable = true;
autoLogin.enable = true;
autoLogin.user = "vili";
sessionCommands = ''${pkgs.xorg.xrdb}/bin/xrdb -merge < ${Xresources}''; sessionCommands = ''${pkgs.xorg.xrdb}/bin/xrdb -merge < ${Xresources}'';
}; };
windowManager.i3 = { windowManager.i3 = {
@ -504,7 +506,7 @@ in
printing.enable = true; printing.enable = true;
avahi = { avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
}; };

2
machine-confs/helium.nix
View file

@ -75,7 +75,7 @@ in
../development.nix ../development.nix
../misc/libinput.nix ../misc/libinput.nix
]; ];
disabledModules = [ "services/x11/hardware/libinput.nix" ]; disabledModules = [ "services/hardware/libinput.nix" ];
nixpkgs.overlays = nixpkgs.overlays =
[ [