feat(fish): changed default localization of projects

Wittano · Jul 22, 2024 · d9f6185 · d9f6185
1 parent 1724605
commit d9f6185
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -4,6 +4,7 @@
 , desktopName
 , hostname
 , inputs
+, config
 , ...
 }:
 with lib; rec {
@@ -73,12 +74,12 @@ with lib; rec {
     systemPackages = with pkgs; [ vim htop bash ];
     variables =
       let
-        projectConfigDir = "/home/wittano/projects/config";
+        homeDir = config.home-manager.users.wittano.home.homeDirectory;
       in
       {
         EDITOR = "vim";
-        DOTFILES = "${projectConfigDir}/nix-dotfiles/dotfiles";
-        NIX_DOTFILES = "${projectConfigDir}/nix-dotfiles";
+        DOTFILES = "${homeDir}/nix-dotfiles/dotfiles";
+        NIX_DOTFILES = "${homeDir}/nix-dotfiles";
       };
 
     shells = with pkgs; [ bash ];

diff --git a/flake.lock b/flake.lock
diff --git a/modules/dev/ide.nix b/modules/dev/ide.nix
@@ -5,13 +5,13 @@ let
   cfg = config.modules.dev.lang;
 
   homeDir = config.home-manager.users.wittano.home.homeDirectory;
-  addProjectDirField = attr: builtins.mapAttrs (n: v: v // { projectDir = "${homeDir}/projects/own/${n}"; }) attr;
+  addProjectDirField = attr: builtins.mapAttrs (n: v: v // { projectDir = "${homeDir}/projects/${n}"; }) attr;
 
   avaiableIde =
     let
       mkExtraConfig = ide: mkMerge [
         {
-          home-manager.users.wittano.home.packages = with unstable; [ vscodium ];
+          home-manager.users.wittano.home.packages = [ ide.package ];
         }
         (ide.extraConfig or { })
       ];

diff --git a/modules/shell/fish.nix b/modules/shell/fish.nix
@@ -105,7 +105,7 @@ in
             let
               host = (strings.removeSuffix "-dev" hostname) +
                 (strings.optionalString (desktopName != "") "-${desktopName}");
-                
+
               templatesAliases = attrsets.mapAttrs'
                 (n: v: {
                   name = "t${n}";
@@ -153,8 +153,8 @@ in
               py = "nix run nixpkgs#python3";
 
               # Projects
-              pnix = "cd $NIX_DOTFILES";
-              plab = "cd $HOME/projects/config/home-lab";
+              pnix = "cd $HOME/nix-dotfiles";
+              plab = "cd $HOME/projects/server/home-lab";
 
               # Nix
               nfu = "nix flake update";