From b79585312147e71d0dd9460814a85a01ca357ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Szak=C3=A1llas?=
 <5807322+dszakallas@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:28:13 +0100
Subject: [PATCH] path fixes

---
 devenv.lock                             |  8 ++---
 hosts/dszakallas--Clownfish/default.nix | 11 +++++--
 hosts/jellyfish/default.nix             | 18 ++++++++---
 modules/darwin/default/default.nix      | 41 +++++++++++++++++--------
 modules/darwin/p10y/default.nix         |  9 ++++--
 modules/home/default/default.nix        | 11 +++----
 users/davidszakallas/default.nix        |  7 ++---
 users/dszakallas/default.nix            |  3 ++
 8 files changed, 72 insertions(+), 36 deletions(-)

diff --git a/devenv.lock b/devenv.lock
index 948a4c5..a993162 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1737729971,
+        "lastModified": 1738414267,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "68a6d54dbeb5622b8435d7f1acf9ce239a075635",
+        "rev": "3f49b4afbb9a80b1e81fb6071f59dac152177efa",
         "type": "github"
       },
       "original": {
@@ -53,10 +53,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737717945,
+        "lastModified": 1738452225,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecd26a469ac56357fd333946a99086e992452b6a",
+        "rev": "6c4e0724e0a785a20679b1bca3a46bfce60f05b6",
         "type": "github"
       },
       "original": {
diff --git a/hosts/dszakallas--Clownfish/default.nix b/hosts/dszakallas--Clownfish/default.nix
index ce52534..9de3b8c 100644
--- a/hosts/dszakallas--Clownfish/default.nix
+++ b/hosts/dszakallas--Clownfish/default.nix
@@ -1,6 +1,8 @@
 { self, davids-dotfiles, ... }:
-let myUsername = "dszakallas";
-in {
+let
+  myUsername = "dszakallas";
+in
+{
   imports = [
     davids-dotfiles.systemModules.default
     davids-dotfiles.darwinModules.default
@@ -13,5 +15,8 @@ in {
     version = "29";
   };
 
-  nix.settings.trusted-users = [ "root" myUsername ];
+  nix.settings.trusted-users = [
+    "root"
+    myUsername
+  ];
 }
diff --git a/hosts/jellyfish/default.nix b/hosts/jellyfish/default.nix
index 2fca7bf..c16e887 100644
--- a/hosts/jellyfish/default.nix
+++ b/hosts/jellyfish/default.nix
@@ -1,6 +1,13 @@
-{ self, davids-dotfiles, davids-dotfiles-private, ... }@inputs:
-let myUsername = "davidszakallas";
-in {
+{
+  self,
+  davids-dotfiles,
+  davids-dotfiles-private,
+  ...
+}@inputs:
+let
+  myUsername = "davidszakallas";
+in
+{
   imports = [
     davids-dotfiles.systemModules.default
     davids-dotfiles.darwinModules.default
@@ -11,7 +18,10 @@ in {
     davids-dotfiles.users.${myUsername}
   ];
 
-  nix.settings.trusted-users = [ "root" myUsername ];
+  nix.settings.trusted-users = [
+    "root"
+    myUsername
+  ];
 
   davids.emacs = {
     enable = true;
diff --git a/modules/darwin/default/default.nix b/modules/darwin/default/default.nix
index 9d05b1c..b808fa9 100644
--- a/modules/darwin/default/default.nix
+++ b/modules/darwin/default/default.nix
@@ -1,5 +1,14 @@
 { self, davids-dotfiles, ... }:
-{ pkgs, config, system, nixConfig, hostName, lib, ... }: {
+{
+  pkgs,
+  config,
+  system,
+  nixConfig,
+  hostName,
+  lib,
+  ...
+}:
+{
   options = with lib; {
     davids.emacs = {
       enable = mkEnableOption "Emacs configuration (system-wide)";
@@ -15,26 +24,32 @@
 
     homebrew.enable = true;
 
-    homebrew.casks = [ "gpg-suite" "iterm2" "firefox" "keepassxc" ];
+    homebrew.casks = [
+      "gpg-suite"
+      "iterm2"
+      "firefox"
+      "keepassxc"
+    ];
 
-    homebrew.brews = lib.optionals config.davids.emacs.enable [{
-      name = "emacs-plus@${config.davids.emacs.version}";
-      args = [ "with-native-comp" ];
-    }];
+    homebrew.brews = lib.optionals config.davids.emacs.enable [
+      {
+        name = "emacs-plus@${config.davids.emacs.version}";
+        args = [ "with-native-comp" ];
+      }
+    ];
 
-    homebrew.taps =
-      lib.optionals config.davids.emacs.enable [ "d12frosted/emacs-plus" ];
+    homebrew.taps = lib.optionals config.davids.emacs.enable [ "d12frosted/emacs-plus" ];
 
     # Create /etc/zshrc that loads the nix-darwin environment.
     programs.zsh = {
       enable = true; # default shell on catalina
 
       # Add back the original contents
-      shellInit = ''
-        if [ -x /usr/libexec/path_helper ]; then
-          eval `/usr/libexec/path_helper -s`
-        fi
-      '';
+      # shellInit = ''
+      #   if [ -x /usr/libexec/path_helper ]; then
+      #     eval `/usr/libexec/path_helper -s`
+      #   fi
+      # '';
     };
 
     # Set Git commit hash for darwin-version.
diff --git a/modules/darwin/p10y/default.nix b/modules/darwin/p10y/default.nix
index 50ef77d..cb3173f 100644
--- a/modules/darwin/p10y/default.nix
+++ b/modules/darwin/p10y/default.nix
@@ -1,4 +1,9 @@
-{ ... }: {
+{ ... }:
+{
   homebrew.brews = [ "podman" ];
-  homebrew.casks = [ "logseq" "ukelele" "podman-desktop" ];
+  homebrew.casks = [
+    "logseq"
+    "ukelele"
+    "podman-desktop"
+  ];
 }
diff --git a/modules/home/default/default.nix b/modules/home/default/default.nix
index 71d727f..7cdbbfd 100644
--- a/modules/home/default/default.nix
+++ b/modules/home/default/default.nix
@@ -214,6 +214,11 @@ in
         EDITOR = "vim";
         LANG = "en_US.UTF-8";
       };
+      shellAliases = {
+        la = "ls -la";
+        g = "git";
+        v = "vim";
+      };
       file.".ssh/davids.known_hosts".text = mkIf config.davids.ssh.enable (
         davids-dotfiles.lib.textRegion {
           name = moduleName;
@@ -296,12 +301,6 @@ in
           ];
           theme = "clean";
         };
-
-        shellAliases = {
-          la = "ls -la";
-          g = "git";
-          v = "vim";
-        };
       };
     };
   };
diff --git a/users/davidszakallas/default.nix b/users/davidszakallas/default.nix
index 8bad737..7288a76 100644
--- a/users/davidszakallas/default.nix
+++ b/users/davidszakallas/default.nix
@@ -23,6 +23,9 @@
       username = "davidszakallas";
       homeDirectory = "/Users/davidszakallas";
       stateVersion = "24.05";
+      shellAliases = {
+        docker = "podman";
+      };
     };
 
     programs.home-manager.enable = true;
@@ -40,9 +43,5 @@
     };
     davids.jupiter.enable = true;
     davids.ssh.enable = true;
-
-    programs.zsh.shellAliases = {
-      docker = "podman";
-    };
   };
 }
diff --git a/users/dszakallas/default.nix b/users/dszakallas/default.nix
index e1e1caf..897da64 100644
--- a/users/dszakallas/default.nix
+++ b/users/dszakallas/default.nix
@@ -23,6 +23,9 @@
       username = "dszakallas";
       homeDirectory = "/Users/dszakallas";
       stateVersion = "24.05";
+      shellAliases = {
+        docker = "podman";
+      };
     };
 
     programs.home-manager.enable = true;