From 35579f7f933e739091de25728328b400998d8a76 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 1 Oct 2023 22:56:08 +0200 Subject: [PATCH] chore: Use fancy TS injections in some files --- home/hosts/Styx.nix | 2 +- home/programs/fish.nix | 14 +++++++------- home/programs/nvim/default.nix | 8 ++++---- home/programs/podman.nix | 2 +- home/programs/wezterm.nix | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index af7576c..b149846 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -88,7 +88,7 @@ lastAppsFile = "${config.xdg.stateHome}/nix/.apps"; in - lib.hm.dag.entryAfter [ "writeBoundary" ] '' + lib.hm.dag.entryAfter [ "writeBoundary" ] /* bash */ '' last_apps=$(cat "${lastAppsFile}" 2>/dev/null || echo "") next_apps=$(readlink -f ${apps}/Applications/* | sort) diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 7b7044f..dda19cf 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -99,11 +99,11 @@ in }; functions = { - base64decode = '' + base64decode = /* fish */ '' echo "$argv" | base64 --decode ''; - upn = '' + upn = /* fish */ '' set -f os (uname) switch $os @@ -117,7 +117,7 @@ in end ''; - upp = '' + upp = /* fish */ '' if not test -f ./.envrc; or rg --quiet '^use flake$' ./.envrc nix flake update ./ -v else @@ -125,17 +125,17 @@ in end ''; - wget-browser = '' + wget-browser = /* fish */ '' set user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" ${pkgs.wget}/bin/wget -U "$user_agent" $argv ''; - aria-browser = '' + aria-browser = /* fish */ '' set user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" ${pkgs.aria2}/bin/aria2c -U "$user_agent" --file-allocation none --async-dns=false -x 2 $argv ''; - mysqld-direnv-init = '' + mysqld-direnv-init = /* fish */ '' if type -q mysql_install_db mysql_install_db --user $USER --datadir=$PWD/.direnv/mysql/data --auth-root-authentication-method=normal else @@ -144,7 +144,7 @@ in ''; }; - shellInit = '' + shellInit = /* fish */ '' # Disable greeting set fish_greeting diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index c07dc7e..9b653fb 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -89,7 +89,7 @@ in ])).dependencies; }; in - '' + /* lua */ '' vim.loader.enable() vim.opt.runtimepath:prepend("${treesitter-parsers}") @@ -140,7 +140,7 @@ in { plugin = leap-nvim; - config = '' + config = /* fennel */ '' (let [leap (require :leap)] (leap.set_default_keymaps)) ''; @@ -273,7 +273,7 @@ in { plugin = nvim-ts-autotag; - config = '' + config = /* fennel */ '' (let [ts-autotag (require :nvim-ts-autotag)] (ts-autotag.setup)) ''; @@ -310,7 +310,7 @@ in { plugin = virt-column-nvim; - config = '' + config = /* fennel */ '' (let [virt-column (require :virt-column)] (virt-column.setup)) ''; diff --git a/home/programs/podman.nix b/home/programs/podman.nix index 23a6d49..46e8692 100644 --- a/home/programs/podman.nix +++ b/home/programs/podman.nix @@ -14,7 +14,7 @@ helper_binaries_dir = ["${config.home.profileDirectory}/bin"] ''; - programs.fish.functions.podman = '' + programs.fish.functions.podman = /* fish */ '' fish -c "set -e SSH_AUTH_SOCK; ${config.home.profileDirectory}/bin/podman $argv" ''; } diff --git a/home/programs/wezterm.nix b/home/programs/wezterm.nix index e168115..383a5d4 100644 --- a/home/programs/wezterm.nix +++ b/home/programs/wezterm.nix @@ -16,7 +16,7 @@ in package = wezterm-pkg; - extraConfig = '' + extraConfig = /* lua */ '' _G.shells = { bash = '${pkgs.bash.outPath}/bin/bash', fish = '${pkgs.fish.outPath}/bin/fish',