From d9f618577441bf098eb6d4b814b2e1c75ec86a73 Mon Sep 17 00:00:00 2001
From: Wittano Bonarotti <radoslaw.ratyna@gmail.com>
Date: Mon, 22 Jul 2024 19:34:17 +0200
Subject: [PATCH] feat(fish): changed default localization of projects

---
 configuration.nix      |  7 ++++---
 flake.lock             | 20 ++++++++++----------
 modules/dev/ide.nix    |  4 ++--
 modules/shell/fish.nix |  6 +++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 8e88c664..dab80715 100644
--- 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
index dcc61cf4..41d44145 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721398860,
-        "narHash": "sha256-J+VnzUGk0FEmpQS7yxSbaaFeWxi+oSrTAYGG/Kvyn2Q=",
+        "lastModified": 1721560243,
+        "narHash": "sha256-GFGgMqboIml64pRWKFDkvKv0YfF598IICw6l7ZuZsBg=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "4d3da7c00c6cf62b3fc2e1ec96e8620cbe247ba0",
+        "rev": "d23885fa712e639723eeda01f4d2cd26587056e6",
         "type": "github"
       },
       "original": {
@@ -448,11 +448,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1721409541,
-        "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
+        "lastModified": 1721548954,
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
+        "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
         "type": "github"
       },
       "original": {
@@ -494,8 +494,8 @@
     "nixpkgs_7": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
-        "path": "/nix/store/qszplw617r895nbcprgyj139c9a3r0xs-source",
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
+        "path": "/nix/store/lzhqf5y9dcgfkg5f7f96jjc814pgrsqy-source",
         "type": "path"
       },
       "original": {
@@ -520,8 +520,8 @@
     "nixpkgs_9": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
-        "path": "/nix/store/qszplw617r895nbcprgyj139c9a3r0xs-source",
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
+        "path": "/nix/store/lzhqf5y9dcgfkg5f7f96jjc814pgrsqy-source",
         "type": "path"
       },
       "original": {
diff --git a/modules/dev/ide.nix b/modules/dev/ide.nix
index 27f5de7e..462b5cac 100644
--- 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
index db69e7c2..1e597bb4 100644
--- 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";