From a0e3d4699db6631ff199fd27342e30fa8bcfc677 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Sun, 13 Apr 2025 10:42:28 +0300 Subject: [PATCH] minor programs change Signed-off-by: unexplrd --- hosts/dunamis/users/user/programs.nix | 8 ++++++++ modules/home/programs/shell/fish.nix | 10 ---------- modules/home/programs/shell/nushell.nix | 16 ++++++++-------- modules/home/programs/terminal/ghostty.nix | 3 +++ 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index 639a49c..77760ee 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -7,6 +7,7 @@ }; syncthing.enable = true; terminal.wezterm.enable = true; + terminal.ghostty.enable = true; services = { pueue.enable = true; # process queue in rust @@ -19,6 +20,8 @@ enable = true; settings.update_ms = 200; }; + direnv.enable = true; + direnv.silent = true; eza.enable = true; # ls in rust fd.enable = true; # find in rust fzf.enable = true; # fuzzy finder in rust @@ -34,8 +37,13 @@ }; gitui.enable = true; # git ui in rust jujutsu.enable = true; # vcs in rust + keychain = { + enable = true; + keys = ["id_ed25519"]; + }; nix-index-database.comma.enable = true; nix-index.enable = true; + nix-your-shell.enable = true; pay-respects.enable = true; # thefuck in rust ripgrep.enable = true; # grep in rust }; diff --git a/modules/home/programs/shell/fish.nix b/modules/home/programs/shell/fish.nix index eb5d15e..8286c9b 100644 --- a/modules/home/programs/shell/fish.nix +++ b/modules/home/programs/shell/fish.nix @@ -13,16 +13,6 @@ in { }; config = mkIf cfg.enable { programs = { - eza.enable = true; - zoxide.enable = true; # fuzzy cd in rust - direnv.enable = true; - direnv.silent = true; - nix-your-shell.enable = true; - keychain = { - enable = true; - # extraFlags = ["--quiet" "--noask"]; - keys = ["id_ed25519"]; - }; fish = { enable = true; # friendly interactive shell in rust shellAliases = { diff --git a/modules/home/programs/shell/nushell.nix b/modules/home/programs/shell/nushell.nix index da3a8fc..5cae173 100644 --- a/modules/home/programs/shell/nushell.nix +++ b/modules/home/programs/shell/nushell.nix @@ -13,6 +13,7 @@ in { }; config = mkIf cfg.enable { programs = { + eza.enableNushellIntegration = false; atuin = { enable = false; enableNushellIntegration = true; @@ -21,8 +22,6 @@ in { ]; }; carapace.enable = true; - zoxide.enable = true; - oh-my-posh.enableNushellIntegration = true; nushell = { enable = true; environmentVariables = { @@ -32,9 +31,15 @@ in { }; shellAliases = { cd = "z"; - la = "ls -a"; + # ed = "$env.EDITOR"; + jf = "jj-fzf"; # think of jeff + jo = "joshuto"; # think of josh l = "ls -la"; + la = "ls -a"; + ll = "ls -l"; nix-shell = "nix-shell --command nu"; + p = "pueue"; + s = "systemctl"; }; extraConfig = '' $env.config = { @@ -55,16 +60,11 @@ in { rm: { always_trash: true } - edit_mode: 'vi' completions: { case_sensitive: false quick: true partial: true algorithm: "fuzzy" - external: { - enable: true - #max_results: 100 - } } } ''; diff --git a/modules/home/programs/terminal/ghostty.nix b/modules/home/programs/terminal/ghostty.nix index e35f49a..95b7259 100644 --- a/modules/home/programs/terminal/ghostty.nix +++ b/modules/home/programs/terminal/ghostty.nix @@ -15,6 +15,9 @@ in { settings = { gtk-single-instance = true; window-decoration = "server"; + keybind = [ + "ctrl+shift+f=close_surface" + ]; }; }; };