katja's git: nixfiles

configurations/homeManager/programs: remove bash

diff --git a/configurations/homeManager/programs/bash.nix b/configurations/homeManager/programs/bash.nix
@@ -1,34 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-
-  programs.bash = {
-    enable               = true;
-    enableVteIntegration = lib.mkIf pkgs.stdenv.isLinux true;
-
-    historyFileSize = 999999;
-    historyControl  = [ "ignoredups" "ignorespace" ];
-    historyIgnore   = [ "ls" "clear" "exit" ];
-
-    bashrcExtra = lib.mkIf pkgs.stdenv.isDarwin ''
-      if [ "$TERM" != "dumb" ]; then
-        source "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
-        nullglobStatus=$(shopt -p nullglob)
-        shopt -s nullglob
-        for p in $NIX_PROFILES; do
-          for m in "$p/etc/bash_completion.d/"*; do
-            source $m
-          done
-        done
-        eval "$nullglobStatus"
-        unset nullglobStatus p m
-      fi
-
-      # Make bash check its window size after a process completes
-      shopt -s checkwinsize
-
-      eval "$(/opt/homebrew/bin/brew shellenv)"
-    '';
-  };
-
-}

diff --git a/configurations/homeManager/programs/bitwarden-cli.nix b/configurations/homeManager/programs/bitwarden-cli.nix
@@ -4,17 +4,14 @@
 
   home.packages = [ pkgs.bitwarden-cli ];
 
-  programs = let
-    shellExtraInit = ''
+  programs = {
+    zsh.initExtra = ''
       bw-unlock () {
         if [[ -z $BW_SESSION ]] ; then
           export BW_SESSION="$(bw unlock --raw)"
         fi
       }
     '';
-  in {
-    zsh.initExtra  = shellExtraInit;
-    bash.initExtra = shellExtraInit;
     fish.functions.bw-unlock = ''
       if set -g BW_SESSION
         set -gx BW_SESSION "$(bw unlock --raw)"

diff --git a/configurations/homeManager/programs/gpg.nix b/configurations/homeManager/programs/gpg.nix
@@ -36,17 +36,12 @@
     exec_always 'gpgconf --kill gpg-agent'
   '';
 
-  programs = let
-    shellExtraInit = ''
+  programs = {
+    zsh.initExtra  = ''
       export GPG_TTY=$(tty)
       export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
       gpgconf --launch gpg-agent
     '';
-
-  in {
-
-    bash.initExtra = shellExtraInit;
-    zsh.initExtra  = shellExtraInit;
     fish.interactiveShellInit = ''
       gpgconf --launch gpg-agent
       set -gx SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)

diff --git a/configurations/homeManager/programs/mcfly.nix b/configurations/homeManager/programs/mcfly.nix
@@ -5,7 +5,6 @@
   programs.mcfly = {
     enable                = true;
     enableFishIntegration = true;
-    enableBashIntegration = true;
     enableZshIntegration  = true;
     fuzzySearchFactor     = 2;
   };

diff --git a/configurations/homeManager/programs/starship.nix b/configurations/homeManager/programs/starship.nix
@@ -6,7 +6,6 @@
     enable                = true;
     enableFishIntegration = true;
     enableZshIntegration  = true;
-    enableBashIntegration = true;
 
     settings = {
       add_newline = false;

diff --git a/configurations/homeManager/programs/zoxide.nix b/configurations/homeManager/programs/zoxide.nix
@@ -6,7 +6,6 @@
     enable = true;
     enableFishIntegration = true;
     enableZshIntegration  = true;
-    enableBashIntegration = true;
   };
 
   home.shellAliases = {