From a322ff3ed75a42348ce733c270d0d9e5735e0b53 Mon Sep 17 00:00:00 2001
From: DerGrumpf
Date: Tue, 25 Mar 2025 01:36:37 +0100
Subject: [PATCH] Changed: Terminal Config
---
home/shell/default.nix | 31 +++++++++++++++++++++++
home/shell/{fish/default.nix => fish.nix} | 8 +++---
2 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 home/shell/default.nix
rename home/shell/{fish/default.nix => fish.nix} (90%)
diff --git a/home/shell/default.nix b/home/shell/default.nix
new file mode 100644
index 0000000..d1a2985
--- /dev/null
+++ b/home/shell/default.nix
@@ -0,0 +1,31 @@
+{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/default.nix b/home/shell/fish.nix
similarity index 90%
rename from home/shell/fish/default.nix
rename to home/shell/fish.nix
index cae2272..cdfaee9 100644
--- a/home/shell/fish/default.nix
+++ b/home/shell/fish.nix
@@ -1,5 +1,9 @@
{ pkgs, ...}:
+
+let
+ font = "JetBrainsMono Nerd Font";
+in
{
# Fix underlying System POSIX bugs
programs.bash = {
@@ -14,10 +18,6 @@
programs.fish = {
enable = true;
- shellAbbrs = {
- ls = "eza";
- la = "eza -la";
- };
interactiveShellInit = ''
fish_config prompt choose disco
function fish_greeting