From 2fde17f6b41833ce8978e191da0f0f541a61ec8a Mon Sep 17 00:00:00 2001
From: Daniel Bulant <danbulant@gmail.com>
Date: Tue, 16 Jul 2024 16:06:13 +0200
Subject: [PATCH] small cleanups

---
 .config/fish/config-old.fish | 19 +++++++------------
 .config/fish/fish_variables  |  2 +-
 .config/hypr/hyprland.conf   |  4 ++--
 .config/waybar/config.jsonc  |  3 ++-
 home.nix                     | 12 +++++-------
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.config/fish/config-old.fish b/.config/fish/config-old.fish
index d6795ed..b875bb9 100644
--- a/.config/fish/config-old.fish
+++ b/.config/fish/config-old.fish
@@ -9,7 +9,7 @@ if status is-interactive
         # test -f .nvmrc && nvm use > /dev/null
     end
     echo -e "\n"
-    fastfetch --color-keys (set_color "09BC8A" | string sub -s 3 -e -1) --color-title (set_color "75DDDD" | string sub -s 3 -e -1)
+    fastfetch
     test -f .nvmrc && nvm use > /dev/null
 end
 set PATH $PATH $HOME/.cargo/bin $HOME/.local/share/pnpm $HOME/.local/bin $HOME/.spicetify $HOME/.bun/bin
@@ -18,15 +18,10 @@ set -x PNPM_HOME /home/dan/.local/share/pnpm
 
 # tabtab source for packages
 # uninstall by removing these lines
-[ -f ~/.config/tabtab/fish/__tabtab.fish ]; and . ~/.config/tabtab/fish/__tabtab.fish; or true
+# [ -f ~/.config/tabtab/fish/__tabtab.fish ]; and . ~/.config/tabtab/fish/__tabtab.fish; or true
 
 # direnv
 direnv hook fish | source
-set -x CONDA_EXE /opt/anaconda/bin/conda
-set -x _CE_M ''
-set -x _CE_CONDA ''
-set -x CONDA_PYTHON_EXE /opt/anaconda/bin/python
-set -x CONDA_PREFIX /opt/anaconda
 #set -x LD_LIBRARY_PATH $LD_LIBRARY:$CONDA_PREFIX/lib
 fish_ssh_agent
 
@@ -38,9 +33,9 @@ fish_ssh_agent
 # <<< conda initialize <<<
 
 # eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv)
-set -x PERL5LIB "/home/dan/perl5/lib/perl5:$PERL5LIB";
-set -x PERL_LOCAL_LIB_ROOT "/home/dan/perl5:$PERL_LOCAL_LIB_ROOT";
-set -x PERL_MB_OPT "--install_base \"/home/dan/perl5\"";
-set -x PERL_MM_OPT "INSTALL_BASE=/home/dan/perl5";
-set -x SCCACHE_DIR "/run/media/dan/New BTRFS/.sccache"
+# set -x PERL5LIB "/home/dan/perl5/lib/perl5:$PERL5LIB";
+# set -x PERL_LOCAL_LIB_ROOT "/home/dan/perl5:$PERL_LOCAL_LIB_ROOT";
+# set -x PERL_MB_OPT "--install_base \"/home/dan/perl5\"";
+# set -x PERL_MM_OPT "INSTALL_BASE=/home/dan/perl5";
+set -x SCCACHE_DIR "/media/New BTRFS/.sccache"
 set -x RUSTC_WRAPPER (which sccache)
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 5e4e0cd..2c89ce4 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -802,7 +802,7 @@ SETUVAR tide_node_color:000000
 SETUVAR tide_node_icon:\u2b22
 SETUVAR tide_os_bg_color:4D4D4D
 SETUVAR tide_os_color:1793D1
-SETUVAR tide_os_icon:\uf303
+SETUVAR tide_os_icon:\uf313
 SETUVAR tide_php_bg_color:617CBE
 SETUVAR tide_php_color:000000
 SETUVAR tide_php_icon:\ue608
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 0e70844..9e56bf9 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -315,8 +315,8 @@ bind = ALT, tab, cyclenext,
 bind = ALT+SHIFT, tab, cyclenext, prev
 
 bind = ,Print,exec,grim - | wl-copy
-bind = SUPER+SHIFT,S,exec,spectacle --copy-image --region --background # no gui
-# bind = SUPER+SHIFT,S,exec,grim -g "$(slurp)" - | wl-copy
+# bind = SUPER+SHIFT,S,exec,spectacle --copy-image --region --background # no gui
+bind = SUPER+SHIFT,S,exec,grim -g "$(slurp)" - | wl-copy
 bind = SUPER, L,exec,$swaylock
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 089c6fc..b75a3df 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -83,7 +83,7 @@
     },
 
      "hyprland/window": {
-        "format": "   {}",
+        "format": "   {}",
         "separate-outputs": true,
         "rewrite": {
             // "~(.*)": "$1 ",
@@ -92,6 +92,7 @@
             "(.*) - Visual Studio Code": "$1 󰨞",
             "(.*)Visual Studio Code": "Code 󰨞",
             "(.*) — Dolphin": "$1 󰉋",
+            "(.*)Spotify Premium": "Spotify 󰓇",
             "(.*)Spotify": "Spotify 󰓇",
             "(.*)Steam": "Steam 󰓓",
             "(.*) - Vivaldi": "$1 ",
diff --git a/home.nix b/home.nix
index 75665e6..53b84e4 100644
--- a/home.nix
+++ b/home.nix
@@ -9,7 +9,9 @@ in
         packages = with pkgs; [
             grc
             onefetch
+            fira
             fira-code
+            fira-code-nerdfont
             kitty
             nushell
             rofi-wayland
@@ -23,10 +25,6 @@ in
             firefox
             dunst
             sccache
-            discord
-            spotify
-            spicetify-cli
-            meslo-lgs-nf
             blueman
             swaybg
             activitywatch
@@ -95,9 +93,9 @@ in
     programs = {
         fish = {
             enable = true;
-            interactiveShellInit = ''
-                set fish_greeting # Disable greeting
-            '';
+            # interactiveShellInit = ''
+            #     set fish_greeting # Disable greeting
+            # '';
             shellInit = with unstable-pkgs; ''
                 source ~/.config/fish/config-old.fish