Compare commits

...

4 Commits

Author SHA1 Message Date
Noah Masur
7ae0649456 nixpkgs shortcut registries 2022-11-03 11:26:31 -04:00
Noah Masur
660ea997df fix standalone home-manager on macos 2022-11-03 11:25:58 -04:00
Noah Masur
15f4116178 fixes for kitty on macos 2022-11-03 11:25:36 -04:00
Noah Masur
9386008fa2 fix: identity file wrong path on macos 2022-11-03 11:24:03 -04:00
7 changed files with 30 additions and 29 deletions

View File

@ -14,7 +14,7 @@ darwin.lib.darwinSystem {
})
home-manager.darwinModules.home-manager
{
identityFile = "/home/${globals.user}/.ssh/id_ed25519";
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true;
colorscheme = (import ../../modules/colorscheme/gruvbox);
mailUser = globals.user;

View File

@ -3,15 +3,13 @@
home-manager.users.${config.user} = {
home.packages = with pkgs;
[ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
[ (nerdfonts.override { fonts = [ "Victor Mono" ]; }) ];
programs.alacritty.settings = {
font.normal.family = "FiraCode Nerd Font Mono";
};
programs.alacritty.settings = { font.normal.family = "Victor Mono"; };
programs.kitty.font = {
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"
-- Used to find out the name of the monitor in Hammerspoon
function dump(o)
if type(o) == "table" then
local s = "{ "
for k, v in pairs(o) do
if type(k) ~= "number" then
k = '"' .. k .. '"'
end
s = s .. "[" .. k .. "] = " .. dump(v) .. ","
end
return s .. "} "
else
return tostring(o)
end
end
-- local function dump(o)
-- if type(o) == "table" then
-- local s = "{ "
-- for k, v in pairs(o) do
-- if type(k) ~= "number" then
-- k = '"' .. k .. '"'
-- end
-- s = s .. "[" .. k .. "] = " .. dump(v) .. ","
-- end
-- return s .. "} "
-- else
-- return tostring(o)
-- end
-- end
-- Turn on when looking for the monitor name
-- print(dump(hs.screen.allScreens()))
function concat(...)
local function concat(...)
local res = {}
for _, tab in ipairs({ ... }) do
for _, elem in ipairs(tab) do
@ -36,12 +37,12 @@ function concat(...)
return res
end
function worklayout()
local function worklayout()
hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "l", function()
local u = hs.geometry.unitrect
-- set the layout
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 = {
{ "Slack", nil, WORK_RIGHT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },

View File

@ -21,7 +21,7 @@
rebuild-home = lib.mkForce {
body = ''
git -C ${config.dotfilesPath} add --intent-to-add --all
commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#macbook";
commandline --function execute
'';
};

View File

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

View File

@ -14,7 +14,7 @@ bind -M insert \cp projects
bind -M default \cp projects
bind -M insert \x1F accept-autosuggestion
bind -M default \x1F accept-autosuggestion
bind -M insert \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
bind -M default \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
bind -M default \cn 'commandline -r "nix run nixpkgs#"'
bind -M insert \x11F nix-fzf
bind -M default \x11F nix-fzf

View File

@ -19,9 +19,9 @@
body = ''
set program $argv[1]
if test (count $argv) -ge 2
commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program -- $argv[2..-1]"
commandline -r "nix run nixpkgs#$program -- $argv[2..-1]"
else
commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program"
commandline -r "nix run nixpkgs#$program"
end
commandline -f execute
'';