Add macbook configuration

jeremystucki · Jun 18, 2024 · f9155da · f9155da
1 parent d6c35d2
commit f9155da
Show file tree

Hide file tree

Showing 13 changed files with 338 additions and 110 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,8 +6,9 @@ jobs:
       fail-fast: false
       matrix:
         configuration:
-          - "nixosConfigurations.x86_64-linux.volt-nixos.config.system.build.toplevel"
-          - "nixosConfigurations.x86_64-linux.zephyr-nixos.config.system.build.toplevel"
+          - "nixosConfigurations.volt-nixos.config.system.build.toplevel"
+          - "nixosConfigurations.zephyr-nixos.config.system.build.toplevel"
+          - 'darwinConfigurations.work-macbook.system'
 
     runs-on: ubuntu-latest
 

diff --git a/common/apps.nix b/common/apps.nix
@@ -0,0 +1,9 @@
+{ pkgs, pkgs-unstable, ... }:
+
+{
+  home.packages = [
+    pkgs.obsidian
+    pkgs-unstable.discord
+    pkgs-unstable.spotify
+  ];
+}
diff --git a/common/home-manager.nix b/common/home-manager.nix
@@ -1,23 +1,24 @@
 {
-  imports = map (x: ../components + x) [
-    /alacritty.nix
-    /cli.nix
-    /code.nix
-    /common-apps.nix
-    /cpp.nix
-    /dotnet.nix
-    /gcloud.nix
-    /git.nix
-    /haskell.nix
-    /tex.nix
-    /tmux.nix
-    /typst.nix
-    /vim.nix
-    /zsh.nix
-  ];
+  imports =
+    [ ./apps.nix ]
+    ++ map (x: ../components + x) [
+      /alacritty.nix
+      /android.nix
+      /cli.nix
+      /code.nix
+      /databases.nix
+      /dotnet.nix
+      /gcloud.nix
+      /git.nix
+      /java.nix
+      /tex.nix
+      /tmux.nix
+      /typst.nix
+      /vim.nix
+      /zsh.nix
+    ];
 
   home.username = "jeremy";
-  home.homeDirectory = "/home/jeremy";
   home.stateVersion = "23.05";
 
   programs.home-manager.enable = true;

diff --git a/common/nixos-home-manager.nix b/common/nixos-home-manager.nix
@@ -5,11 +5,14 @@ let
 in
 {
   imports = map (x: ../components + x) [
-    /android.nix
-    /databases.nix
+    /common-apps.nix
+    /cpp.nix
+    /haskell.nix
     /web.nix
   ];
 
+  home.homeDirectory = "/home/jeremy";
+
   programs.git.extraConfig = {
     commit.gpgsign = true;
     user.signingkey = publicKey;

diff --git a/components/android.nix b/components/android.nix
@@ -1,8 +1,7 @@
 { pkgs, pkgs-unstable, ... }:
 
 {
-  home.packages = with pkgs; [
-    android-tools
-    pkgs-unstable.android-studio
-  ];
+  home.packages =
+    with pkgs;
+    [ android-tools ] ++ lib.optional (!stdenv.isDarwin) [ pkgs-unstable.android-studio ];
 }
diff --git a/components/cli.nix b/components/cli.nix
@@ -1,36 +1,41 @@
 { pkgs, pkgs-unstable, ... }:
 
 {
-  home.packages = with pkgs; [
-    asciinema
-    bat
-    caddy
-    delta
-    dogdns
-    du-dust
-    entr
-    fd
-    ffmpeg-full
-    file
-    miller
-    multipath-tools
-    ngrok
-    nmap
-    nodePackages.svgo
-    ocrmypdf
-    ollama
-    pdftk
-    pkgs-unstable.nixfmt-rfc-style
-    ranger
-    ripgrep
-    tesseract
-    tokei
-    tree
-    units
-    wol
-    yt-dlp
-    zip
-  ];
+  home.packages =
+    with pkgs;
+    [
+      asciinema
+      bat
+      caddy
+      delta
+      dogdns
+      du-dust
+      entr
+      fd
+      ffmpeg-full
+      file
+      mani
+      miller
+      nmap
+      nodePackages.svgo
+      ocrmypdf
+      ollama
+      pdftk
+      pkgs-unstable.nixfmt-rfc-style
+      ranger
+      ripgrep
+      tesseract
+      tokei
+      tree
+      units
+      yt-dlp
+      zip
+    ]
+    ++ lib.optional (!stdenv.isDarwin) [
+      multipath-tools
+      ngrok
+      wol
+    ];
 
   programs.bat.enable = true;
   programs.jq.enable = true;

diff --git a/components/databases.nix b/components/databases.nix
@@ -1,11 +1,13 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-    postgresql
-    sqlite
-    jetbrains.datagrip
-  ];
+  home.packages =
+    with pkgs;
+    [
+      postgresql
+      sqlite
+    ]
+    ++ lib.optional (!stdenv.isDarwin) [ jetbrains.datagrip ];
 
   home.file.".psqlrc".text = ''
     \set ON_ERROR_ROLLBACK interactive

diff --git a/components/dotnet.nix b/components/dotnet.nix
@@ -13,6 +13,6 @@
         pkgs-unstable.dotnet-sdk_8
         pkgs-unstable.dotnet-aspnetcore_8
       ])
-      pkgs-unstable.jetbrains.rider
-    ];
+    ]
+    ++ lib.optional (!stdenv.isDarwin) [ pkgs-unstable.jetbrains.rider ];
 }
diff --git a/components/java.nix b/components/java.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  programs.java = {
+    enable = true;
+    package = pkgs.openjdk17;
+  };
+}
diff --git a/components/vim.nix b/components/vim.nix
@@ -12,6 +12,7 @@
       catppuccin-nvim
       fzf-vim
       kotlin-vim
+      nerdtree
       vim-commentary
       vim-fugitive
       vim-nix

diff --git a/darwin-home-manager.nix b/darwin-home-manager.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    bundler
+    element-desktop
+    iterm2
+    kitty
+    xcodes
+  ];
+
+  home.homeDirectory = "/Users/jeremy";
+}