initial refactoring

modules/common/shell/fish/default.nix

@@ -1,154 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  users.users.${config.user}.shell = pkgs.fish;
-  programs.fish.enable = true; # Needed for LightDM to remember username
-
-  home-manager.users.${config.user} = {
-
-    # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl ];
-
-    programs.fish = {
-      enable = true;
-      shellAliases = {
-
-        # Version of bash which works much better on the terminal
-        bash = "${pkgs.bashInteractive}/bin/bash";
-
-        # Use eza (exa) instead of ls for fancier output
-        ls = "${pkgs.eza}/bin/eza --group";
-
-        # Move files to XDG trash on the commandline
-        trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
-      };
-      functions = {
-        commandline-git-commits = {
-          description = "Insert commit into commandline";
-          body = builtins.readFile ./functions/commandline-git-commits.fish;
-        };
-        copy = {
-          description = "Copy file contents into clipboard";
-          body = "cat $argv | pbcopy"; # Need to fix for non-macOS
-        };
-        edit = {
-          description = "Open a file in Vim";
-          body = builtins.readFile ./functions/edit.fish;
-        };
-        envs = {
-          description = "Evaluate a bash-like environment variables file";
-          body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
-        };
-        fcd = {
-          description = "Jump to directory";
-          argumentNames = "directory";
-          body = builtins.readFile ./functions/fcd.fish;
-        };
-        fish_user_key_bindings = {
-          body = builtins.readFile ./functions/fish_user_key_bindings.fish;
-        };
-        ip = {
-          body = builtins.readFile ./functions/ip.fish;
-        };
-        json = {
-          description = "Tidy up JSON using jq";
-          body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
-        };
-        note = {
-          description = "Edit or create a note";
-          argumentNames = "filename";
-          body = builtins.readFile ./functions/note.fish;
-        };
-        recent = {
-          description = "Open a recent file in Vim";
-          body = builtins.readFile ./functions/recent.fish;
-        };
-        search-and-edit = {
-          description = "Search and open the relevant file in Vim";
-          body = builtins.readFile ./functions/search-and-edit.fish;
-        };
-        syncnotes = {
-          description = "Full git commit on notes";
-          body = builtins.readFile ./functions/syncnotes.fish;
-        };
-        _which = {
-          description = "Identify the path to a program in the shell";
-          body = "command --search (string sub --start=2 $argv)";
-        };
-      };
-      interactiveShellInit = ''
-        fish_vi_key_bindings
-        bind yy fish_clipboard_copy
-        bind Y fish_clipboard_copy
-        bind -M visual y fish_clipboard_copy
-        bind -M default p fish_clipboard_paste
-        set -g fish_vi_force_cursor
-        set -g fish_cursor_default block
-        set -g fish_cursor_insert line
-        set -g fish_cursor_visual block
-        set -g fish_cursor_replace_one underscore
-      '';
-      loginShellInit = "";
-      shellAbbrs = {
-
-        # Directory aliases
-        l = "ls -lh";
-        lh = "ls -lh";
-        ll = "ls -alhF";
-        la = "ls -a";
-        c = "cd";
-        "-" = "cd -";
-        mkd = "mkdir -pv";
-
-        # Convert a program into its full path
-        "=" = {
-          position = "anywhere";
-          regex = "=\\w+";
-          function = "_which";
-        };
-
-        # System
-        s = "sudo";
-        sc = "systemctl";
-        scs = "systemctl status";
-        sca = "systemctl cat";
-        m = "make";
-        t = "trash";
-
-        # Vim (overwritten by Neovim)
-        v = "vim";
-        vl = "vim -c 'normal! `0'";
-
-        # Notes
-        sn = "syncnotes";
-
-        # Fun CLI Tools
-        weather = "curl wttr.in/$WEATHER_CITY";
-        moon = "curl wttr.in/Moon";
-
-        # Cheat Sheets
-        ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
-        fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
-        publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub";
-        forloop = "for i in (seq 1 100)";
-
-        # Docker
-        dc = "$DOTS/bin/docker_cleanup";
-        dr = "docker run --rm -it";
-        db = "docker build . -t";
-      };
-      shellInit = "";
-    };
-
-    home.sessionVariables.fish_greeting = "";
-
-    programs.starship.enableFishIntegration = true;
-    programs.zoxide.enableFishIntegration = true;
-    programs.fzf.enableFishIntegration = true;
-  };
-}