modules/applications/alacritty.nix

@@ -23,8 +23,8 @@
           key_bindings = [
             # Used for word completion in fish_user_key_bindings
             {
-              key = "Return";
+              key = "L";
-              mods = "Shift";
+              mods = "Control|Shift";
               chars = "\\x1F";
             }
             # Used for searching nixpkgs in fish_user_key_bindings

modules/applications/kitty.nix

@@ -9,10 +9,7 @@
         environment = { };
         extraConfig = "";
         font.size = 14;
-        keybindings = {
+        keybindings = { };
-          "shift+enter" = "send_text all \\x1F";
-          "super+f" = "toggle_fullscreen";
-        };
         settings = {
 
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)

modules/graphical/i3.nix

@@ -7,8 +7,7 @@ let
   lockUpdate =
     "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.gui.wallpaper} --display 1 --span";
 
-in
+in {
-{
 
   config = {
 
@@ -28,8 +27,7 @@ in
       xsession.windowManager.i3 = {
         enable = config.services.xserver.enable;
         package = pkgs.i3-gaps;
-        config =
+        config = let
-          let
           modifier = "Mod4"; # Super key
           ws1 = "1:I";
           ws2 = "2:II";
@@ -41,18 +39,16 @@ in
           ws8 = "8:VIII";
           ws9 = "9:IX";
           ws10 = "10:X";
-          in
+        in {
-          {
           modifier = modifier;
           assigns = {
             "${ws1}" = [{ class = "Firefox"; }];
-              "${ws2}" = [{ class = "kitty"; }];
+            "${ws2}" = [{ class = "Alacritty"; }];
             "${ws3}" = [{ class = "discord"; }];
             "${ws4}" = [{ class = "Steam"; }];
           };
           bars = [{ command = "echo"; }]; # Disable i3bar
-            colors =
+          colors = let
-              let
             background = config.colorscheme.base00;
             inactiveBackground = config.colorscheme.base01;
             border = config.colorscheme.base01;
@@ -61,8 +57,7 @@ in
             inactiveText = config.colorscheme.base04;
             urgentBackground = config.colorscheme.base08;
             indicator = "#00000000";
-              in
+          in {
-              {
             background = config.colorscheme.base00;
             focused = {
               inherit background indicator text border;
@@ -116,7 +111,7 @@ in
 
             # Launchers
             "${modifier}+Return" =
-                "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
+              "exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
             "${modifier}+space" =
               "exec --no-startup-id ${config.gui.launcherCommand}";
             "${modifier}+Shift+s" =
@@ -215,13 +210,7 @@ in
               notification = false;
             }
             {
-                command =
+              command = "i3-msg workspace ${ws1}";
-                  "i3-msg workspace ${ws2}, move workspace to output right";
-                notification = false;
-              }
-              {
-                command =
-                  "i3-msg workspace ${ws1}, move workspace to output left";
               notification = false;
             }
           ];
@@ -258,8 +247,7 @@ in
       # Update lock screen cache only if cache is empty
       home.activation.updateLockScreenCache =
         let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
-        in
+        in lib.mkIf config.services.xserver.enable
-        lib.mkIf config.services.xserver.enable
         (config.home-manager.users.${config.user}.lib.dag.entryAfter
           [ "writeBoundary" ] ''
             if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then

windows/alacritty.yml

@@ -720,7 +720,7 @@ shell:
 # in the order they were defined in.
 key_bindings:
   # Used for word completion in fish_user_key_bindings
-  - { key: Return, mods: Shift, chars: "\x1F" }
+  - { key: L, mods: Control|Shift, chars: "\x1F" }
   # Used for searching nixpkgs in fish_user_key_bindings
   - { key: N, mods: Control|Shift, chars: "\x11F" }
   - { key: H, mods: Control|Shift, mode: ~Vi, action: ToggleViMode }