diff --git a/home-manager/features/development-macos.nix b/home-manager/features/development-macos.nix new file mode 100644 index 0000000..ebba632 --- /dev/null +++ b/home-manager/features/development-macos.nix @@ -0,0 +1,11 @@ + +# Meta-package for development on linux +{ lib, ... }: +{ + imports = [ + ./development.nix + ]; + + # OS X seems to render these fonts a bit smaller than Linux + programs.alacritty.settings.font.size = lib.mkForce 14; +} diff --git a/home-manager/features/macos/default.nix b/home-manager/features/macos/default.nix index 4cd4c78..87f1dc4 100644 --- a/home-manager/features/macos/default.nix +++ b/home-manager/features/macos/default.nix @@ -5,6 +5,6 @@ skhd ]; - home.file.".yabairc".source = ./config/yabairc; - home.file.".skhdrc".source = ./config/skhdrc; + home.file.".yabairc".source = ./config/yabairc; + home.file.".skhdrc".source = ./config/skhdrc; } diff --git a/home-manager/features/neovim/config/lua/config/options.lua b/home-manager/features/neovim/config/lua/config/options.lua index 3ea1454..2e4fc60 100644 --- a/home-manager/features/neovim/config/lua/config/options.lua +++ b/home-manager/features/neovim/config/lua/config/options.lua @@ -1,3 +1,6 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here + +-- Creates a shortcut for adding the directory of the current buffer when specifying a file +vim.cmd.('cnoreabbrev %. %:h') diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix index 6fb54e0..386acae 100644 --- a/home-manager/features/terminal.nix +++ b/home-manager/features/terminal.nix @@ -72,4 +72,19 @@ }; }; }; + + programs.ssh = { + enable = true; + matchBlocks = { + "*" = { + setEnv = { + # Alacritty sets it's terminfo to 'alacritty' so that environments can have + # complete functionality support. However, this doesn't work well when making + # remove connections. So we set it to 'xterm-256color' which is a more common + # terminfo. + "TERM" = "xterm-256color"; + }; + }; + }; + }; } diff --git a/system/hosts/tarro-mbp/drew.nix b/system/hosts/tarro-mbp/drew.nix index e070f00..c3f52a0 100644 --- a/system/hosts/tarro-mbp/drew.nix +++ b/system/hosts/tarro-mbp/drew.nix @@ -1,7 +1,7 @@ { pkgs, self, ... }: { imports = [ - ../../../home-manager/features/development.nix + ../../../home-manager/features/development-macos.nix ../../../home-manager/features/kubernetes.nix ../../../home-manager/features/macos ../../../home-manager/features/nix.nix