refactor

.gitignore

@@ -1 +1,5 @@
-smb-secrets
+/smb-secrets
+
+# Darwin
+/nix.conf
+/registry.json

flake.nix

@@ -25,12 +25,14 @@
           ({ ... }: { nixpkgs.overlays = [ (import ./packages) ]; })
         ];
       };
-      antoine-macbookpro = nix-darwin.lib.darwinSystem {
+    };
+    darwinConfigurations.antoine-macbookpro = nix-darwin.lib.darwinSystem {
+        specialArgs = { inherit inputs; };
         system = "x86_64-darwin";
         modules = [
+          ./hosts/antoine-macbookpro/configuration.nix
           home-manager.darwinModules.default
         ];
       };
-    };
   };
 }

hosts/antoine-macbookpro/configuration.nix

@@ -0,0 +1,36 @@
+{ inputs, pkgs, ... }: {
+  imports = [
+    ./services.nix
+    inputs.home-manager.darwinModules.default
+  ];
+
+  # Nix
+  nix.settings.experimental-features = "nix-command flakes";
+  nixpkgs.hostPlatform = "x86_64-darwin";
+  nixpkgs.config.allowUnfree = true;
+
+  # System
+  system.stateVersion = 4;
+  system.configurationRevision = inputs.rev or inputs.dirtyRev or null;
+
+  environment.systemPackages = with pkgs; [];
+  environment.shells = with pkgs; [ zsh ];
+
+  users.users.antoine = {
+    name = "antoine";
+    home = "/Users/antoine";
+    shell = pkgs.zsh;
+  };
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      "antoine" = import ./home-manager/home.nix;
+    };
+  };
+
+  programs = {
+    zsh.enable = true;
+  };
+}

hosts/antoine-macbookpro/home-manager/home.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }: 
+{
+  imports = [
+    # Reusable modules
+    ../../../modules/home-manager/zsh.nix
+    ../../../modules/home-manager/git.nix
+    ../../../modules/home-manager/ssh.nix
+    ../../../modules/home-manager/go.nix
+    ../../../modules/home-manager/utils.nix
+
+    # Shared home-manager configuration between systems
+    ../../shared/hm.nix
+  ];
+
+  home.packages = with pkgs; [];
+
+  programs = {
+    bash.enable = true;
+    git.signing.key = "099D31E860471ABE8425358243C0623D204EE13D";
+  };
+
+  home.stateVersion = "23.11";
+}

hosts/antoine-macbookpro/services.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.nix-daemon.enable = true;
+}

hosts/antoine-nixos/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [
     # Modules
@@ -6,7 +6,7 @@
     ../../modules/linux/nvidia.nix
     inputs.home-manager.nixosModules.default
 
-    # Normal configuration
+    # Host specific
     ./hardware-configuration.nix
     ./systemd.nix
     ./services.nix

hosts/antoine-nixos/home-manager/home.nix

@@ -17,13 +17,16 @@
     ../../../modules/home-manager/swaylock
     ../../../modules/home-manager/vscode.nix
     ../../../modules/home-manager/go.nix
-    ../../../modules/home-manager/utils.nix 
+    ../../../modules/home-manager/utils.nix
     ../../../modules/home-manager/tofi
     ../../../modules/home-manager/services/dunst.nix
     # ../../../modules/home-manager/services/espanso.nix
     ../../../modules/home-manager/services/gpg_ssh_agent.nix
     ../../../modules/home-manager/looking-glass
 
+    # Shared home-manager configuration between systems
+    ../../shared/hm.nix
+
     # Host specific
     ./services.nix
   ];
@@ -38,44 +41,21 @@
     nextcloud-client
     signal-desktop
     vlc
-    
+
     # CLI tools
-    ripgrep
-    jq
-    yq-go
+    cliphist
     gnupg
-    iotop
-    iftop
-    zip
-    unzip
-    difftastic
-    wget
-    fd
-    waybar
-    swaynotificationcenter
-    playerctl
-    nodejs
+    grim
+    hyprshot
+    pciutils
     python3
-    xh
-    nix-index
-    corepack
-    neofetch
+    slurp
+    swaynotificationcenter
     swww
     tofi
-    grim
-    slurp
-    hyprshot
+    waybar
     wl-clipboard
-    satty
-    cliphist
-    pciutils
-    awscli2
-    rustup
-    gh
-    php83
-    php83Packages.composer
-    zoxide
-    ruff
+    iotop
 
     # Libraries
     libnotify
@@ -91,32 +71,14 @@
     XDG_DATA_HOME = "$HOME/.local/share";
     XDG_STATE_HOME = "$HOME/.local/state";
   };
-  home.sessionPath = [
-    "$(go env GOBIN)"
-    "$HOME/.cargo/bin"
-  ];
 
   programs = {
     cava.enable = true;
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-    };
-
-    starship = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
     gpg = {
       enable = true;
       mutableKeys = true;
       mutableTrust = true;
     };
-
-    # Add GPG key outside of reusable module
     git.signing.key = "A12925470298BFEE7EE092B3946E2D0C410C7B3D";
   };
 

hosts/shared/hm.nix

@@ -0,0 +1,45 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # CLI
+    awscli2
+    corepack
+    difftastic
+    fd
+    gh
+    iftop
+    jq
+    neofetch
+    nix-index
+    nodejs
+    python3
+    ripgrep
+    ruff
+    rustup
+    sd
+    unzip
+    wget
+    xh
+    yq-go
+    zip
+    zoxide
+  ];
+  home.sessionPath = [
+    "$(go env GOBIN)"
+    "$HOME/.cargo/bin"
+  ];
+
+  programs = {
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+    };
+
+    starship = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+  };
+}