.source -> .text where possible

7 files changed, 37 insertions, 65 deletions

diff --git a/modules/terminal/system/programs/broot.nix b/modules/terminal/system/programs/broot.nix
index d36a5e5..4a15063 100644
--- a/modules/terminal/system/programs/broot.nix
+++ b/modules/terminal/system/programs/broot.nix
@@ -23,6 +23,12 @@ in
     hjem.users."${config.collinux.user.name}" = {
       files = {
         ".config/broot/conf.toml".source = conf;
+
+        ".config/fish/conf.d/broot.fish".text = lib.mkIf config.collinux.terminal.shells.fish.enable ''
+          if status is-interactive
+            ${pkgs.broot}/bin/broot --print-shell-function fish | source
+          end
+        '';
       };
 
       packages = [pkgs.broot];
diff --git a/modules/terminal/system/programs/cmus.nix b/modules/terminal/system/programs/cmus.nix
index 3f1639b..102fa7a 100644
--- a/modules/terminal/system/programs/cmus.nix
+++ b/modules/terminal/system/programs/cmus.nix
@@ -24,7 +24,7 @@
     fi
   '';
 
-  cmus_theme = pkgs.writeText "catppuccin.theme" ''
+  cmus_theme = ''
     set color_cmdline_bg=default
     set color_cmdline_fg=default
     set color_error=211
@@ -52,12 +52,12 @@
     set color_win_title_attr=bold
   '';
 
-  cmus_rc = pkgs.writeText "rc" ''
+  cmus_rc = ''
     colorscheme catppuccin
     set status_display_program=${scripts.statusDisplay}/bin/status.sh
   '';
 
-  cava_config = pkgs.writeText "config" ''
+  cava_config = ''
     [color]
     gradient=1
     gradient_color_1='#94e2d5'
@@ -73,9 +73,9 @@ in
   lib.mkIf cfg.enable {
     hjem.users."${config.collinux.user.name}" = {
       files = {
-        ".config/cmus/rc".source = cmus_rc;
-        ".config/cmus/catppuccin.theme".source = cmus_theme;
-        ".config/cava/config".source = cava_config;
+        ".config/cmus/rc".text = cmus_rc;
+        ".config/cmus/catppuccin.theme".text = cmus_theme;
+        ".config/cava/config".text = cava_config;
       };
 
       packages = with pkgs; [cava cmus];
diff --git a/modules/terminal/system/programs/fish.nix b/modules/terminal/system/programs/fish.nix
index 7ce525f..204a048 100644
--- a/modules/terminal/system/programs/fish.nix
+++ b/modules/terminal/system/programs/fish.nix
@@ -6,66 +6,29 @@
 }: let
   cfg = config.collinux.terminal.shells.fish;
 
-  scripts.cool-cd = pkgs.writeShellScriptBin "cd.sh" ''
-    if git rev-parse --is-inside-work-tree; then
-      cd $(fd . "$(git rev-parse --show-toplevel)" --type dir | fzf)
-    else
-      cd $(fd . --type dir | fzf)
-    fi
-  '';
-
-  init = pkgs.writeText "config.fish" ''
+  init = ''
     set fish_greeting
 
-    function starship_transient_prompt_func
-      ${pkgs.starship}/bin/starship module character
-    end
-
-    function cool-cd
-      if git rev-parse --is-inside-work-tree &>/dev/null
-        set dirs (fd . (git rev-parse --show-toplevel) --type dir)
-      else
-        set dirs (fd . --type dir)
-      end
-
-      if test -z "$dirs"
-        exit
-      end
-
-      cd (echo "$dirs" | fzf)
-    end
-
     if status is-interactive
       alias cat bat
+      set -x BAT_THEME "base16"
 
-      alias eza "eza -A -w 80 --group-directories-first -I '.git*'"
-      alias ls eza
-      alias tree "ls -T"
+      alias ls "${pkgs.eza}/bin/eza -A -w 80 --group-directories-first -I '.git*'"
+      alias tree "${pkgs.eza}/bin/eza -T"
 
       ${pkgs.fzf}/bin/fzf --fish | source
-      ${pkgs.starship}/bin/starship init fish | source
-      ${pkgs.broot}/bin/broot --print-shell-function fish | source
+      set -x FZF_DEFAULT_OPTS "--color bg:#1E1E2E,bg+:#313244,border:#313244,fg:#CDD6F4,fg+:#CDD6F4,header:#F38BA8,hl:#F38BA8,hl+:#F38BA8,info:#CBA6F7,label:#CDD6F4,marker:#B4BEFE,pointer:#F5E0DC,prompt:#CBA6F7,selected-bg:#45475A,spinner:#F5E0DC"
 
       ${pkgs.pay-respects}/bin/pay-respects fish --alias | source
 
-      # extra bindings
-      bind 'alt-c' cool-cd
-
-      enable_transience
-
-      # env vars
-      set -x EDITOR hx
       set -x NH_FLAKE "$HOME/nixos"
-
-      set -x BAT_THEME "base16"
-      set -x FZF_DEFAULT_OPTS "--color bg:#1E1E2E,bg+:#313244,border:#313244,fg:#CDD6F4,fg+:#CDD6F4,header:#F38BA8,hl:#F38BA8,hl+:#F38BA8,info:#CBA6F7,label:#CDD6F4,marker:#B4BEFE,pointer:#F5E0DC,prompt:#CBA6F7,selected-bg:#45475A,spinner:#F5E0DC"
     end
   '';
 in
   lib.mkIf cfg.enable {
     hjem.users."${config.collinux.user.name}" = {
       files = {
-        ".config/fish/config.fish".source = init;
+        ".config/fish/config.fish".text = init;
       };
 
       packages = with pkgs; [
diff --git a/modules/terminal/system/programs/git.nix b/modules/terminal/system/programs/git.nix
index 8a931d6..06801af 100644
--- a/modules/terminal/system/programs/git.nix
+++ b/modules/terminal/system/programs/git.nix
@@ -5,7 +5,7 @@
 }: let
   cfg = config.collinux.terminal.programs.git;
 
-  git_config = pkgs.writeText "config" ''
+  git_config = ''
     [alias]
       stage = "add"
       unstage = "restore --staged"
@@ -20,7 +20,7 @@
 in {
   hjem.users."${config.collinux.user.name}" = {
     files = {
-      ".config/git/config".source = git_config;
+      ".config/git/config".text = git_config;
     };
 
     packages = [pkgs.git];
diff --git a/modules/terminal/system/programs/helix.nix b/modules/terminal/system/programs/helix.nix
index 8c39ec2..7bd9af1 100644
--- a/modules/terminal/system/programs/helix.nix
+++ b/modules/terminal/system/programs/helix.nix
@@ -140,6 +140,10 @@ in
         ".config/helix/config.toml".source = settings;
         ".config/helix/languages.toml".source = languages;
         ".config/helix/themes/catppuccin_mocha_transparent.toml".source = customCatppuccinTheme;
+
+        ".config/fish/conf.d/helix.fish".text = lib.mkIf config.collinux.terminal.shells.fish.enable ''
+          set -gx EDITOR hx
+        '';
       };
 
       packages = [
diff --git a/modules/terminal/system/programs/starship.nix b/modules/terminal/system/programs/starship.nix
index 60fcc00..7662194 100644
--- a/modules/terminal/system/programs/starship.nix
+++ b/modules/terminal/system/programs/starship.nix
@@ -39,6 +39,16 @@ in
     hjem.users."${config.collinux.user.name}" = {
       files = {
         ".config/starship.toml".source = settings;
+        ".config/fish/conf.d/starship.fish".text = lib.mkIf config.collinux.shells.fish.enable ''
+          function starship_transient_prompt_func
+            ${pkgs.starship}/bin/starship module character
+          end
+
+          if status is-interactive
+            ${pkgs.starship}/bin/starship init fish | source
+            enable_transience
+          end
+        '';
       };
 
       packages = [
diff --git a/modules/terminal/system/programs/tmux.nix b/modules/terminal/system/programs/tmux.nix
index ecb5e21..fc68450 100644
--- a/modules/terminal/system/programs/tmux.nix
+++ b/modules/terminal/system/programs/tmux.nix
@@ -95,17 +95,7 @@
     tset window-style bg=$bg_dark
   '';
 
-  plugins.tmux-resurrect = builtins.fetchGit {
-    url = "https://github.com/tmux-plugins/tmux-resurrect";
-    rev = "cff343cf9e81983d3da0c8562b01616f12e8d548";
-  };
-
-  tmux-conf = pkgs.writeText "tmux.conf" ''
-    # Resurrect
-    run-shell ${plugins.tmux-resurrect}/resurrect.tmux
-    set -g @resurrect-dir "$HOME/.local/share/tmux-resurrect"
-    set -g @resurrect-processes 'hx cmus cava nix-shell'
-
+  tmux-conf = ''
     set -g mouse on
 
     # bell
@@ -153,9 +143,8 @@
 in
   lib.mkIf cfg.enable {
     hjem.users."${config.collinux.user.name}" = {
-      files = {
-        ".config/tmux/tmux.conf".source = tmux-conf;
-      };
+      files.".config/tmux/tmux.conf".text = tmux-conf;
+
       packages = [pkgs.tmux];
     };
   }