tmayoff/.dotfiles
1
0
Fork 0
mirror of https://codeberg.org/tmayoff/.dotfiles.git synced 2025-12-06 08:48:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tyler Mayoff 2025-02-21 21:45:22 -05:00
commit b7365a3fff
12 changed files with 97 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dot_config/flake/flake.nix
View file

@ -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;};

16
dot_config/flake/home/common.nix
View file

@ -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

6
dot_config/flake/home/hinge/sketchybar.nix
View file

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

29
dot_config/flake/home/hinge/darwin.nix → dot_config/flake/machines/hinge/darwin.nix
View file

@ -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;

21
dot_config/flake/home/hinge/hinge.nix → dot_config/flake/machines/hinge/home.nix
View file

@ -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;
@ -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";
}

8
dot_config/flake/machines/hinge/sketchybar.nix Normal file
View file

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

8
dot_config/flake/pkgs/default.nix
View file

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

33
dot_config/flake/pkgs/sbarlua/default.nix Normal file
View file

@ -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}/"
'';
}