Merge branch 'master' of github.com:aciceri/fleet

flake.nix

@@ -52,6 +52,7 @@
     , nixos
     , home
     , nixos-hardware
+    , darwin
     , pinebook-pro
     , pinebook-pro-kernel-latest
     , nixpkgs-wayland
@@ -119,17 +120,20 @@
             ];
           };
           hosts = {
+            # mbp is added bypassing Digga's mkFlake and adding a specific output to this flake
             pc = {
               system = "x86_64-linux";
+              imports = [{ modules = ./hosts/pc; }];
             };
             pbp = {
               system = "aarch64-linux";
+              imports = [{ modules = ./hosts/pbp; }];
               modules = [
                 "${pinebook-pro}/pinebook_pro.nix"
               ];
             };
           };
-            imports = [ (digga.lib.importHosts ./hosts) ];
+          # imports = [ (digga.lib.importHosts ./hosts) ]; # same reason as above
           importables = rec {
             profiles = digga.lib.rakeLeaves ./profiles // {
               users = digga.lib.rakeLeaves ./users;
@@ -151,7 +155,7 @@
 
         home = {
           imports = [ (digga.lib.importModules ./users/modules) ];
-            externalModules = [];
+          externalModules = [ ];
           importables = rec {
             profiles = digga.lib.rakeLeaves ./users/profiles;
             suites = with profiles; rec {
@@ -169,7 +173,7 @@
 
         homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
-          deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
+        deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
 
         defaultTemplate = self.templates.bud;
         templates.bud.path = ./.;
@@ -179,5 +183,12 @@
     // {
       budModules = { devos = import ./bud; };
       # checks.aarch64-linux = { }; # this line will be uncommented by Github Action in order since it can't build aarch64 derivations
+    }
+    // {
+      darwinConfigurations."mbp" = darwin.lib.darwinSystem {
+        system = "x86_64-darwin";
+        modules = [ home.darwinModules.home-manager ./hosts/mbp ];
+        inputs = { inherit darwin; };
+      };
     };
 }

hosts/mbp/configuration.nix

@@ -0,0 +1,30 @@
+{pkgs, home-manager, ...}:
+{
+  imports = [
+    ../../users/andreaciceri
+  ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+  };
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  nix = {
+    package = pkgs.nixUnstable;
+    extraOptions = ''
+      experimental-features = nix-command flakes flakes ca-references
+      keep-derivations = true
+      keep-outputs = true
+    '';
+    gc = {
+      automatic = false;
+      user = "andreaciceri";
+      options = "--delete-older-than 3d";
+    };
+  };
+  }

hosts/mbp/default.nix

@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+{
+  imports = [
+    ./configuration.nix
+  ];
+
+
+}

users/andreaciceri/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }: {
+  home-manager.users."andreaciceri" = {...}: {
+    imports = [
+      ../profiles/bat
+      ../profiles/fzf
+      ../profiles/zsh
+      ../profiles/direnv
+      ../profiles/exa
+    ];
+    home.packages = with pkgs; [
+      yarn
+    ];
+  };
+
+}

users/profiles/zsh/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   programs.zsh = {
     enable = true;
@@ -55,5 +55,8 @@
       PROMPT = "\\\${IN_NIX_SHELL:+[nix-shell] }$PROMPT";
     };
     loginExtra = "[[ -z $DISPLAY && $TTY = /dev/tty1 ]] && exec sway";
+    initExtra = if pkgs.system == "x86_64-darwin"
+    then "if test -e /etc/static/bashrc; then source /etc/static/bashrc > /dev/null 2>&1; fi"
+    else "";
   };
 }