Compare commits

..

2 Commits

Author SHA1 Message Date
Noah Masur
969e89cda3 set kitty to default in i3 2022-10-31 20:47:42 -04:00
Noah Masur
38695b29bd use shift+enter for completion in terminal 2022-10-31 20:47:33 -04:00
4 changed files with 225 additions and 210 deletions

View File

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

View File

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

View File

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

View File

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