updated work conf

4 files changed, 86 insertions, 17 deletions

diff --git a/home-manager/.config/home-manager/flake.lock b/home-manager/.config/home-manager/flake.lock
index ec80d66..e279c76 100644
--- a/home-manager/.config/home-manager/flake.lock
+++ b/home-manager/.config/home-manager/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729579044,
+        "narHash": "sha256-0kEUVl5s8LHbK4/xEePflsdYVwG+RRFSIofSvITYmIU=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "64d9d1ae25215c274c37e3e4016977a6779cf0d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "lastModified": 1729551526,
+        "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
         "type": "github"
       },
       "original": {
@@ -22,11 +42,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727437159,
-        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
+        "lastModified": 1729509737,
+        "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
+        "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
         "type": "github"
       },
       "original": {
@@ -38,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1729413321,
+        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
         "type": "github"
       },
       "original": {
@@ -54,6 +74,7 @@
     },
     "root": {
       "inputs": {
+        "darwin": "darwin",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
diff --git a/home-manager/.config/home-manager/flake.nix b/home-manager/.config/home-manager/flake.nix
index ec87801..91f9854 100644
--- a/home-manager/.config/home-manager/flake.nix
+++ b/home-manager/.config/home-manager/flake.nix
@@ -3,12 +3,14 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    darwin.url = "github:lnl7/nix-darwin";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, nixos-hardware, ... }: {
+  outputs = inputs@{ nixpkgs, darwin, home-manager, nixos-hardware, ... }: {
     # NixOS + Home Manager
     nixosConfigurations = {
       "art-sr" = nixpkgs.lib.nixosSystem {
@@ -42,6 +44,21 @@
         ];
       };
     };
+    # Darwin + Home Manager
+    darwinConfigurations = {
+      "Kumars-MacBook-Air" = darwin.lib.darwinSystem {
+        system = "aarch64-darwin";
+        modules = [
+          ./per-user/kdamani-work/configuration.nix
+          home-manager.darwinModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.kdamani = import ./per-user/kdamani-work/home.nix;
+          }
+        ];
+      };
+    };
 
     # Home Manager Only
     homeConfigurations = {
diff --git a/home-manager/.config/home-manager/per-user/kdamani-work/configuration.nix b/home-manager/.config/home-manager/per-user/kdamani-work/configuration.nix
new file mode 100644
index 0000000..37c843d
--- /dev/null
+++ b/home-manager/.config/home-manager/per-user/kdamani-work/configuration.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+{
+  users.users.kdamani.home = "/Users/kdamani";
+
+  environment.systemPackages =
+    [ pkgs.vim
+    ];
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  nix.package = pkgs.nix;
+
+  # Create /etc/zshrc that loads the nix-darwin environment.
+  programs.zsh.enable = true;  # default shell on catalina
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 5;
+}
diff --git a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
index 52b3820..3b38c5f 100644
--- a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
+++ b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
@@ -1,13 +1,14 @@
 { config, pkgs, libs, ...}: 
 {
   home.username = "kdamani";
-  home.homeDirectory = "/home/kdamani";
+  # home.homeDirectory = "/home/kdamani";
+  # home.homeDirectory = "/Users/kdamani";
+  # users.users.kdamani.home = "/Users/kdamani";
   home.sessionPath = [
   	"$HOME/.config/home-manager/common/scripts"
   ];
   home.sessionVariables = {
     EDITOR = "hx";
-    TERM = "xterm-256color";
   };
   home.shellAliases = {
     l = "ls -l";
@@ -20,11 +21,9 @@
     chm = "$EDITOR ~/.config/home-manager/per-user/kdamani-work/home.nix";
     search = "nix search nixpkgs $@";
     conf = "ranger ~/.config/home-manager/common/";
-    up = "home-manager switch";
+    up = "cd ~/.config/home-manager && darwin-rebuild switch --flake .";
     tmux = "tmux -u $@";
     ssh = "INVOKED_VIA_ALIAS=yes ~/.ssh/config.d/managed/scripts/renew.sh";
-    copy = "sudo /opt/orbstack-guest/bin/pbcopy $@";
-    paste = "sudo /opt/orbstack-guest/bin/pbpaste";
   };
 
   programs.home-manager.enable = true;
@@ -47,6 +46,7 @@
     enable = true;
     clock24 = true;
     shell = "${pkgs.zsh}/bin/zsh";
+    # shell = "/bin/zsh";
     prefix = "C-a";
     terminal = "xterm-256color";
     keyMode = "vi";
@@ -60,6 +60,7 @@
       tmuxPlugins.yank
     ];
     sensibleOnTop = true;
+    extraConfig = "set -g default-command '$SHELL'";
   };
   programs.git = {
     enable = true;
@@ -86,6 +87,11 @@
     enable = true;
     enableZshIntegration = true; # see note on other shells below
     nix-direnv.enable = true;
+    config = {
+      global = {
+        load_dotenv = true;
+      };
+    };
   };
   programs.helix = {
     enable = true;
@@ -168,18 +174,23 @@
   };
   home.stateVersion = "23.05";
   home.packages = with pkgs; [
+    colima
+    docker
     dig
     fd
     htop
     imagemagick
     jq
+    kubectl
+    k9s
     poppler
     python311
     ripgrep
     step-cli
     tldr
     yazi
-    # poetry
+    sshpass
+    teleport
   ];
-  targets.genericLinux.enable = true;
+  # targets.genericLinux.enable = true;
 }