From 6768bdb19e1bdd59bb29f65be2f79a229ad7b3f4 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Mon, 17 Feb 2025 09:11:09 -0500 Subject: [PATCH 1/2] Reorg --- dot_config/aerospace/aerospace.toml | 2 +- dot_config/flake/flake.nix | 13 ++-- dot_config/flake/home/common.nix | 16 ++--- .../flake/{home => machines}/hinge/darwin.nix | 29 +++++---- .../hinge.nix => machines/hinge/home.nix} | 8 ++- .../{home => machines}/hinge/sketchybar.nix | 0 dot_config/flake/pkgs/default.nix | 8 +-- dot_config/flake/pkgs/sbarlua/default.nix | 62 +++++++++++++++++++ run_nix-rebuild.sh | 2 +- 9 files changed, 104 insertions(+), 36 deletions(-) rename dot_config/flake/{home => machines}/hinge/darwin.nix (65%) rename dot_config/flake/{home/hinge/hinge.nix => machines/hinge/home.nix} (87%) rename dot_config/flake/{home => machines}/hinge/sketchybar.nix (100%) create mode 100644 dot_config/flake/pkgs/sbarlua/default.nix diff --git a/dot_config/aerospace/aerospace.toml b/dot_config/aerospace/aerospace.toml index de7ef24..56b326e 100644 --- a/dot_config/aerospace/aerospace.toml +++ b/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 diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 01d9607..69b1ab0 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -76,13 +76,12 @@ }; darwinConfigurations."MAC-C57KK2TC69" = darwin.lib.darwinSystem { - pkgs = allPkgs."aarch64-darwin"; - specialArgs = {inherit inputs;}; + specialArgs = {inherit inputs outputs;}; 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;}; diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index b457efc..e6cd860 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -16,14 +16,14 @@ ./nushell.nix ]; - nixpkgs = { - overlays = [ - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - inputs.helix.overlays.default - ]; - }; + # nixpkgs = { + # overlays = [ + # outputs.overlays.additions + # outputs.overlays.modifications + # outputs.overlays.unstable-packages + # inputs.helix.overlays.default + # ]; + # }; home.packages = with pkgs; [ # unstable.nix-output-monitor diff --git a/dot_config/flake/home/hinge/darwin.nix b/dot_config/flake/machines/hinge/darwin.nix similarity index 65% rename from dot_config/flake/home/hinge/darwin.nix rename to dot_config/flake/machines/hinge/darwin.nix index a44ab98..a1df994 100644 --- a/dot_config/flake/home/hinge/darwin.nix +++ b/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 = - '' - auto-optimise-store = true - experimental-features = nix-command flakes - '' - + lib.optionalString (pkgs.system == "aarch64-darwin") '' - extra-platforms = x86_64-darwin aarch64-darwin - ''; + nix.settings.experimental-features = ["nix-command" "flakes"]; + + # nix.extraOptions = + # '' + # auto-optimise-store = true + # experimental-features = nix-command flakes + # '' + # + 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; diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/machines/hinge/home.nix similarity index 87% rename from dot_config/flake/home/hinge/hinge.nix rename to dot_config/flake/machines/hinge/home.nix index 68b9a90..d335bd0 100644 --- a/dot_config/flake/home/hinge/hinge.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { imports = [ - ../stylix.nix - ../common.nix - ../kitty.nix + # ../../home/stylix.nix + ../../home/common.nix + ../../home/kitty.nix ]; # xdg.enable = lib.mkForce false; @@ -42,5 +42,7 @@ ''; }; + programs.home-manager.enable = true; + home.stateVersion = "24.11"; } diff --git a/dot_config/flake/home/hinge/sketchybar.nix b/dot_config/flake/machines/hinge/sketchybar.nix similarity index 100% rename from dot_config/flake/home/hinge/sketchybar.nix rename to dot_config/flake/machines/hinge/sketchybar.nix diff --git a/dot_config/flake/pkgs/default.nix b/dot_config/flake/pkgs/default.nix index 952d3a4..ec3a7cc 100644 --- a/dot_config/flake/pkgs/default.nix +++ b/dot_config/flake/pkgs/default.nix @@ -1,9 +1,3 @@ pkgs: { - sbarlua = { - src = pkgs.fetchFromGitHub { - repo = "SbarLua"; - owner = "FelixKratz"; - rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; - }; - }; + sbarlua = pkgs.callPackage ./sbarlua {}; } diff --git a/dot_config/flake/pkgs/sbarlua/default.nix b/dot_config/flake/pkgs/sbarlua/default.nix new file mode 100644 index 0000000..bf1b4df --- /dev/null +++ b/dot_config/flake/pkgs/sbarlua/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gcc, + lua, + nix-update-script, + apple-sdk_15, + versionCheckHook, +}: let + inherit (stdenv.hostPlatform) system; + + target = + { + "aarch64-darwin" = "arm64"; + "x86_64-darwin" = "x86"; + } + .${system} + or (throw "Unsupported system: ${system}"); +in + stdenv.mkDerivation ( + finalAttrs: { + pname = "SBarLua"; + version = "437bd2031da38ccda75827cb7548e7baa4aa9978"; + src = fetchFromGitHub { + repo = "SbarLua"; + owner = "FelixKratz"; + rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; + hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg="; + }; + + nativeBuildInputs = [ + gcc + ]; + + buildInputs = [ + apple-sdk_15 + lua + ]; + + # buildPhase = '' + # make + # ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + ls -la + + cp ./bin/sbarlua $out/bin/sbarlua + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/FelixKratz/SbarLua"; + platforms = lib.platforms.darwin; + }; + } + ) diff --git a/run_nix-rebuild.sh b/run_nix-rebuild.sh index 9f425d1..eeaab21 100755 --- a/run_nix-rebuild.sh +++ b/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/ From c1e274ab1c64805a6ba98faaa86afedfdd536cf9 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Mon, 17 Feb 2025 12:54:48 -0500 Subject: [PATCH 2/2] Change primary display don't need sketchybar --- dot_config/aerospace/aerospace.toml | 2 +- dot_config/flake/machines/hinge/home.nix | 13 ++++ .../flake/machines/hinge/sketchybar.nix | 12 +-- dot_config/flake/pkgs/sbarlua/default.nix | 75 ++++++------------- dot_config/sketchybar/executable_sketchybarrc | 5 -- dot_config/sketchybar/helpers/init.lua | 1 - 6 files changed, 44 insertions(+), 64 deletions(-) delete mode 100755 dot_config/sketchybar/executable_sketchybarrc diff --git a/dot_config/aerospace/aerospace.toml b/dot_config/aerospace/aerospace.toml index 56b326e..e66101b 100644 --- a/dot_config/aerospace/aerospace.toml +++ b/dot_config/aerospace/aerospace.toml @@ -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 diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix index d335bd0..926519c 100644 --- a/dot_config/flake/machines/hinge/home.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -40,6 +40,19 @@ 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; diff --git a/dot_config/flake/machines/hinge/sketchybar.nix b/dot_config/flake/machines/hinge/sketchybar.nix index 7d864af..75c9815 100644 --- a/dot_config/flake/machines/hinge/sketchybar.nix +++ b/dot_config/flake/machines/hinge/sketchybar.nix @@ -1,6 +1,8 @@ -{...}: { - # services.sketchybar = { - # enable = true; - # extraPackages = []; - # }; +{pkgs, ...}: { + services.sketchybar = { + # enable = true; + extraPackages = with pkgs; [ + sbarlua + ]; + }; } diff --git a/dot_config/flake/pkgs/sbarlua/default.nix b/dot_config/flake/pkgs/sbarlua/default.nix index bf1b4df..8ef76ea 100644 --- a/dot_config/flake/pkgs/sbarlua/default.nix +++ b/dot_config/flake/pkgs/sbarlua/default.nix @@ -1,62 +1,33 @@ { - lib, stdenv, + clang, fetchFromGitHub, gcc, - lua, - nix-update-script, - apple-sdk_15, - versionCheckHook, + readline, + lua5_4, }: let - inherit (stdenv.hostPlatform) system; - - target = - { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; - } - .${system} - or (throw "Unsupported system: ${system}"); + lua = lua5_4; in - stdenv.mkDerivation ( - finalAttrs: { - pname = "SBarLua"; - version = "437bd2031da38ccda75827cb7548e7baa4aa9978"; - src = fetchFromGitHub { - repo = "SbarLua"; - owner = "FelixKratz"; - rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; - hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg="; - }; + stdenv.mkDerivation { + pname = "SBarLua"; + version = "unstable-2024-02-28"; - nativeBuildInputs = [ - gcc - ]; + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SbarLua"; + rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; + hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg="; + }; - buildInputs = [ - apple-sdk_15 - lua - ]; + nativeBuildInputs = [ + clang + gcc + ]; - # buildPhase = '' - # make - # ''; + buildInputs = [readline]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - ls -la - - cp ./bin/sbarlua $out/bin/sbarlua - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/FelixKratz/SbarLua"; - platforms = lib.platforms.darwin; - }; - } - ) + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion}/ + cp -r bin/* "$out/lib/lua/${lua.luaversion}/" + ''; + } diff --git a/dot_config/sketchybar/executable_sketchybarrc b/dot_config/sketchybar/executable_sketchybarrc deleted file mode 100755 index 95ece11..0000000 --- a/dot_config/sketchybar/executable_sketchybarrc +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env lua - --- Load the sketchybar-package and prepare the helper binaries -require("helpers") -require("init") diff --git a/dot_config/sketchybar/helpers/init.lua b/dot_config/sketchybar/helpers/init.lua index 351531a..62c24a0 100644 --- a/dot_config/sketchybar/helpers/init.lua +++ b/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)")