Merge branch 'main' of github.com:tmayoff/.dotfiles

dot_config/aerospace/aerospace.toml

@@ -9,7 +9,7 @@ after-login-command = []
 after-startup-command = []
 
 # Start AeroSpace at login
-start-at-login = true
+# start-at-login = true
 
 # Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
 enable-normalization-flatten-containers = true
@@ -57,7 +57,7 @@ inner.horizontal = 4
 inner.vertical =   4
 outer.left =       0
 outer.bottom =     0
-outer.top =        30
+outer.top =        0
 outer.right =      0
 
 # 'main' binding mode declaration

dot_config/flake/flake.nix

@@ -76,13 +76,12 @@
     };
 
     darwinConfigurations."MAC-C57KK2TC69" = darwin.lib.darwinSystem {
-      pkgs = allPkgs."aarch64-darwin";
+      specialArgs = {inherit inputs outputs;};
-      specialArgs = {inherit inputs;};
 
       modules = [
         lix-module.nixosModules.default
 
-        ./home/hinge/darwin.nix
+        ./machines/hinge/darwin.nix
 
         home-manager.darwinModules.home-manager
         {
@@ -90,7 +89,7 @@
           home-manager.useUserPackages = true;
 
           home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
+          home-manager.users."tyler.mayoff" = import ./machines/hinge/home.nix;
           users.users."tyler.mayoff".home = "/Users/tyler.mayoff";
         }
       ];
@@ -103,6 +102,12 @@
         modules = [./home/guidebolt/guidebolt.nix];
       };
 
+      # "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
+      #   pkgs = allPkgs."aarch64-darwin";
+      #   extraSpecialArgs = {inherit inputs outputs;};
+      #   modules = [./home/wash/wash.nix];
+      # };
+
       "tyler@wash" = home-manager.lib.homeManagerConfiguration {
         pkgs = allPkgs."x86_64-linux";
         extraSpecialArgs = {inherit inputs outputs;};

dot_config/flake/home/common.nix

@@ -16,14 +16,14 @@
     ./nushell.nix
   ];
 
-  nixpkgs = {
+  # nixpkgs = {
-    overlays = [
+  #   overlays = [
-      outputs.overlays.additions
+  #     outputs.overlays.additions
-      outputs.overlays.modifications
+  #     outputs.overlays.modifications
-      outputs.overlays.unstable-packages
+  #     outputs.overlays.unstable-packages
-      inputs.helix.overlays.default
+  #     inputs.helix.overlays.default
-    ];
+  #   ];
-  };
+  # };
 
   home.packages = with pkgs; [
     # unstable.nix-output-monitor

dot_config/flake/home/hinge/sketchybar.nix

@@ -1,6 +0,0 @@
-{...}: {
-  # services.sketchybar = {
-  #   enable = true;
-  #   extraPackages = [];
-  # };
-}

dot_config/flake/machines/hinge/darwin.nix

@@ -1,11 +1,9 @@
 {
+  inputs,
   outputs,
   pkgs,
-  lib,
   ...
 }: {
-  # services.aerospace.enable = true;
-
   imports = [
     # ../fish.nix
     ./sketchybar.nix
@@ -16,21 +14,26 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
+      inputs.helix.overlays.default
     ];
 
     config = {
       allowUnfree = true;
     };
+
+    hostPlatform = "aarch64-darwin";
   };
 
-  nix.extraOptions =
+  nix.settings.experimental-features = ["nix-command" "flakes"];
-    ''
+
-      auto-optimise-store = true
+  # nix.extraOptions =
-      experimental-features = nix-command flakes
+  #   ''
-    ''
+  #     auto-optimise-store = true
-    + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+  #     experimental-features = nix-command flakes
-      extra-platforms = x86_64-darwin aarch64-darwin
+  #   ''
-    '';
+  #   + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+  #     extra-platforms = x86_64-darwin aarch64-darwin
+  #   '';
 
   users.knownUsers = ["tyler.mayoff"];
   users.users."tyler.mayoff" = {
@@ -47,7 +50,7 @@
     llvmPackages_19.clang-tools
 
     sketchybar
-    sbarlua
+    # sbarlua
 
     lua
 
@@ -55,6 +58,8 @@
     jdk17
   ];
 
+  # services.aerospace.enable = true;
+
   programs.fish.enable = true;
   programs.zsh.enable = true;
 

dot_config/flake/machines/hinge/home.nix

@@ -1,8 +1,8 @@
 {pkgs, ...}: {
   imports = [
-    ../stylix.nix
+    # ../../home/stylix.nix
-    ../common.nix
+    ../../home/common.nix
-    ../kitty.nix
+    ../../home/kitty.nix
   ];
 
   # xdg.enable = lib.mkForce false;
@@ -40,7 +40,22 @@
     file.".gnupg/gpg-agent.conf".text = ''
       pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
     '';
+
+    file.".config/sketchybar/sketchybarrc" = {
+      executable = true;
+      text = ''
+        #!/usr/bin/env lua
+
+        package.cpath = package.cpath .. ";${pkgs.sbarlua}/lib/lua/5.4/sketchybar.so"
+
+        -- Load the sketchybar-package and prepare the helper binaries
+        require("helpers")
+        require("init")
+      '';
+    };
   };
 
+  programs.home-manager.enable = true;
+
   home.stateVersion = "24.11";
 }

dot_config/flake/machines/hinge/sketchybar.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  services.sketchybar = {
+    # enable = true;
+    extraPackages = with pkgs; [
+      sbarlua
+    ];
+  };
+}

dot_config/flake/pkgs/default.nix

@@ -1,9 +1,3 @@
 pkgs: {
-  sbarlua = {
+  sbarlua = pkgs.callPackage ./sbarlua {};
-    src = pkgs.fetchFromGitHub {
-      repo = "SbarLua";
-      owner = "FelixKratz";
-      rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
-    };
-  };
 }

dot_config/flake/pkgs/sbarlua/default.nix

@@ -0,0 +1,33 @@
+{
+  stdenv,
+  clang,
+  fetchFromGitHub,
+  gcc,
+  readline,
+  lua5_4,
+}: let
+  lua = lua5_4;
+in
+  stdenv.mkDerivation {
+    pname = "SBarLua";
+    version = "unstable-2024-02-28";
+
+    src = fetchFromGitHub {
+      owner = "FelixKratz";
+      repo = "SbarLua";
+      rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
+      hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg=";
+    };
+
+    nativeBuildInputs = [
+      clang
+      gcc
+    ];
+
+    buildInputs = [readline];
+
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}/
+      cp -r bin/* "$out/lib/lua/${lua.luaversion}/"
+    '';
+  }

dot_config/sketchybar/executable_sketchybarrc

@@ -1,5 +0,0 @@
-#!/usr/bin/env lua
-
--- Load the sketchybar-package and prepare the helper binaries
-require("helpers")
-require("init")

dot_config/sketchybar/helpers/init.lua

@@ -1,4 +1,3 @@
 -- Add the sketchybar module to the package cpath
-package.cpath = package.cpath .. ";/Users/" .. os.getenv("USER") .. "/.local/share/sketchybar_lua/?.so"
 
 os.execute("(cd helpers && make)")

run_nix-rebuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 [[ $(command -v nixos-rebuild) ]] && sudo nixos-rebuild switch --flake ~/.config/flake
-[[ $(command -v darwin-rebuild) ]] && sudo darwin-rebuild switch --flake ~/.config/flake/
+[[ $(command -v darwin-rebuild) ]] && darwin-rebuild switch --flake ~/.config/flake/
 [[ $(command -v home-manager) ]] && home-manager switch --flake ~/.config/flake/