From 48809531241a35de98184a1481ab6c01c9069061 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 30 Aug 2025 12:34:18 +0200 Subject: [PATCH] Add fzf --- hm-modules/shell/addition/default.nix | 1 + hm-modules/shell/addition/fzf/default.nix | 16 ++++++++++++++++ machines/amaterasu/main/default.nix | 1 + .../dotfiles/.config/Code/User/settings.json | 3 ++- .../fujin/main/dotfiles/.config/doom/init.el | 2 +- machines/fujin/main/home.nix | 1 + 6 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 hm-modules/shell/addition/fzf/default.nix diff --git a/hm-modules/shell/addition/default.nix b/hm-modules/shell/addition/default.nix index bb6bee8..ecca4b6 100644 --- a/hm-modules/shell/addition/default.nix +++ b/hm-modules/shell/addition/default.nix @@ -5,5 +5,6 @@ ./starship ./oxidise ./tmux + ./fzf ]; } diff --git a/hm-modules/shell/addition/fzf/default.nix b/hm-modules/shell/addition/fzf/default.nix new file mode 100644 index 0000000..38e9b0b --- /dev/null +++ b/hm-modules/shell/addition/fzf/default.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.dov.shell.addition.fzf; +in { + options.dov.shell.addition.fzf.enable = mkEnableOption "fzf configuration"; + + config = mkIf cfg.enable { + programs.fzf = { + enable = cfg.enable; + enableZshIntegration = config.dov.shell.zsh.enable; + tmux.enableShellIntegration = config.dov.shell.addition.tmux.enable; + }; + }; +} diff --git a/machines/amaterasu/main/default.nix b/machines/amaterasu/main/default.nix index 0fde826..d86710e 100644 --- a/machines/amaterasu/main/default.nix +++ b/machines/amaterasu/main/default.nix @@ -88,6 +88,7 @@ in { vim wget ripgrep + vault ]; services.openssh = { diff --git a/machines/fujin/main/dotfiles/.config/Code/User/settings.json b/machines/fujin/main/dotfiles/.config/Code/User/settings.json index 28d7876..01d8bcc 100644 --- a/machines/fujin/main/dotfiles/.config/Code/User/settings.json +++ b/machines/fujin/main/dotfiles/.config/Code/User/settings.json @@ -19,5 +19,6 @@ "git.confirmSync": false, "java.jdt.ls.java.home": "/home/fujin/jdk/openjdk21", "java.configuration.detectJdksAtStart": false, - "workbench.colorTheme": "Visual Studio Dark" + "workbench.colorTheme": "Visual Studio Dark", + "diffEditor.ignoreTrimWhitespace": true } diff --git a/machines/fujin/main/dotfiles/.config/doom/init.el b/machines/fujin/main/dotfiles/.config/doom/init.el index a59574f..d60fcf3 100644 --- a/machines/fujin/main/dotfiles/.config/doom/init.el +++ b/machines/fujin/main/dotfiles/.config/doom/init.el @@ -105,7 +105,7 @@ ;;prodigy ; FIXME managing external services & code builders ;;rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code + terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux tree-sitter ; syntax and parsing, sitting in a tree... ;;upload ; map local to remote projects via ssh/ftp diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index 610b141..2413f15 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -39,6 +39,7 @@ starship.enable = true; oxidise.enable = true; tmux.enable = true; + fzf.enable = true; }; };