From 4d29ca7b6dbfdea19ea1dccbf1ed0573cc60a0ec Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Tue, 25 Mar 2025 01:47:28 +0100
Subject: [PATCH] Changed: Terminal bug

---
 home/shell/default.nix | 31 -------------------------------
 home/shell/fish.nix    | 31 -------------------------------
 users/phil/nixos.nix   | 42 +++++++++++++++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 71 deletions(-)
 delete mode 100644 home/shell/default.nix
 delete mode 100644 home/shell/fish.nix

diff --git a/home/shell/default.nix b/home/shell/default.nix
deleted file mode 100644
index d1a2985..0000000
--- a/home/shell/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{config, ...}: let
-  d = config.xdg.dataHome;
-  c = config.xdg.configHome;
-  cache = config.xdg.cacheHome;
-in {
-  imports = [
-    ./fish.nix
-  ];
-
-  # add environment variables
-  home.sessionVariables = {
-    # clean up ~
-    LESSHISTFILE = cache + "/less/history";
-    LESSKEY = c + "/less/lesskey";
-    WINEPREFIX = d + "/wine";
-
-    # set default applications
-    EDITOR = "nvim";
-    BROWSER = "firefox";
-    TERMINAL = "kitty";
-
-    # enable scrolling in git diff
-    DELTA_PAGER = "less -R";
-
-    MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-  };
-
-  home.shellAliases = {
-    ls = "eza";
-  };
-}
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
deleted file mode 100644
index 46f7887..0000000
--- a/home/shell/fish.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, ...}:
-
-
-let 
-    font = "JetBrainsMono Nerd Font";
-in
-{
-    # Fix underlying System POSIX bugs
-/*    programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
-    };
-*/
-    programs.fish = {
-      enable = true;
-      interactiveShellInit = ''
-        fish_config prompt choose disco
-        function fish_greeting
-            fastfetch
-            echo (set_color yellow)(date +%T)(set_color normal) on $hostname
-        end
-      '';
-    };
-
-
-}
diff --git a/users/phil/nixos.nix b/users/phil/nixos.nix
index 5482383..dd61f6e 100644
--- a/users/phil/nixos.nix
+++ b/users/phil/nixos.nix
@@ -7,15 +7,39 @@
   #
   ##################################################################################################################
 
-  users.users.phil = {
-    # authorizedKeys
-    openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de"
-    ];
-    extraGroups = [ "networkmanager" ];
-    shell = pkgs.fish;
-  };
+    users.users.phil = {
+# authorizedKeys
+        openssh.authorizedKeys.keys = [
+            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de"
+        ];
+        extraGroups = [ "networkmanager" ];
+        shell = pkgs.fish;
+    };
 
-  programs.fish.enable = true; # Just because...
+    # Fix underlying System POSIX bugs
+    programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+    };
+
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        fish_config prompt choose disco
+        function fish_greeting
+            fastfetch
+            echo (set_color yellow)(date +%T)(set_color normal) on $hostname
+        end
+      '';
+    };
+
+    home.shellAliases = {
+        ls = "eza";
+    };
 
 }