debloat

common/atuin.nix

@@ -1,13 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  package = pkgs.atuin;
-in {
-  environment.systemPackages = [package];
-
-  programs.bash.interactiveShellInit = ''
-    eval "$(${lib.getExe package} init bash)"
-  '';
-}

common/bash.nix

@@ -1,18 +1,5 @@
 {
-  programs = {
-    command-not-found.enable = false;
-
-    bash = {
-      blesh.enable = true;
-
-      interactiveShellInit = ''
-        shopt -s globstar
-        shopt -s nullglob
-        shopt -s extglob
-        shopt -s checkwinsize
-
-        bind 'set show-mode-in-prompt off'
-      '';
-    };
-  };
+  programs.bash. interactiveShellInit = ''
+    shopt -s autocd globstar failglob extglob checkwinsize
+  '';
 }

common/cnf.nix

@@ -0,0 +1,3 @@
+{
+  programs.command-not-found.enable = false;
+}

common/default.nix

@@ -1,8 +1,8 @@
 {
   imports = [
-    ./atuin.nix
-    ./avahi.nix
     ./bash.nix
+    ./cnf.nix
+    ./fish.nix
     ./boot.nix
     ./bottom.nix
     ./dbus.nix

common/direnv.nix

@@ -1,11 +1,3 @@
 {
-  config,
-  lib,
-  ...
-}: {
   programs.direnv.enable = true;
-
-  programs.bash.interactiveShellInit = ''
-    eval "$(${lib.getExe config.programs.direnv.package} hook bash)"
-  '';
 }

common/fish.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  programs.fish.enable = true;
+
+  users.defaultUserShell = pkgs.fish;
+}