diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index 27d8aa6..1b8e70a 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -67,9 +67,9 @@ }; input = { "1241:662:USB-HID_Keyboard" = { - xkb_layout = "us"; - xkb_variant = ""; - xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps"; + xkb_layout = "us,us"; + xkb_variant = "colemak,"; + xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps,grp:sclk_toggle,grp_led:scroll"; xkb_numlock = "enabled"; }; "1133:49257:Logitech_USB_Laser_Mouse" = { @@ -318,6 +318,7 @@ programs = { sway = { enable = true; + package = pkgs.swayfx; wrapperFeatures = { gtk = true; base = true; diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index 6b2f895..99bed25 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -65,7 +65,7 @@ in restart = true; settings = { default_session = { - command = "${pkgs.sway}/bin/sway --unsupported-gpu --config /etc/greetd/sway-config"; + command = "${config.programs.sway.package}/bin/sway --unsupported-gpu --config /etc/greetd/sway-config"; }; }; }; diff --git a/users/erwin/work.nix b/users/erwin/work.nix index c8389cc..bc5ebab 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -145,6 +145,7 @@ in starship.enable = true; sway = { enable = true; + package = pkgs.swayfx; wayvnc = true; lock-wallpaper = ../../wallpapers/river-3840.png; output = {