diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix index a4289be..9637641 100644 --- a/home/modules/fish/work.nix +++ b/home/modules/fish/work.nix @@ -1,11 +1,57 @@ -{ - programs.fish = { +{ programs.fish = { enable = true; functions = { - # TODO: Add these two functions from work config - cdr = ''''; - rr = ''''; + cdr = '' + set folder (begin + fd . ~/dev/ride/apps/backend/edge-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1; + fd . ~/dev/ride/apps/frontend/projects -t d -d 1; + fd . ~/dev/ride/apps/native -t d -d 1; + fd . ~/dev/ride/packages -t d -d 1; + echo "$HOME/dev/ride/apps/frontend"; + echo "$HOME/dev/ride/apps/lib"; + echo "$HOME/dev/ride"; + end | fzf); + set service (basename $folder) + + cd $folder + ''; + rr = '' + set folder (begin + fd . ~/dev/ride/apps/backend/edge-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1; + fd . ~/dev/ride/apps/frontend/projects -t d -d 1; + fd . ~/dev/ride/apps/native -t d -d 1; + echo "$HOME/dev/ride/apps/frontend"; + echo "$HOME/dev/ride/apps/lib"; + echo "$HOME/dev/ride"; + end | fzf); + + if test -n "$folder" + set service (basename $folder) + cd $folder + + # Check if package.json exists + if test -f "package.json" + # Extract and format npm scripts for fzf + set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf) + + if test -n "$script_cmd" + # Extract just the script name before the colon + set script_name (string split ": " $script_cmd)[1] + if test -n "$script_name" + echo "Running: npm run $script_name" + npm run $script_name + end + end + end + end + ''; ff = '' set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case " set INITIAL_QUERY "$argv" diff --git a/home/modules/wezterm/config/overrides.lua b/home/modules/wezterm/config/overrides.lua index 9ceee1f..64402cf 100644 --- a/home/modules/wezterm/config/overrides.lua +++ b/home/modules/wezterm/config/overrides.lua @@ -5,8 +5,9 @@ local helpers = require("helpers") local M = {} function M.apply_to_config(config) - --if hn == "macbook.digital-h.de" then - --end + if hn == "dnsc-work" then + config.window_background_opacity = 0.9 + end if hn == "dnsc-desktop" then config.font = wezterm.font("Victor Mono", { weight = "DemiBold" }) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 6e8f2f0..d2f4852 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -49,17 +49,12 @@ # Homebrew homebrew = { enable = true; - brewfile = true; onActivation = { autoUpdate = false; cleanup = "zap"; }; - taps = [ - "homebrew/services" - ]; - masApps = { Bitwarden = 1352778147; XCode = 497799835; @@ -83,7 +78,7 @@ casks = [ "arc" "microsoft-teams" - "zen-browser" + "tailscale" "font-victor-mono" "font-victor-mono-nerd-font" "vlc" @@ -172,6 +167,6 @@ }; # Nix settings - # Enable new Nix CLI and flakes + # Use determinate systems nix.enable = false; }