updates

mobsenpai · Sep 7, 2023 · 6a54bc6 · 6a54bc6
1 parent 1aada5a
commit 6a54bc6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 22 deletions.
diff --git a/home/yashraj/shared/programs/neofetch.nix b/home/yashraj/shared/programs/neofetch.nix
@@ -436,6 +436,7 @@
     # mocp
     # mopidy
     # mpd
+    # mpv
     # muine
     # netease-cloud-music
     # olivia
@@ -455,7 +456,7 @@
     # xmms2d
     # xnoise
     # yarock
-    music_player="mpd"
+    music_player="mpv"
 
     # Format to display song information.
     #

diff --git a/home/yashraj/shared/shell/bash.nix b/home/yashraj/shared/shell/bash.nix
@@ -10,17 +10,31 @@ in {
     enable = true;
 
     initExtra = ''
+      # General
+      # =============================================
+      # if not running interactively, don't do anything
+      [[ $- != *i* ]] && return
+
+      export HISTCONTROL=ignoreboth:erasedups
+
+      # ignore upper and lowercase when TAB completion
       bind "set completion-ignore-case on"
 
-      # shopt
+      # set title
+      PROMPT_COMMAND='echo -ne "\033]0;$(basename "$(pwd)")\007"'
+
+      # Completions
+      # =============================================
+      set -o vi
       shopt -s autocd # change to named directory
       shopt -s cdspell # autocorrects cd misspellings
       shopt -s cmdhist # save multi-line commands in history as single line
       shopt -s dotglob
       shopt -s histappend # do not overwrite history
       shopt -s expand_aliases # expand aliases
 
-      # ex = EXtractor for all kinds of archives
+      # ex = Extractor for all kinds of archives
+      # =============================================
       # usage: ex <file>
       ex ()
       {
@@ -47,7 +61,8 @@ in {
         fi
       }
 
-      # reporting tools - install when not installed
+      # Reporting tools
+      # =============================================
       neofetch
     '';
 

diff --git a/home/yashraj/shared/shell/git.nix b/home/yashraj/shared/shell/git.nix
@@ -6,13 +6,12 @@
   home.packages = lib.attrValues {
     inherit
       (pkgs)
-      # bfg-repo-cleaner
-
       colordiff
-      # gist
-
-      # git-filter-repo
-
+      ;
+
+    inherit
+      (pkgs.gitAndTools)
+      gitui
       ;
   };
 
@@ -26,20 +25,17 @@
     #   signByDefault = true;
     # };
 
-    # delta = {
-    #   enable = true;
-    #   options.map-styles = "bold purple => syntax #8839ef, bold cyan => syntax #1e66f5";
-    # };
+    delta = {
+      enable = true;
+    };
 
     extraConfig = {
       init = {defaultBranch = "main";};
       diff.colorMoved = "default";
       merge.conflictstyle = "diff3";
-      # delta = {
-      #   syntax-theme = "Nord";
-      #   line-numbers = true;
-      # };
-      #credential.helper = "${pkgs.gitAndTools.gitFull}/bin/git-credential-libsecret";
+      delta = {
+        line-numbers = true;
+      };
     };
 
     aliases = {

diff --git a/home/yashraj/shared/shell/xdg.nix b/home/yashraj/shared/shell/xdg.nix
@@ -21,8 +21,8 @@ with lib; let
     "x-scheme-handler/https" = browser;
     "x-scheme-handler/unknown" = browser;
 
-    "audio/*" = ["vlc.desktop"];
-    "video/*" = ["vlc.dekstop"];
+    "audio/*" = ["mpv.desktop"];
+    "video/*" = ["mpv.dekstop"];
     "image/*" = ["feh.desktop"];
     "inode/directory" = ["pcmanfm.desktop"];
     "application/json" = browser;

diff --git a/hosts/shared/default.nix b/hosts/shared/default.nix
@@ -66,6 +66,7 @@
         glib
         libnotify
         libsecret
+        mpv
         ntfs3g
         p7zip
         pamixer
@@ -75,7 +76,6 @@
         unrar
         unzip
         vim
-        vlc
         tree
         wget
         zathura