From 999bded4d4417a7a1f268a07d41a289514730df2 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Fri, 22 Nov 2024 13:45:47 -0500 Subject: [PATCH] departure mono --- nix/home-manager/flake.lock | 24 +++++++++---------- nix/home-manager/modules/files.nix | 2 +- nix/home-manager/modules/packages/default.nix | 2 ++ .../modules/packages/neovim/core.lua | 14 +++++------ wezterm/wezterm.lua | 2 ++ 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 6014fa1..9e0642a 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -44,11 +44,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1732170943, - "narHash": "sha256-3qmtB25X5nxaaDL2VNlWB6OAQGVGv7xRm9tFMgJ3Jlo=", + "lastModified": 1732257345, + "narHash": "sha256-YetzCpGzm7RnSHIUhSqljv3iLOGdg/XufbUvMOrC7tg=", "owner": "nix-community", "repo": "fenix", - "rev": "7db16a01bca24b46acc1677f2b86ae03b5f207f8", + "rev": "3b89d5df39afc6ef3a8575fa92d8fa10ec68c95f", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732153837, - "narHash": "sha256-8hoAWJt8b05h87vtXCyOEseYqHrkydR3lL7Hl6pnhI8=", + "lastModified": 1732278183, + "narHash": "sha256-9nLFUsDK0kRrnooDbTUKwCRiVxwQwHh1MVDfD7BeOKw=", "owner": "martinvonz", "repo": "jj", - "rev": "7906b3f4a5abbeb36b1904ba6365b1f53cad3224", + "rev": "4f2e72a140758745cfdb7f0c311c297b26aa6875", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1732123539, - "narHash": "sha256-46X1N6fWs50BKZM6gWWk/yCd/cFvYTU0rBriK2RKPgk=", + "lastModified": 1732210164, + "narHash": "sha256-1kWDbE4LKc3LoxOsL2V2LfacvLXcd20MEAwztBW9HgQ=", "owner": "m15a", "repo": "flake-awesome-neovim-plugins", - "rev": "743a154d30f7c4274ddcaa9863baef16031544b7", + "rev": "504e37b48494eae868766de3a0c40a494f942519", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732196741, - "narHash": "sha256-6UJOzMhTmhAQUUtLJx6uVgPfgNxBjXH3pDBDciTiMhI=", + "lastModified": 1732287711, + "narHash": "sha256-whSsp1u9glPS4E6kzuoJlbR5EB0Lg0/65mBMdnjLKhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "616735586ac879fd7fd2b6c7a53a973016fcb0cf", + "rev": "01d2807d896b685caf601a144027c118400c2697", "type": "github" }, "original": { diff --git a/nix/home-manager/modules/files.nix b/nix/home-manager/modules/files.nix index dc91107..5ebc50e 100644 --- a/nix/home-manager/modules/files.nix +++ b/nix/home-manager/modules/files.nix @@ -5,7 +5,7 @@ }: let inherit (pkgs.stdenv.hostPlatform) isLinux; repo_root = "../../.."; - nv_fonts_basic = ["Iosevka Custom"]; + nv_fonts_basic = ["Departure Mono" "Fantasque Sans Mono"]; nv_fonts_normal = nv_fonts_basic ++ ( diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index 3565b99..0175515 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -24,6 +24,7 @@ in { cargo-workspaces clipboard-jh curl + departure-mono devenv docker-client dogedns @@ -50,6 +51,7 @@ in { kondo litecli magic-wormhole-rs + maple-mono-NF martian-mono page pandoc diff --git a/nix/home-manager/modules/packages/neovim/core.lua b/nix/home-manager/modules/packages/neovim/core.lua index d05b5b6..db96da9 100644 --- a/nix/home-manager/modules/packages/neovim/core.lua +++ b/nix/home-manager/modules/packages/neovim/core.lua @@ -1,11 +1,11 @@ vim.o.expandtab = true -local guifont = { "Iosevka Custom" } -if vim.loop.os_uname().sysname == "Darwin" then - table.insert(guifont, "Apple Color Emoji") -else - table.insert(guifont, "Noto Color Emoji") -end -vim.o.guifont = table.concat(guifont, ",") .. ":14" +-- local guifont = { "Iosevka Custom" } +-- if vim.loop.os_uname().sysname == "Darwin" then +-- table.insert(guifont, "Apple Color Emoji") +-- else +-- table.insert(guifont, "Noto Color Emoji") +-- end +-- vim.o.guifont = table.concat(guifont, ",") .. ":14" vim.o.hidden = true vim.o.ignorecase = true vim.o.inccommand = "split" diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 912a6e5..e3924db 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -8,6 +8,8 @@ if wezterm.config_builder then end config.font = wezterm.font_with_fallback({ + -- { family = "Maple Mono NF" }, + { family = "Departure Mono" }, { family = "Fantasque Sans Mono" }, { family = "Iosevka Custom", weight = "Medium" }, })