diff --git a/flake.lock b/flake.lock index 4be5998..e212a6e 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727571425, - "narHash": "sha256-ZhS5BBZlPlmlfA6FyG6I4s7zfwW568hxH2GoXqkf4F0=", + "lastModified": 1727574072, + "narHash": "sha256-HuQnfjvImOoHbwzrKV9bJM8/2zDf9Wk5FfsmHUuzyI8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "c10249ea0cded9660cb90cd56699cecd23a1b497", + "rev": "db8f40db093bfc1fffd5e891625ae7cea1322db2", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -1707,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1727404165, - "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=", + "lastModified": 1727490462, + "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "76f0a61e733259e1034dd6523e039d04932ffefc", + "rev": "11a13e50debafae4ae802f1d6b8585101516dd93", "type": "github" }, "original": { diff --git a/homes/aarch64-darwin/marshall@canis/default.nix b/homes/aarch64-darwin/marshall@canis/default.nix index 9a87dcd..a67c3cc 100644 --- a/homes/aarch64-darwin/marshall@canis/default.nix +++ b/homes/aarch64-darwin/marshall@canis/default.nix @@ -28,7 +28,6 @@ grc huniq hurl - igrep keybase keychain monolith @@ -38,7 +37,6 @@ nodePackages_latest.nodejs nurl pinentry_mac - pkg-config pnpm rm-improved rnr diff --git a/homes/aarch64-darwin/marshall@canis/wezterm.lua b/homes/aarch64-darwin/marshall@canis/wezterm.lua index 061098d..460012b 100644 --- a/homes/aarch64-darwin/marshall@canis/wezterm.lua +++ b/homes/aarch64-darwin/marshall@canis/wezterm.lua @@ -116,7 +116,7 @@ local config = { default_cursor_style = 'BlinkingBar', enable_scroll_bar = false, font = wezterm.font('Maple Mono NF'), - font_size = 16, + font_size = 14, front_end = 'WebGpu', hide_tab_bar_if_only_one_tab = true, keys = keybinds, diff --git a/modules/home/shell/fish.nix b/modules/home/shell/fish.nix index 31a67fc..932d2ab 100644 --- a/modules/home/shell/fish.nix +++ b/modules/home/shell/fish.nix @@ -35,6 +35,9 @@ with pkgs; { function fish_greeting macchina end + + fish_add_path /opt/homebrew/bin + fish_add_path /Users/marshall/.nix-profile/bin ''; }; diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix index 563a410..e3e0107 100644 --- a/systems/aarch64-darwin/canis/default.nix +++ b/systems/aarch64-darwin/canis/default.nix @@ -121,6 +121,7 @@ system = { keyboard.enableKeyMapping = true; + stateVersion = 5; defaults = { NSGlobalDomain = {