fix: misc

flake.nix

@@ -50,7 +50,5 @@
         inherit self inputs;
       };
     };
-
-    overlays = import ./overlays;
   };
 }

home/programs/atuin.nix

@@ -3,8 +3,6 @@ _: {
     enable = true;
 
     enableFishIntegration = true;
-    enableBashIntegration = false;
-    enableZshIntegration = false;
 
     settings = {
       inline_height = 0;

home/programs/fish.nix

@@ -1,6 +1,7 @@
 {lib, pkgs, config, ...}: {
   programs.fish = {
     enable = true;
+    catppuccin.enable = true;
 
     shellAbbrs = {
       "puil" = "pnpm update --interactive --latest";

home/programs/fish/config.fish

@@ -1,11 +1,15 @@
 /opt/homebrew/bin/brew shellenv | source
-pyenv init - | source
 
-set -gx PATH $PYENV_ROOT/bin (brew --prefix ccache)/libexec $GOPATH/bin $CARGO_HOME/bin $PNPM_HOME $XDG_BIN_HOME $XDG_SCRIPT_DIR /opt/homebrew/opt/openjdk/bin $PATH
+fish_add_path -Pm /etc/profiles/per-user/$USER/bin /run/current-system/sw/bin
+
+fish_add_path $GOPATH/bin
+fish_add_path $CARGO_HOME/bin
+fish_add_path $PNPM_HOME
+fish_add_path $XDG_BIN_HOME
+fish_add_path $XDG_SCRIPT_DIR
 
 starship init fish | source
 fnm env | source
 atuin init fish | source
-zoxide init fish | source
-source ~/.config/tabtab/fish/__tabtab.fish
-source /Users/uncenter/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
+
+set fish_greeting

home/programs/starship.nix

@@ -3,42 +3,41 @@ _: {
     enable = true;
     catppuccin.enable = true;
 
-    enableBashIntegration = true;
-    enableZshIntegration = true;
     enableFishIntegration = true;
 
     settings = {
       add_newline = false;
       continuation_prompt = "[](yellow) ";
       right_format = "$cmd_duration";
-      format = ''
-        $username\
-        $hostname\
-        $directory\
-        $git_branch\
-        $git_commit\
-        $git_state\
-        $git_metrics\
-        $git_status\
-        $docker_context\
-        $package\
-        $c\
-        $cmake\
-        $deno\
-        $elixir\
-        $golang\
-        $haskell\
-        $nodejs\
-        $php\
-        $python\
-        $rust\
-        $sudo\
-        $fill\
-        $shell\
-        $line_break\
-        $status\
-        $os\
-        $character'';
+      format = builtins.concatStringsSep "" [
+        "$username"
+        "$hostname"
+        "$directory"
+        "$git_branch"
+        "$git_commit"
+        "$git_state"
+        "$git_metrics"
+        "$git_status"
+        "$docker_context"
+        "$package"
+        "$c"
+        "$cmake"
+        "$deno"
+        "$elixir"
+        "$golang"
+        "$haskell"
+        "$nodejs"
+        "$php"
+        "$python"
+        "$rust"
+        "$sudo"
+        "$fill"
+        "$shell"
+        "$line_break"
+        "$status"
+        "$os"
+        "$character"
+      ];
 
       fill.symbol = " ";
 

modules/packages.nix

@@ -30,7 +30,6 @@
     fd
     gcc
     ffmpeg
-    ffmpegthumbnailer-unstable
     fish
     fnm
     fortls

system.nix

@@ -10,13 +10,6 @@
   ];
 
   system = {
-    activationScripts.extraActivation = {
-      text = ''
-        set -eo pipefail
-        HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
-      '';
-    };
-
     defaults = {
       dock = {
         autohide = true;
@@ -87,9 +80,7 @@
     ];
   };
 
-  programs.bash.enable = true;
   programs.fish.enable = true;
-  programs.zsh.enable = true;
 
   home-manager = {
     useGlobalPkgs = true;
@@ -104,6 +95,7 @@
 
   users.users.uncenter = {
     home = "/Users/uncenter";
+    shell = pkgs.fish;
   };
 
   system.stateVersion = 4;