diff --git a/home-manager/shared/programs/default.nix b/home-manager/shared/programs/default.nix index 3e27407..56370c5 100644 --- a/home-manager/shared/programs/default.nix +++ b/home-manager/shared/programs/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./dev + ./dev.nix ./shell ]; } diff --git a/home-manager/shared/programs/dev/default.nix b/home-manager/shared/programs/dev.nix similarity index 82% rename from home-manager/shared/programs/dev/default.nix rename to home-manager/shared/programs/dev.nix index b8e3786..582d00f 100644 --- a/home-manager/shared/programs/dev/default.nix +++ b/home-manager/shared/programs/dev.nix @@ -21,4 +21,7 @@ #c gcc ]; + services.ollama = { + enable = true; + }; } diff --git a/home-manager/shared/programs/shell/default.nix b/home-manager/shared/programs/shell/default.nix index b01e940..d9702a3 100755 --- a/home-manager/shared/programs/shell/default.nix +++ b/home-manager/shared/programs/shell/default.nix @@ -22,6 +22,7 @@ enable = true; interactiveShellInit = '' set fish_greeting # Disable greeting + set show_startup_tips false set -U tide_right_prompt_items status\x1ecmd_duration\x1etime ''; shellInit = " @@ -69,17 +70,6 @@ tcd = "cd $(mktemp -d)"; docker = "nerdctl"; vimdiff = "nvim -d"; - kp = '' - bash -c ' - pid=$( - ps -ef | sed 1d | eval "fzf -m --header='[kill:process]'" | awk '{print $2}' - ) - if [ "x$pid" != "x" ]; then - echo $pid | xargs kill -9 - kp - fi - ' - ''; }; }; programs.bash = { diff --git a/home-manager/shared/programs/shell/tmux.nix b/home-manager/shared/programs/shell/tmux.nix index afaa8c0..466a082 100755 --- a/home-manager/shared/programs/shell/tmux.nix +++ b/home-manager/shared/programs/shell/tmux.nix @@ -18,10 +18,7 @@ ''; }; - programs.zellij = { - enable = true; - enableFishIntegration = true; - }; + programs.zellij.enable = true; home.file."${config.xdg.configHome}/zellij/config.kdl".text = '' on_force_close "quit" default_layout "compact"