fixes for kitty on macos

This commit is contained in:
Noah Masur 2022-11-03 11:25:36 -04:00
parent 9386008fa2
commit 15f4116178
3 changed files with 24 additions and 23 deletions

View File

@ -3,15 +3,13 @@
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
home.packages = with pkgs; home.packages = with pkgs;
[ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; [ (nerdfonts.override { fonts = [ "Victor Mono" ]; }) ];
programs.alacritty.settings = { programs.alacritty.settings = { font.normal.family = "Victor Mono"; };
font.normal.family = "FiraCode Nerd Font Mono";
};
programs.kitty.font = { programs.kitty.font = {
package = pkgs.nerdfonts; package = pkgs.nerdfonts;
name = "FiraCode"; name = "Victor Mono";
}; };
}; };

View File

@ -9,24 +9,25 @@ WORK_RIGHT_MONITOR = "DELL U2415 (1)"
LAPTOP_MONITOR = "Built-in Retina Display" LAPTOP_MONITOR = "Built-in Retina Display"
-- Used to find out the name of the monitor in Hammerspoon -- Used to find out the name of the monitor in Hammerspoon
function dump(o) -- local function dump(o)
if type(o) == "table" then -- if type(o) == "table" then
local s = "{ " -- local s = "{ "
for k, v in pairs(o) do -- for k, v in pairs(o) do
if type(k) ~= "number" then -- if type(k) ~= "number" then
k = '"' .. k .. '"' -- k = '"' .. k .. '"'
end -- end
s = s .. "[" .. k .. "] = " .. dump(v) .. "," -- s = s .. "[" .. k .. "] = " .. dump(v) .. ","
end -- end
return s .. "} " -- return s .. "} "
else -- else
return tostring(o) -- return tostring(o)
end -- end
end -- end
-- Turn on when looking for the monitor name -- Turn on when looking for the monitor name
-- print(dump(hs.screen.allScreens())) -- print(dump(hs.screen.allScreens()))
function concat(...) local function concat(...)
local res = {} local res = {}
for _, tab in ipairs({ ... }) do for _, tab in ipairs({ ... }) do
for _, elem in ipairs(tab) do for _, elem in ipairs(tab) do
@ -36,12 +37,12 @@ function concat(...)
return res return res
end end
function worklayout() local function worklayout()
hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "l", function() hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "l", function()
local u = hs.geometry.unitrect local u = hs.geometry.unitrect
-- set the layout -- set the layout
local left = { local left = {
-- { "Alacritty", nil, WORK_LEFT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true }, { "kitty", nil, WORK_LEFT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
} }
local right = { local right = {
{ "Slack", nil, WORK_RIGHT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true }, { "Slack", nil, WORK_RIGHT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },

View File

@ -1,7 +1,9 @@
{ ... }: { { pkgs, ... }: {
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
environment.shells = [ pkgs.fish ];
security.pam.enableSudoTouchIdAuth = true; security.pam.enableSudoTouchIdAuth = true;
system = { system = {