Back to bash

5 files changed, 8 insertions, 13 deletions

diff --git a/common/modules/terminal/alacritty.nix b/common/modules/terminal/alacritty.nix
index fa7e32c..57ff494 100644
--- a/common/modules/terminal/alacritty.nix
+++ b/common/modules/terminal/alacritty.nix
@@ -10,9 +10,6 @@ in
     programs.alacritty = {
       enable = true;
       settings = {
-        cursor = {
-          thickness = 0.0;
-        };
         colors = {
           draw_bold_text_with_bright_colors = cfg.font.bright_color_is_bold;
 
@@ -36,15 +33,11 @@ in
               [ "~/.config/alacritty/themes/noctalia.toml" ];
         };
         window = {
-          dynamic_padding = true;
+          dynamic_padding = false;
           padding = {
             y = cfg.window.padding-y;
             x = cfg.window.padding-x;
           };
-          # dimensions = {
-          #   lines = 75;
-          #   columns = 100;
-          # };
         };
         font = {
           normal.family = cfg.font.family;
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index 4ca4384..a53a74f 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -9,6 +9,7 @@ in
   config = lib.mkIf cfg.ghostty {
     programs.ghostty = {
       enable = true;
+      systemd.enable = false;
       enableFishIntegration = true;
       settings = {
         theme =
diff --git a/common/programs/bash.nix b/common/programs/bash.nix
index f6987ed..6cd9b26 100644
--- a/common/programs/bash.nix
+++ b/common/programs/bash.nix
@@ -1,6 +1,6 @@
 {
   programs.bash = {
-    enable = false;
+    enable = true;
     historySize = 10000;
     historyFile = "$HOME/.bash_history";
     historyControl = [
@@ -18,7 +18,6 @@
       bind '"\e[A": history-search-backward'
       bind '"\e[B": history-search-forward'
 
-
       if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then
        # Removed the '1;' prefix to disable bold
        PROMPT_COLOR="31m"
@@ -28,7 +27,9 @@
          PS1="\[\033[$PROMPT_COLOR\]\u@\h:\w\\$\[\033[0m\] "
        else
          # PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] "
-         PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]"
+         # PS1="\[\e[34m\]\u@\h \[\e[32m\]\w \[\e[39m\]\$ \[\e[0m\]"
+         PS1="\[\e[94m\]\u@\h \[\e[32m\]\w \[\e[39m\]\$ \[\e[0m\]"
+         # PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]"
        fi
 
        if test "$TERM" = "xterm"; then
diff --git a/common/programs/fish.nix b/common/programs/fish.nix
index 8d9be78..2ff1f90 100644
--- a/common/programs/fish.nix
+++ b/common/programs/fish.nix
@@ -8,7 +8,7 @@
   # ];
 
   programs.fish = {
-    enable = true;
+    enable = false;
     interactiveShellInit =
       #fish
       ''
diff --git a/common/templates/go/flake.nix b/common/templates/go/flake.nix
index 3f8e7d5..a820911 100644
--- a/common/templates/go/flake.nix
+++ b/common/templates/go/flake.nix
@@ -35,7 +35,7 @@
           pkgs = nixpkgs.legacyPackages.${system};
         in
         {
-          default = pkgs.mkShellNoCC {
+          default = pkgs.mkShell {
             packages = with pkgs; [
               go
               gopls