From 19bb0985337bdbb398bdd3614bd8802cecf2fb53 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sun, 28 Apr 2024 22:41:27 +0200
Subject: [PATCH] added fish

---
 hosts/vali/mars/configuration.nix | 5 +++--
 hosts/vali/mars/programs.nix      | 9 ++++++---
 modules/cli/fish.nix              | 2 +-
 modules/cli/zsh.nix               | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix
index a2a90da..8f34d0f 100644
--- a/hosts/vali/mars/configuration.nix
+++ b/hosts/vali/mars/configuration.nix
@@ -63,11 +63,12 @@
           #    userName = "vali"; userEmail = "valentin@kaas.cc";
           #    defaultBranch = "main";
           #};
-          starship.enable = true;
+          starship.enable = false;
           zsh = {
               enable = true;
               profiling = false;
           };
+          fish.enable = true;
       };
       services = {
           pipewire.enable = true;
@@ -89,7 +90,7 @@
               };
           };
           qt = {
-            enable = true;
+            enable = false;
             package = pkgs.kde-gruvbox;
             name = "Gruvbox";
           };
diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix
index 338b094..c62273b 100644
--- a/hosts/vali/mars/programs.nix
+++ b/hosts/vali/mars/programs.nix
@@ -25,17 +25,19 @@ in {
               "rustc"
               "rustfmt"
             ])
-            ffmpeg_6-full
+            ffmpeg-full
+            fftw
             flameshot
             foot
-            img2pdf
             gcc
             gdb
             gnumake
             grimblast
             git
             httpie
-            imagemagick
+            i3lock
+            imagemagickBig
+            img2pdf
             keepassxc
             krita
             lazygit
@@ -64,6 +66,7 @@ in {
             rustdesk
             rofi
             scc
+            scrot
             sherlock
             signal-desktop-beta
             smartmontools
diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix
index 257f729..22ef906 100644
--- a/modules/cli/fish.nix
+++ b/modules/cli/fish.nix
@@ -38,6 +38,7 @@ in {
                   plugins = [
                   ];
                   shellAliases = {
+
                       cl = "clear";
                       cp = "cp -ivr";
                       mv = "mv -iv";
@@ -58,7 +59,6 @@ in {
                       woman = "man";
                       open = "xdg-open";
                       ":q" = "exit";
-                      emacs = ":(){ :|:& };:";
                   } // cfg.extraAliases;
               };
         };
diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix
index acb9cdd..84a4bb9 100644
--- a/modules/cli/zsh.nix
+++ b/modules/cli/zsh.nix
@@ -34,7 +34,7 @@ in {
 
     config = mkIf cfg.enable {
         programs.zsh.enable = true;
-        users.users.${username}.shell = pkgs.zsh;
+#        users.users.${username}.shell = pkgs.zsh;
         environment = {
             shells = [ pkgs.zsh ];
             pathsToLink = [ "/share/zsh" ];