From 45dc2ddfe105a1f9e129b93a61e5c8bc55f6e744 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 14 Feb 2024 16:02:56 -0500 Subject: [PATCH] GitLink and wezterm webGPU and nix management - oh my! --- hammerspoon/init.lua | 4 ---- nix/home-manager/flake.lock | 12 ++++++------ nix/home-manager/home.nix | 6 ++++++ nix/home-manager/modules/packages/neovim.nix | 1 + nix/home-manager/modules/packages/neovim/core.lua | 3 +++ wezterm/wezterm.lua | 2 ++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua index a76bee8..d43aec7 100644 --- a/hammerspoon/init.lua +++ b/hammerspoon/init.lua @@ -28,10 +28,6 @@ hs.hotkey.bind({"ctrl"}, "t", function () end end) -hs.hotkey.bind({"ctrl", "alt"}, "t", function () - hs.application.launchOrFocus("/Users/acicchetti/bin/Terminal (Rosetta).app") -end) - hs.hotkey.bind({"cmd", "alt"}, ",", function () hs.application.launchOrFocus("System Preferences") end) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 4bcf068..b92e114 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -318,11 +318,11 @@ ] }, "locked": { - "lastModified": 1707683400, - "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "21b078306a2ab68748abf72650db313d646cf2ca", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -593,11 +593,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707831373, - "narHash": "sha256-p7tLY09afIWUm7llsWHWuNlx7+2T4iJ9VmmwBTBwb4M=", + "lastModified": 1707939175, + "narHash": "sha256-D1xan0lgxbmXDyzVqXTiSYHLmAMrMRdD+alKzEO/p3w=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "de4aced6f28697c4595e493be901e1b8608a9ffc", + "rev": "f7e8132daca31b1e3859ac0fb49741754375ac3d", "type": "github" }, "original": { diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index 68b610c..10e0246 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -145,6 +145,12 @@ in { }; }; + programs.wezterm = { + enable = true; + enableZshIntegration = false; + extraConfig = builtins.readFile ../../wezterm/wezterm.lua; + }; + programs.zoxide = { enable = true; }; diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix index 3cb0cd1..ce6e620 100644 --- a/nix/home-manager/modules/packages/neovim.nix +++ b/nix/home-manager/modules/packages/neovim.nix @@ -96,6 +96,7 @@ ) ++ (with pkgs.vimExtraPlugins; [ rainbow-delimiters-nvim + gitlinker-linrongbin16 ]); mappings = { normal = { diff --git a/nix/home-manager/modules/packages/neovim/core.lua b/nix/home-manager/modules/packages/neovim/core.lua index 558347b..fd58c52 100644 --- a/nix/home-manager/modules/packages/neovim/core.lua +++ b/nix/home-manager/modules/packages/neovim/core.lua @@ -27,3 +27,6 @@ vim.o.wildmode = "list:longest,full" vim.api.nvim_create_autocmd('TextYankPost', { callback = function() vim.highlight.on_yank() end }) + +require('gitlinker').setup() + diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 34588f2..467c2b7 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -57,4 +57,6 @@ config.color_schemes = { config.enable_tab_bar = true config.hide_tab_bar_if_only_one_tab = true +config.front_end = "WebGpu" + return config