diff options
| -rw-r--r-- | users/wpcarro/nixos/ava/default.nix | 6 | ||||
| -rw-r--r-- | users/wpcarro/nixos/kyoko/default.nix | 6 | ||||
| -rw-r--r-- | users/wpcarro/nixos/marcus/default.nix | 6 | ||||
| -rw-r--r-- | users/wpcarro/nixos/tarasco/default.nix | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/users/wpcarro/nixos/ava/default.nix b/users/wpcarro/nixos/ava/default.nix index a123f454ca29..25c43c003fd4 100644 --- a/users/wpcarro/nixos/ava/default.nix +++ b/users/wpcarro/nixos/ava/default.nix @@ -62,8 +62,8 @@ in xserver = { enable = true; - layout = "us"; - xkbOptions = "caps:escape"; + xkb.layout = "us"; + xkb.options = "caps:escape"; displayManager = { # Give EXWM permission to control the session (from tazjin's setup). sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +SI:localhost:$USER"; @@ -106,7 +106,7 @@ in security.sudo.wheelNeedsPassword = false; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ jetbrains-mono ]; diff --git a/users/wpcarro/nixos/kyoko/default.nix b/users/wpcarro/nixos/kyoko/default.nix index 4bfa29cb8e91..0d8907edd2f0 100644 --- a/users/wpcarro/nixos/kyoko/default.nix +++ b/users/wpcarro/nixos/kyoko/default.nix @@ -65,8 +65,8 @@ in xserver = { enable = true; - layout = "us"; - xkbOptions = "caps:escape"; + xkb.layout = "us"; + xkb.options = "caps:escape"; displayManager = { # Give EXWM permission to control the session (from tazjin's setup). sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +SI:localhost:$USER"; @@ -109,7 +109,7 @@ in security.sudo.wheelNeedsPassword = false; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ jetbrains-mono ]; diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 355b50e17422..a97d6d264de6 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -57,8 +57,8 @@ in touchpad.naturalScrolling = false; touchpad.tapping = false; }; - layout = "us"; - xkbOptions = "caps:escape"; + xkb.layout = "us"; + xkb.options = "caps:escape"; displayManager = { # Give EXWM permission to control the session (from tazjin's setup). sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +SI:localhost:$USER"; @@ -96,7 +96,7 @@ in security.sudo.wheelNeedsPassword = false; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ jetbrains-mono ]; diff --git a/users/wpcarro/nixos/tarasco/default.nix b/users/wpcarro/nixos/tarasco/default.nix index a888ab6b4ead..7033caa11ab8 100644 --- a/users/wpcarro/nixos/tarasco/default.nix +++ b/users/wpcarro/nixos/tarasco/default.nix @@ -58,8 +58,8 @@ in xserver = { enable = true; - layout = "us"; - xkbOptions = "caps:escape"; + xkb.layout = "us"; + xkb.options = "caps:escape"; displayManager = { # Give EXWM permission to control the session (from tazjin's setup). sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +SI:localhost:$USER"; @@ -101,7 +101,7 @@ in security.sudo.wheelNeedsPassword = false; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ jetbrains-mono ]; |