diff --git a/homes/common.nix b/homes/common.nix index b68983f..a94198c 100644 --- a/homes/common.nix +++ b/homes/common.nix @@ -63,25 +63,25 @@ in { JULIA_PKG_USE_CLI_GIT = "true"; }; shellAliases = { - anc = - "ansible-playbook -vvv -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password --check ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass"; - anp = - "ansible-playbook -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass"; + cat = "bat"; + please = "sudo $(fc -ln -1)"; + grim = "git rebase -i --autosquash $(git_main_branch)"; + grid = "git rebase -i --autosquash $(git_develop_branch)"; gpub = "git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)"; - grid = "git rebase -i --autosquash $(git_develop_branch)"; - grim = "git rebase -i --autosquash $(git_main_branch)"; - hmb = - "home-manager build --flake ~/.config/home-manager#$USER@$(hostname -s)"; - hms = - "home-manager switch --flake ~/.config/home-manager#$USER@$(hostname -s)"; - pdfgrep = "pdfgrep --cache"; - please = "sudo $(fc -ln -1)"; # tsec - TailScale Exit node Connect tsec = "tailscale set --exit-node=$(tailscale exit-node suggest | awk '{print $4}' | head -n1)"; # tsed - TailScale Exit node Disconnect tsed = "tailscale set --exit-node="; + hms = + "home-manager switch --flake ~/.config/home-manager#$USER@$(hostname -s)"; + hmb = + "home-manager build --flake ~/.config/home-manager#$USER@$(hostname -s)"; + anp = + "ansible-playbook -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass"; + anc = + "ansible-playbook -vvv -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password --check ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass"; }; sessionPath = [ "$HOME/.local/bin" ]; activation = { diff --git a/programs/ghostty.nix b/programs/ghostty.nix index bd91415..ea54cde 100644 --- a/programs/ghostty.nix +++ b/programs/ghostty.nix @@ -1,19 +1,17 @@ -{ pkgs, ... }: { - programs.ghostty = - let modifierKey = if pkgs.stdenv.isDarwin then "cmd" else "ctrl"; - in { - enable = true; - package = null; - enableBashIntegration = true; - enableZshIntegration = true; - settings = { - quick-terminal-position = "top"; - quick-terminal-screen = "main"; - quick-terminal-autohide = true; - quick-terminal-size = "50%,50%"; - keybind = "global:${modifierKey}+backquote=toggle_quick_terminal"; - macos-hidden = "always"; - linux-cgroup = "always"; - }; +{ ... }: { + programs.ghostty = { + enable = true; + package = null; + enableBashIntegration = true; + enableZshIntegration = true; + settings = { + quick-terminal-position = "top"; + quick-terminal-screen = "main"; + quick-terminal-autohide = true; + quick-terminal-size = "50%,50%"; + keybind = "global:cmd+backquote=toggle_quick_terminal"; + macos-hidden = "always"; + linux-cgroup = "always"; }; + }; } diff --git a/programs/zed.nix b/programs/zed.nix index 2a3c9c5..4ebd7c5 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -3,7 +3,6 @@ enable = true; extensions = [ "basher" - "clean-vscode-icons" "clojure" "dockerfile" "earthfile" @@ -62,8 +61,7 @@ font_family = "MesloLGS NF"; font_size = 10; }; - theme = "macOS Classic Dark"; - icon_theme = "Clean VSCode Icon Theme"; + theme = "macOS Classic Dark2"; ui_font_size = 16; wrap_guides = [ 80 92 120 ]; };