diff --git a/common/wezterm/wezterm.lua b/common/wezterm/wezterm.lua index 1068a96..c6e1035 100644 --- a/common/wezterm/wezterm.lua +++ b/common/wezterm/wezterm.lua @@ -8,7 +8,7 @@ if wezterm.config_builder then end local hostname = io.popen("/bin/hostname"):read("*a"):gsub("%s", "") -local font_spec = { family = 'IosevkaLyteTerm', weight = 'Regular', italic = false } +local font_spec = { family = 'IosevkaLyteTerm', weight = 'Medium', italic = false } local font_size = 12.0 if hostname == "laptop" then @@ -39,7 +39,7 @@ config.font_size = font_size config.hide_tab_bar_if_only_one_tab = true config.use_fancy_tab_bar = false -config.tab_bar_at_bottom = true +config.tab_bar_at_bottom = false config.window_background_opacity = 1.0 config.color_scheme = "Catppuccin Mocha" @@ -53,11 +53,11 @@ config.inactive_pane_hsb = { } config.keys = { - -- { - -- key = 'j', - -- mods = 'CTRL', - -- action = wezterm.action.ActivatePaneDirection'Down' - -- }, + { + key = 'j', + mods = 'CTRL', + action = wezterm.action.ActivatePaneDirection'Down' + }, { key = 'Insert', mods = 'SHIFT', @@ -83,16 +83,16 @@ config.keys = { mods = 'CTRL', action = wezterm.action.ActivatePaneDirection'Up' }, - -- { - -- key = 'j', - -- mods = 'CTRL|SHIFT', - -- action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} - -- }, - -- { - -- key = 'l', - -- mods = 'CTRL|SHIFT', - -- action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} - -- }, + { + key = 'j', + mods = 'CTRL|SHIFT', + action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} + }, + { + key = 'l', + mods = 'CTRL|SHIFT', + action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} + }, { key = 'l', mods = 'CTRL|SHIFT|ALT', @@ -105,7 +105,15 @@ config.keys = { }, } --- config.default_gui_startup_args = { 'connect', 'unix' } +config.unix_domains = { + { + name = 'unix', + local_echo_threshold_ms = 10, + }, +} + +config.default_gui_startup_args = { 'connect', 'unix' } +config.default_domain = 'unix' config.window_padding = { top = '0.5cell', diff --git a/os/linux/nix/flake.nix b/os/linux/nix/flake.nix index fee7509..7836590 100644 --- a/os/linux/nix/flake.nix +++ b/os/linux/nix/flake.nix @@ -28,10 +28,12 @@ nixosConfigurations = { beefcake = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = { inherit inputs; }; modules = [ ./machines/beefcake.nix inputs.home-manager.nixosModules.home-manager inputs.sops-nix.nixosModules.sops + inputs."api.lyte.dev".nixosModules."api.lyte.dev { home-manager.useGlobalPkgs = true; } diff --git a/os/linux/nix/machines/beefcake.nix b/os/linux/nix/machines/beefcake.nix index 17d57ee..4f5829e 100644 --- a/os/linux/nix/machines/beefcake.nix +++ b/os/linux/nix/machines/beefcake.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running 'nixos-help'). -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { nix.settings.experimental-features = [ "nix-command" "flakes" ]; imports = [ # @@ -201,6 +201,11 @@ }; }; + services."api.lyte.dev" = { + enable = true; + port = 5757; + }; + services.smartd.enable = true; services.caddy = { enable = true; @@ -215,6 +220,10 @@ reverse_proxy :8222 } + api.lyte.dev { + reverse_proxy :5757 + } + a.lyte.dev { reverse_proxy :8899 } diff --git a/os/linux/sway/config b/os/linux/sway/config index 3026cdc..7b4efc5 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -164,7 +164,7 @@ bar { swaybar_command waybar } -set $tilers "(kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*|Discord.*|discord.*)" +set $tilers "(wezterm.*|kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*|Discord.*|discord.*)" for_window [title=".*"] floating enable for_window [app_id=$tilers] floating disable bindsym $mod+shift+alt+f for_window [class=$tilers] floating toggle