feat(fish): added autocomplition for programming projects commands

Wittano · Jan 27, 2024 · a9dc090 · a9dc090
1 parent 0116d66
commit a9dc090
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 62 deletions.
diff --git a/lib/commands.nix b/lib/commands.nix
@@ -0,0 +1,37 @@
+{ lib, pkgs, home-manager, ... }: {
+  createProjectJumpCommand = path:
+    let
+      commandName = "p${builtins.baseNameOf path}";
+      command = pkgs.writeScriptBin "${commandName}" /*bash*/ ''
+        #!/usr/bin/env bash
+
+        if [ -n "$1" ]; then
+          cd "${path}/$1"
+        else
+          cd "${path}"
+        fi
+      '';
+    in
+    {
+      home-manager.users.wittano.programs.fish = {
+        interactiveShellInit = /*fish*/''
+          function get_projects_dir
+            ls ${path}
+          end
+
+          for project in (get_projects_dir)
+            complete -c ${commandName} -f -a "$project"
+          end
+        '';
+        functions.${commandName}.body = /*fish*/''
+          set -l args_len $(count $argv)
+
+          if test "$args_len" -eq 0
+            cd ${path}
+          else
+            cd ${path}/$argv
+          end
+        '';
+      };
+    };
+}
diff --git a/lib/default.nix b/lib/default.nix
@@ -17,7 +17,8 @@ let
   dotfiles = mapper.mapDirToAttrs inputs.wittano-dotfiles;
 
   home-manager = inputs.home-manager;
-in {
+in
+{
   inherit mapper imports;
 
   hosts = import ./hosts.nix {
@@ -27,4 +28,5 @@ in {
   apps = import ./apps.nix {
     inherit lib home-manager pkgs dotfiles ownPackages unstable;
   };
+  commands = import ./commands.nix { inherit pkgs lib home-manager; };
 }
diff --git a/modules/desktop/gaming/gaming.nix b/modules/desktop/gaming/gaming.nix
@@ -18,8 +18,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    nix.settings = mkIf cfg.enableMihoyoGames inputs.aagl.nixConfig;
-
     # Genshin Impact
     programs.anime-game-launcher.enable = cfg.enableMihoyoGames;
 

diff --git a/modules/dev/cpp.nix b/modules/dev/cpp.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 with lib;
-let cfg = config.modules.dev.clion;
+with lib.my;
+let
+  cfg = config.modules.dev.clion;
+  pRustCommand = commands.createProjectJumpCommand "$HOME/projects/own/rust";
+  pCppCommand = commands.createProjectJumpCommand "$HOME/projects/own/cpp";
 in
 {
   options = {
@@ -11,24 +15,18 @@ in
     };
   };
 
-  config = {
-    home-manager.users.wittano = {
-      home.packages = mkIf cfg.enable (with pkgs; [
-        cmake
-        gcc_multi
-        gnumake
-        glibc
+  config = mkIf cfg.enable (mkMerge [
+    pRustCommand
+    pCppCommand
+    {
+      home-manager.users.wittano = {
+        home.packages = (with pkgs; [
+          # Rust
+          rustup # TODO Split rust and cpp configuration
 
-        # Rust
-        rustup # TODO Split rust and cpp configuration
-
-        jetbrains.clion
-      ]);
-
-      programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
-        pc = "cd $HOME/projects/own/cpp";
-        prust = "cd $HOME/projects/own/rust";
+          jetbrains.clion
+        ]);
       };
-    };
-  };
+    }
+  ]);
 }
diff --git a/modules/dev/dotnet.nix b/modules/dev/dotnet.nix
@@ -1,6 +1,9 @@
 { config, lib, pkgs, home-manger, ... }:
 with lib;
-let cfg = config.modules.dev.dotnet;
+with lib.my;
+let
+  cfg = config.modules.dev.dotnet;
+  pdotnetCommand = commands.createProjectJumpCommand "$HOME/projects/own/dotnet";
 in
 {
   options = {
@@ -11,15 +14,12 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.variables.DOTNET_CLI_TELEMETRY_OPTOUT = "0";
+  config = mkIf cfg.enable (mkMerge [
+    pdotnetCommand
+    {
+      environment.variables.DOTNET_CLI_TELEMETRY_OPTOUT = "0";
 
-    home-manager.users.wittano = {
-      home.packages = with pkgs; [ dotnet-sdk mono jetbrains.rider ];
-
-      programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
-        pdotnet = "cd $HOME/projects/own/dotnet";
-      };
-    };
-  };
+      home-manager.users.wittano.home.packages = with pkgs; [ dotnet-sdk mono jetbrains.rider ];
+    }
+  ]);
 }
diff --git a/modules/dev/go.nix b/modules/dev/go.nix
@@ -1,6 +1,9 @@
 { config, pkgs, lib, home-manager, ... }:
 with lib;
-let cfg = config.modules.dev.goland;
+with lib.my;
+let
+  cfg = config.modules.dev.goland;
+  pgoCommand = commands.createProjectJumpCommand "$HOME/projects/own/go";
 in
 {
   options = {
@@ -11,15 +14,14 @@ in
     };
   };
 
-  config = {
-    home-manager.users.wittano = {
-      home.packages = mkIf cfg.enable (with pkgs; [ jetbrains.goland ]);
-      programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
-        pgo = "cd $HOME/projects/own/go";
-        tempgo =
+  config = mkIf (cfg.enable) (mkMerge [
+    pgoCommand
+    {
+      home-manager.users.wittano = {
+        home.packages = mkIf cfg.enable (with pkgs; [ jetbrains.goland ]);
+        programs.fish.shellAliases.tempgo =
           "${pkgs.nixFlakes}/bin/nix flake init --template github:Wittano/nix-template#go";
       };
-    };
-  };
-
+    }
+  ]);
 }
diff --git a/modules/dev/jvm.nix b/modules/dev/jvm.nix
@@ -1,8 +1,10 @@
 { config, pkgs, lib, home-manager, ... }:
 with lib;
+with lib.my;
 let
   cfg = config.modules.dev.jvm;
   andoridStudio = lists.optionals cfg.enableAndroid [ andorid-studio ];
+  pjvmCommand = commands.createProjectJumpCommand "$HOME/projects/own/jvm";
 in
 {
   options = {
@@ -16,13 +18,11 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    home-manager.users.wittano = {
-      home.packages = with pkgs; [ jetbrains.idea-ultimate ] ++ andoridStudio;
-
-      programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
-        pjvm = "cd $HOME/projects/own/jvm";
-      };
-    };
-  };
+  config = mkIf cfg.enable
+    (mkMerge [
+      pjvmCommand
+      {
+        home-manager.users.wittano.home.packages = with pkgs; [ jetbrains.idea-ultimate ] ++ andoridStudio;
+      }
+    ]);
 }
diff --git a/modules/dev/python.nix b/modules/dev/python.nix
@@ -1,6 +1,9 @@
 { config, pkgs, lib, home-manager, ... }:
 with lib;
-let cfg = config.modules.dev.pycharm;
+with lib.my;
+let
+  cfg = config.modules.dev.pycharm;
+  ppythonCommand = commands.createProjectJumpCommand "$HOME/projects/own/python";
 in
 {
   options = {
@@ -11,16 +14,15 @@ in
     };
   };
 
-  config = {
-    home-manager.users.wittano = {
-      home.packages = mkIf cfg.enable
-        (with pkgs; [ python3 pipenv poetry jetbrains.pycharm-professional ]);
+  config = mkIf (cfg.enable) (mkMerge [
+    ppythonCommand
+    {
+      home-manager.users.wittano = {
+        home.packages = with pkgs; [ python3 pipenv poetry jetbrains.pycharm-professional ];
 
-      programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
-        ppython = "cd $HOME/projects/own/python";
-        temppy =
+        programs.fish.shellAliases.temppy =
           "${pkgs.nixFlakes}/bin/nix flake init --template github:nix-community/poetry2nix";
       };
-    };
-  };
+    }
+  ]);
 }